From c4e266b87f39d521ff1002fefa9df809c6b9bd61 Mon Sep 17 00:00:00 2001
From: Darren Hill <dchill42@gmail.com>
Date: Tue, 30 Aug 2011 15:40:27 -0400
Subject: Added Session driver with native PHP sessions and original-flavor CI
 cookie sessions

---
 system/libraries/Session/Session.php | 601 +++++++++++++++++++++++++++++++++++
 1 file changed, 601 insertions(+)
 create mode 100755 system/libraries/Session/Session.php

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
new file mode 100755
index 000000000..7aaf706a1
--- /dev/null
+++ b/system/libraries/Session/Session.php
@@ -0,0 +1,601 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP 5.1.6 or newer
+ *
+ * @package		CodeIgniter
+ * @author		ExpressionEngine Dev Team
+ * @copyright	Copyright (c) 2008 - 2010, EllisLab, Inc.
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
+ * @since		Version 2.0
+ * @filesource
+ */
+
+
+/**
+ * Session Class
+ *
+ * The user interface defined by EllisLabs, now with puggable drivers to manage different storage mechanisms.
+ * By default, the Native PHP session driver will load, but the 'sess_driver' config/param item (see above) can be
+ * used to specify the 'Cookie' driver, or any other you might create.
+ * Once loaded, this driver setup is a drop-in replacement for the former CI_Session library, taking its place as the
+ * 'session' member of the global controller framework (e.g.: $CI->session or $this->session).
+ * In keeping with the CI_Driver methodology, multiple drivers may be loaded, although this might be a bit confusing.
+ * The Session library class keeps track of the most recently loaded driver as "current" to call for driver methods.
+ * Ideally, one driver is loaded and all calls go directly through the main library interface. However, any methods
+ * called through the specific driver will switch the "current" driver to itself before invoking the library method
+ * (which will then call back into the driver for low-level operations). So, alternation between two drivers can be
+ * achieved by specifying which driver to use for each call (e.g.: $this->session->native->set_userdata('foo', 'bar');
+ * $this->session->cookie->userdata('foo'); $this->session->native->unset_userdata('foo');). Notice in the previous
+ * example that the _native_ userdata value 'foo' would be set to 'bar', which would NOT be returned by the call for
+ * the _cookie_ userdata 'foo', nor would the _cookie_ value be unset by the call to unset the _native_ 'foo' value.
+ *
+ * @package		CodeIgniter
+ * @subpackage	Libraries
+ * @category	Sessions
+ * @author		Darren Hill (DChill)
+ * @link		http://codeigniter.com/user_guide/libraries/sessions.html
+ */
+final class Session extends CI_Driver_Library {
+	public $params = array();
+	private $current = null;
+	private $userdata = array();
+
+	const FLASHDATA_KEY = 'flash';
+	const FLASHDATA_NEW = ':new:';
+	const FLASHDATA_OLD = ':old:';
+	const FLASHDATA_EXP = ':exp:';
+	const EXPIRATION_KEY = '__expirations';
+	const TEMP_EXP_DEF = 300;
+
+	/**
+	 * Session constructor
+	 *
+	 * The constructor loads the configured driver ('sess_driver' in config.php or as a parameter), running
+	 * routines in its constructor, and manages flashdata aging.
+	 *
+	 * @param   array	Configuration parameters
+	 */
+	public function __construct(array $params = array())
+	{
+		log_message('debug', 'Session Class Initialized');
+
+		// Get valid drivers list
+		$CI =& get_instance();
+		$this->valid_drivers = array('Session_Native', 'Session_Cookie');
+		$key = 'sess_valid_drivers';
+		$drivers = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
+		if ($drivers)
+		{
+			if (!is_array($drivers)) $drivers = array($drivers);
+
+			// Add driver names to valid list
+			foreach ($drivers as $driver)
+			{
+				if (!in_array(strtolower($driver), array_map('strtolower', $this->valid_drivers)))
+				{
+					$this->valid_drivers[] = $driver;
+				}
+			}
+		}
+
+		// Get driver to load
+		$key = 'sess_driver';
+		$driver = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
+		if (!$driver) $driver = 'Native';
+		if (!in_array('session_'.strtolower($driver), array_map('strtolower', $this->valid_drivers)))
+		{
+			$this->valid_drivers[] = 'Session_'.$driver;
+		}
+
+		// Save a copy of parameters in case drivers need access
+		$this->params = $params;
+
+		// Load driver and get array reference
+		$this->load_driver($driver);
+		$this->userdata =& $this->current->get_userdata();
+
+		// Delete 'old' flashdata (from last request)
+		$this->_flashdata_sweep();
+
+		// Mark all new flashdata as old (data will be deleted before next request)
+		$this->_flashdata_mark();
+
+		// Delete expired tempdata
+		$this->_tempdata_sweep();
+
+		log_message('debug', 'Session routines successfully run');
+	}
+
+	/**
+	 * Loads session storage driver
+	 *
+	 * @param   string	Driver classname
+	 * @return  object	Loaded driver object
+	 */
+	public function load_driver($driver)
+	{
+		// Save reference to most recently loaded driver as library default
+		$this->current = parent::load_driver($driver);
+		return $this->current;
+	}
+
+	/**
+	 * Select default session storage driver
+	 *
+	 * @param   string	Driver classname
+	 * @return  void
+	 */
+	public function select_driver($driver)
+	{
+		// Validate driver name
+		$lowername = strtolower($driver);
+		if (in_array($lowername, array_map('strtolower', $this->valid_drivers)))
+		{
+			// See if regular or lowercase variant is loaded
+			if (class_exists($driver))
+			{
+				$this->current = $this->$driver;
+			}
+			else if (class_exists($lowername))
+			{
+				$this->current = $this->$lowername;
+			}
+			else
+			{
+				$this->load_driver($driver);
+			}
+		}
+	}
+
+	/**
+	 * Destroy the current session
+	 *
+	 * @return  void
+	 */
+	public function sess_destroy()
+	{
+		// Just call destroy on driver
+		$this->current->sess_destroy();
+	}
+
+	/**
+	 * Regenerate the current session
+	 *
+	 * @param   boolean	Destroy session data flag (default: false)
+	 * @return  void
+	 */
+	public function sess_regenerate($destroy = false)
+	{
+		// Just call regenerate on driver
+		$this->current->sess_regenerate($destroy);
+	}
+
+	/**
+	 * Fetch a specific item from the session array
+	 *
+	 * @param   string	Item key
+	 * @return  string	Item value
+	 */
+	public function userdata($item)
+	{
+		// Return value or FALSE if not found
+		return (!isset($this->userdata[$item])) ? FALSE : $this->userdata[$item];
+	}
+
+	/**
+	 * Fetch all session data
+	 *
+	 * @return	array	User data array
+	 */
+	public function all_userdata()
+	{
+		// Return entire array
+		return (!isset($this->userdata)) ? FALSE : $this->userdata;
+	}
+
+	/**
+	 * Add or change data in the "userdata" array
+	 *
+	 * @param   mixed	Item name or array of items
+	 * @param   string	Item value or empty string
+	 * @return  void
+	 */
+	public function set_userdata($newdata = array(), $newval = '')
+	{
+		// Wrap params as array if singular
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => $newval);
+		}
+
+		// Set each name/value pair
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				$this->userdata[$key] = $val;
+			}
+		}
+
+		// Tell driver data changed
+		$this->current->sess_save();
+	}
+
+	/**
+	 * Delete a session variable from the "userdata" array
+	 *
+	 * @param   mixed	Item name or array of item names
+	 * @return  void
+	 */
+	public function unset_userdata($newdata = array())
+	{
+		// Wrap single name as array
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => '');
+		}
+
+		// Unset each item name
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				unset($this->userdata[$key]);
+			}
+		}
+
+		// Tell driver data changed
+		$this->current->sess_save();
+	}
+
+	/**
+	 * Determine if an item exists
+	 *
+	 * @param   string	Item name
+	 * @return  boolean
+	 */
+	public function has_userdata($item)
+	{
+		// Check for item name
+		return isset($this->userdata[$item]);
+	}
+
+	/**
+	 * Add or change flashdata, only available until the next request
+	 *
+	 * @param   mixed	Item name or array of items
+	 * @param   string	Item value or empty string
+	 * @return  void
+	 */
+	public function set_flashdata($newdata = array(), $newval = '')
+	{
+		// Wrap item as array if singular
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => $newval);
+		}
+
+		// Prepend each key name and set value
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				$flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
+				$this->set_userdata($flashdata_key, $val);
+			}
+		}
+	}
+
+	/**
+	 * Keeps existing flashdata available to next request.
+	 *
+	 * @param   string	Item key
+	 * @return  void
+	 */
+	public function keep_flashdata($key)
+	{
+		// 'old' flashdata gets removed.  Here we mark all
+		// flashdata as 'new' to preserve it from _flashdata_sweep()
+		$old_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
+		$value = $this->userdata($old_flashdata_key);
+
+		$new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
+		$this->set_userdata($new_flashdata_key, $value);
+	}
+
+	/**
+	 * Fetch a specific flashdata item from the session array
+	 *
+	 * @param   string	Item key
+	 * @return  string
+	 */
+	public function flashdata($key)
+	{
+		// Prepend key and retrieve value
+		$flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
+		return $this->userdata($flashdata_key);
+	}
+
+	/**
+	 * Add or change tempdata, only available
+	 * until expiration
+	 *
+	 * @param   mixed	Item name or array of items
+	 * @param   string	Item value or empty string
+	 * @param   int		Item lifetime in seconds or 0 for default
+	 * @return  void
+	 */
+	public function set_tempdata($newdata = array(), $newval = '', $expire = 0)
+	{
+		// Set expiration time
+		$expire = time() + ($expire ? $expire : self::TEMP_EXP_DEF);
+
+		// Wrap item as array if singular
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => $newval);
+		}
+
+		// Get or create expiration list
+		$expirations = $this->userdata(self::EXPIRATION_KEY);
+		if (!$expirations)
+		{
+			$expirations = array();
+		}
+
+		// Prepend each key name and set value
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				$tempdata_key = self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key;
+				$expirations[$tempdata_key] = $expire;
+				$this->set_userdata($tempdata_key, $val);
+			}
+		}
+
+		// Update expiration list
+		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
+	}
+
+	/**
+	 * Delete a temporary session variable from the "userdata" array
+	 *
+	 * @param   mixed	Item name or array of item names
+	 * @return  void
+	 */
+	public function unset_tempdata($newdata = array())
+	{
+		// Get expirations list
+		$expirations = $this->userdata(self::EXPIRATION_KEY);
+		if (!$expirations || !count($expirations))
+		{
+			// Nothing to do
+			return;
+		}
+
+		// Wrap single name as array
+		if (is_string($newdata))
+		{
+			$newdata = array($newdata => '');
+		}
+
+		// Prepend each item name and unset
+		if (count($newdata) > 0)
+		{
+			foreach ($newdata as $key => $val)
+			{
+				$tempdata_key = self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key;
+				unset($expirations[$tempdata_key]);
+				$this->unset_userdata($tempdata_key);
+			}
+		}
+
+		// Update expiration list
+		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
+	}
+
+	/**
+	 * Fetch a specific tempdata item from the session array
+	 *
+	 * @param   string	Item key
+	 * @return  string
+	 */
+	public function tempdata($key)
+	{
+		// Prepend key and return value
+		$tempdata_key = self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key;
+		return $this->userdata($tempdata_key);
+	}
+
+	/**
+	 * Identifies flashdata as 'old' for removal
+	 * when _flashdata_sweep() runs.
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	private function _flashdata_mark()
+	{
+		$userdata = $this->all_userdata();
+		foreach ($userdata as $name => $value)
+		{
+			$parts = explode(self::FLASHDATA_NEW, $name);
+			if (is_array($parts) && count($parts) === 2)
+			{
+				$new_name = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$parts[1];
+				$this->set_userdata($new_name, $value);
+				$this->unset_userdata($name);
+			}
+		}
+	}
+
+	/**
+	 * Removes all flashdata marked as 'old'
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	private function _flashdata_sweep()
+	{
+		$userdata = $this->all_userdata();
+		foreach ($userdata as $key => $value)
+		{
+			if (strpos($key, self::FLASHDATA_OLD))
+			{
+				$this->unset_userdata($key);
+			}
+		}
+	}
+
+	/**
+	 * Removes all expired tempdata
+	 *
+	 * @access	private
+	 * @return	void
+	 */
+	private function _tempdata_sweep()
+	{
+		// Get expirations list
+		$expirations = $this->userdata(self::EXPIRATION_KEY);
+		if (!$expirations || !count($expirations))
+		{
+			// Nothing to do
+			return;
+		}
+
+		// Unset expired elements
+		$now = time();
+		$userdata = $this->all_userdata();
+		foreach ($userdata as $key => $value)
+		{
+			if (strpos($key, self::FLASHDATA_EXP) && $expirations[$key] < $now)
+			{
+				unset($expirations[$key]);
+				$this->unset_userdata($key);
+			}
+		}
+
+		// Update expiration list
+		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
+	}
+}
+// END Session Class
+
+
+/**
+ * SessionDriver Class
+ *
+ * Extend this class to make a new Session driver.
+ * A Session driver basically manages an array of name/value pairs with some sort of storage mechanism.
+ * To make a new driver, derive from (extend) SessionDriver. Overload the initialize method and read or create
+ * session data. Then implement a save handler to write changed data to storage (sess_save), a destroy handler
+ * to remove deleted data (sess_destroy), and an access handler to expose the data (get_userdata).
+ * Put your driver in the libraries/Session/drivers folder anywhere in the loader paths. This includes the application
+ * directory, the system directory, or any path you add with $CI->load->add_package_path().
+ * Your driver must be named Session_<name>, where <name> is capitalized, and your filename must be Session_<name>.EXT,
+ * preferably also capitalized. (e.g.: Session_Foo in libraries/Session/drivers/Session_Foo.php)
+ * Then specify the driver by setting 'sess_driver' in your config file or as a parameter when loading the Session
+ * object. (e.g.: $config['sess_driver'] = 'foo'; OR $CI->load->driver('session', array('sess_driver' => 'foo')); )
+ * Already provided are the Native driver, which manages the native PHP $_SESSION array, and
+ * the Cookie driver, which manages the data in a browser cookie, with optional extra storage in a database table.
+ *
+ * @package	 CodeIgniter
+ * @subpackage  Libraries
+ * @category	Sessions
+ * @author	  Darren Hill (DChill)
+ */
+abstract class SessionDriver extends CI_Driver {
+	/**
+	 * Decorate
+	 *
+	 * Decorates the child with the parent driver lib's methods and properties
+	 *
+	 * @param	object	Parent library object
+	 * @return	void
+	 */
+	public function decorate($parent)
+	{
+		// Call base class decorate first
+		parent::decorate($parent);
+
+		// Call initialize method now that driver has access to $this->parent
+		$this->initialize();
+	}
+
+	/**
+	 * __call magic method
+	 *
+	 * Handles access to the parent driver library's methods
+	 *
+	 * @param   string	Library method name
+	 * @param   array	Method arguments (default: none)
+	 * @return	mixed
+	 */
+	public function __call($method, $args = array())
+	{
+		// Make sure the parent library uses this driver
+		$this->parent->select_driver(get_class($this));
+		return parent::__call($method, $args);
+	}
+
+	/**
+	 * Initialize driver
+	 *
+	 * @return  void
+	 */
+	protected function initialize()
+	{
+		// Overload this method to implement initialization
+	}
+
+	/**
+	 * Save the session data
+	 *
+	 * Data in the array has changed - perform any storage synchronization necessary
+	 * The child class MUST implement this abstract method!
+	 *
+	 * @return  void
+	 */
+	abstract public function sess_save();
+
+	/**
+	 * Destroy the current session
+	 *
+	 * Clean up storage for this session - it has been terminated
+	 * The child class MUST implement this abstract method!
+	 *
+	 * @return  void
+	 */
+	abstract public function sess_destroy();
+
+	/**
+	 * Regenerate the current session
+	 *
+	 * Regenerate the session id
+	 * The child class MUST implement this abstract method!
+	 *
+	 * @param   boolean	Destroy session data flag (default: false)
+	 * @return  void
+	 */
+	abstract public function sess_regenerate($destroy = false);
+
+	/**
+	 * Get a reference to user data array
+	 *
+	 * Give array access to the main Session object
+	 * The child class MUST implement this abstract method!
+	 *
+	 * @return  array	Reference to userdata
+	 */
+	abstract public function &get_userdata();
+}
+// END SessionDriver Class
+
+
+/* End of file Session.php */
+/* Location: ./system/libraries/Session/Session.php */
+?>
-- 
cgit v1.2.3-24-g4f1b


From 5073a375951f09b654f6b991df7ca04e1f88d93c Mon Sep 17 00:00:00 2001
From: Darren Hill <dchill42@gmail.com>
Date: Wed, 31 Aug 2011 13:54:19 -0400
Subject: Better style guide compliance

---
 system/libraries/Session/Session.php | 136 +++++++++++++++++------------------
 1 file changed, 68 insertions(+), 68 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 7aaf706a1..dacc249c5 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -15,15 +15,15 @@
 
 
 /**
- * Session Class
+ * CI_Session Class
  *
  * The user interface defined by EllisLabs, now with puggable drivers to manage different storage mechanisms.
- * By default, the Native PHP session driver will load, but the 'sess_driver' config/param item (see above) can be
- * used to specify the 'Cookie' driver, or any other you might create.
+ * By default, the native PHP session driver will load, but the 'sess_driver' config/param item (see above) can be
+ * used to specify the 'cookie' driver, or any other you might create.
  * Once loaded, this driver setup is a drop-in replacement for the former CI_Session library, taking its place as the
  * 'session' member of the global controller framework (e.g.: $CI->session or $this->session).
  * In keeping with the CI_Driver methodology, multiple drivers may be loaded, although this might be a bit confusing.
- * The Session library class keeps track of the most recently loaded driver as "current" to call for driver methods.
+ * The CI_Session library class keeps track of the most recently loaded driver as "current" to call for driver methods.
  * Ideally, one driver is loaded and all calls go directly through the main library interface. However, any methods
  * called through the specific driver will switch the "current" driver to itself before invoking the library method
  * (which will then call back into the driver for low-level operations). So, alternation between two drivers can be
@@ -35,10 +35,10 @@
  * @package		CodeIgniter
  * @subpackage	Libraries
  * @category	Sessions
- * @author		Darren Hill (DChill)
+ * @author		ExpressionEngine Dev Team
  * @link		http://codeigniter.com/user_guide/libraries/sessions.html
  */
-final class Session extends CI_Driver_Library {
+final class CI_Session extends CI_Driver_Library {
 	public $params = array();
 	private $current = null;
 	private $userdata = array();
@@ -51,20 +51,20 @@ final class Session extends CI_Driver_Library {
 	const TEMP_EXP_DEF = 300;
 
 	/**
-	 * Session constructor
+	 * CI_Session constructor
 	 *
 	 * The constructor loads the configured driver ('sess_driver' in config.php or as a parameter), running
 	 * routines in its constructor, and manages flashdata aging.
 	 *
-	 * @param   array	Configuration parameters
+	 * @param	array	Configuration parameters
 	 */
 	public function __construct(array $params = array())
 	{
-		log_message('debug', 'Session Class Initialized');
+		log_message('debug', 'CI_Session Class Initialized');
 
 		// Get valid drivers list
 		$CI =& get_instance();
-		$this->valid_drivers = array('Session_Native', 'Session_Cookie');
+		$this->valid_drivers = array('CI_Session_native', 'CI_Session_cookie');
 		$key = 'sess_valid_drivers';
 		$drivers = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
 		if ($drivers)
@@ -84,7 +84,7 @@ final class Session extends CI_Driver_Library {
 		// Get driver to load
 		$key = 'sess_driver';
 		$driver = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
-		if (!$driver) $driver = 'Native';
+		if (!$driver) $driver = 'native';
 		if (!in_array('session_'.strtolower($driver), array_map('strtolower', $this->valid_drivers)))
 		{
 			$this->valid_drivers[] = 'Session_'.$driver;
@@ -106,14 +106,14 @@ final class Session extends CI_Driver_Library {
 		// Delete expired tempdata
 		$this->_tempdata_sweep();
 
-		log_message('debug', 'Session routines successfully run');
+		log_message('debug', 'CI_Session routines successfully run');
 	}
 
 	/**
 	 * Loads session storage driver
 	 *
-	 * @param   string	Driver classname
-	 * @return  object	Loaded driver object
+	 * @param	string	Driver classname
+	 * @return	object	Loaded driver object
 	 */
 	public function load_driver($driver)
 	{
@@ -125,8 +125,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Select default session storage driver
 	 *
-	 * @param   string	Driver classname
-	 * @return  void
+	 * @param	string	Driver classname
+	 * @return	void
 	 */
 	public function select_driver($driver)
 	{
@@ -153,7 +153,7 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Destroy the current session
 	 *
-	 * @return  void
+	 * @return	void
 	 */
 	public function sess_destroy()
 	{
@@ -164,8 +164,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Regenerate the current session
 	 *
-	 * @param   boolean	Destroy session data flag (default: false)
-	 * @return  void
+	 * @param	boolean	Destroy session data flag (default: false)
+	 * @return	void
 	 */
 	public function sess_regenerate($destroy = false)
 	{
@@ -176,8 +176,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Fetch a specific item from the session array
 	 *
-	 * @param   string	Item key
-	 * @return  string	Item value
+	 * @param	string	Item key
+	 * @return	string	Item value
 	 */
 	public function userdata($item)
 	{
@@ -199,9 +199,9 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Add or change data in the "userdata" array
 	 *
-	 * @param   mixed	Item name or array of items
-	 * @param   string	Item value or empty string
-	 * @return  void
+	 * @param	mixed	Item name or array of items
+	 * @param	string	Item value or empty string
+	 * @return	void
 	 */
 	public function set_userdata($newdata = array(), $newval = '')
 	{
@@ -227,8 +227,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Delete a session variable from the "userdata" array
 	 *
-	 * @param   mixed	Item name or array of item names
-	 * @return  void
+	 * @param	mixed	Item name or array of item names
+	 * @return	void
 	 */
 	public function unset_userdata($newdata = array())
 	{
@@ -254,8 +254,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Determine if an item exists
 	 *
-	 * @param   string	Item name
-	 * @return  boolean
+	 * @param	string	Item name
+	 * @return	boolean
 	 */
 	public function has_userdata($item)
 	{
@@ -266,9 +266,9 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Add or change flashdata, only available until the next request
 	 *
-	 * @param   mixed	Item name or array of items
-	 * @param   string	Item value or empty string
-	 * @return  void
+	 * @param	mixed	Item name or array of items
+	 * @param	string	Item value or empty string
+	 * @return	void
 	 */
 	public function set_flashdata($newdata = array(), $newval = '')
 	{
@@ -292,12 +292,12 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Keeps existing flashdata available to next request.
 	 *
-	 * @param   string	Item key
-	 * @return  void
+	 * @param	string	Item key
+	 * @return	void
 	 */
 	public function keep_flashdata($key)
 	{
-		// 'old' flashdata gets removed.  Here we mark all
+		// 'old' flashdata gets removed. Here we mark all
 		// flashdata as 'new' to preserve it from _flashdata_sweep()
 		$old_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
 		$value = $this->userdata($old_flashdata_key);
@@ -309,8 +309,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Fetch a specific flashdata item from the session array
 	 *
-	 * @param   string	Item key
-	 * @return  string
+	 * @param	string	Item key
+	 * @return	string
 	 */
 	public function flashdata($key)
 	{
@@ -323,10 +323,10 @@ final class Session extends CI_Driver_Library {
 	 * Add or change tempdata, only available
 	 * until expiration
 	 *
-	 * @param   mixed	Item name or array of items
-	 * @param   string	Item value or empty string
-	 * @param   int		Item lifetime in seconds or 0 for default
-	 * @return  void
+	 * @param	mixed	Item name or array of items
+	 * @param	string	Item value or empty string
+	 * @param	int		Item lifetime in seconds or 0 for default
+	 * @return	void
 	 */
 	public function set_tempdata($newdata = array(), $newval = '', $expire = 0)
 	{
@@ -364,8 +364,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Delete a temporary session variable from the "userdata" array
 	 *
-	 * @param   mixed	Item name or array of item names
-	 * @return  void
+	 * @param	mixed	Item name or array of item names
+	 * @return	void
 	 */
 	public function unset_tempdata($newdata = array())
 	{
@@ -401,8 +401,8 @@ final class Session extends CI_Driver_Library {
 	/**
 	 * Fetch a specific tempdata item from the session array
 	 *
-	 * @param   string	Item key
-	 * @return  string
+	 * @param	string	Item key
+	 * @return	string
 	 */
 	public function tempdata($key)
 	{
@@ -483,32 +483,32 @@ final class Session extends CI_Driver_Library {
 		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
 	}
 }
-// END Session Class
+// END CI_Session Class
 
 
 /**
- * SessionDriver Class
+ * CI_Session_driver Class
  *
- * Extend this class to make a new Session driver.
- * A Session driver basically manages an array of name/value pairs with some sort of storage mechanism.
- * To make a new driver, derive from (extend) SessionDriver. Overload the initialize method and read or create
+ * Extend this class to make a new CI_Session driver.
+ * A CI_Session driver basically manages an array of name/value pairs with some sort of storage mechanism.
+ * To make a new driver, derive from (extend) CI_Session_driver. Overload the initialize method and read or create
  * session data. Then implement a save handler to write changed data to storage (sess_save), a destroy handler
  * to remove deleted data (sess_destroy), and an access handler to expose the data (get_userdata).
- * Put your driver in the libraries/Session/drivers folder anywhere in the loader paths. This includes the application
- * directory, the system directory, or any path you add with $CI->load->add_package_path().
- * Your driver must be named Session_<name>, where <name> is capitalized, and your filename must be Session_<name>.EXT,
- * preferably also capitalized. (e.g.: Session_Foo in libraries/Session/drivers/Session_Foo.php)
- * Then specify the driver by setting 'sess_driver' in your config file or as a parameter when loading the Session
+ * Put your driver in the libraries/Session/drivers folder anywhere in the loader paths. This includes the
+ * application directory, the system directory, or any path you add with $CI->load->add_package_path().
+ * Your driver must be named CI_Session_<name>, and your filename must be Session_<name>.php,
+ * preferably also capitalized. (e.g.: CI_Session_foo in libraries/Session/drivers/Session_foo.php)
+ * Then specify the driver by setting 'sess_driver' in your config file or as a parameter when loading the CI_Session
  * object. (e.g.: $config['sess_driver'] = 'foo'; OR $CI->load->driver('session', array('sess_driver' => 'foo')); )
  * Already provided are the Native driver, which manages the native PHP $_SESSION array, and
  * the Cookie driver, which manages the data in a browser cookie, with optional extra storage in a database table.
  *
- * @package	 CodeIgniter
- * @subpackage  Libraries
+ * @package		CodeIgniter
+ * @subpackage	Libraries
  * @category	Sessions
- * @author	  Darren Hill (DChill)
+ * @author		ExpressionEngine Dev Team
  */
-abstract class SessionDriver extends CI_Driver {
+abstract class CI_Session_driver extends CI_Driver {
 	/**
 	 * Decorate
 	 *
@@ -531,8 +531,8 @@ abstract class SessionDriver extends CI_Driver {
 	 *
 	 * Handles access to the parent driver library's methods
 	 *
-	 * @param   string	Library method name
-	 * @param   array	Method arguments (default: none)
+	 * @param	string	Library method name
+	 * @param	array	Method arguments (default: none)
 	 * @return	mixed
 	 */
 	public function __call($method, $args = array())
@@ -545,7 +545,7 @@ abstract class SessionDriver extends CI_Driver {
 	/**
 	 * Initialize driver
 	 *
-	 * @return  void
+	 * @return	void
 	 */
 	protected function initialize()
 	{
@@ -558,7 +558,7 @@ abstract class SessionDriver extends CI_Driver {
 	 * Data in the array has changed - perform any storage synchronization necessary
 	 * The child class MUST implement this abstract method!
 	 *
-	 * @return  void
+	 * @return	void
 	 */
 	abstract public function sess_save();
 
@@ -568,7 +568,7 @@ abstract class SessionDriver extends CI_Driver {
 	 * Clean up storage for this session - it has been terminated
 	 * The child class MUST implement this abstract method!
 	 *
-	 * @return  void
+	 * @return	void
 	 */
 	abstract public function sess_destroy();
 
@@ -578,22 +578,22 @@ abstract class SessionDriver extends CI_Driver {
 	 * Regenerate the session id
 	 * The child class MUST implement this abstract method!
 	 *
-	 * @param   boolean	Destroy session data flag (default: false)
-	 * @return  void
+	 * @param	boolean	Destroy session data flag (default: false)
+	 * @return	void
 	 */
 	abstract public function sess_regenerate($destroy = false);
 
 	/**
 	 * Get a reference to user data array
 	 *
-	 * Give array access to the main Session object
+	 * Give array access to the main CI_Session object
 	 * The child class MUST implement this abstract method!
 	 *
-	 * @return  array	Reference to userdata
+	 * @return	array	Reference to userdata
 	 */
 	abstract public function &get_userdata();
 }
-// END SessionDriver Class
+// END CI_Session_driver Class
 
 
 /* End of file Session.php */
-- 
cgit v1.2.3-24-g4f1b


From a2ae6571e55d5a3d23645e96929eea996e9f0499 Mon Sep 17 00:00:00 2001
From: Darren Hill <dchill42@gmail.com>
Date: Thu, 1 Sep 2011 07:36:26 -0400
Subject: Made private members protected for inheritance

---
 system/libraries/Session/Session.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index dacc249c5..7c340ccca 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -38,10 +38,10 @@
  * @author		ExpressionEngine Dev Team
  * @link		http://codeigniter.com/user_guide/libraries/sessions.html
  */
-final class CI_Session extends CI_Driver_Library {
+class CI_Session extends CI_Driver_Library {
 	public $params = array();
-	private $current = null;
-	private $userdata = array();
+	protected $current = null;
+	protected $userdata = array();
 
 	const FLASHDATA_KEY = 'flash';
 	const FLASHDATA_NEW = ':new:';
@@ -415,10 +415,10 @@ final class CI_Session extends CI_Driver_Library {
 	 * Identifies flashdata as 'old' for removal
 	 * when _flashdata_sweep() runs.
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	void
 	 */
-	private function _flashdata_mark()
+	protected function _flashdata_mark()
 	{
 		$userdata = $this->all_userdata();
 		foreach ($userdata as $name => $value)
@@ -436,10 +436,10 @@ final class CI_Session extends CI_Driver_Library {
 	/**
 	 * Removes all flashdata marked as 'old'
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	void
 	 */
-	private function _flashdata_sweep()
+	protected function _flashdata_sweep()
 	{
 		$userdata = $this->all_userdata();
 		foreach ($userdata as $key => $value)
@@ -454,10 +454,10 @@ final class CI_Session extends CI_Driver_Library {
 	/**
 	 * Removes all expired tempdata
 	 *
-	 * @access	private
+	 * @access	protected
 	 * @return	void
 	 */
-	private function _tempdata_sweep()
+	protected function _tempdata_sweep()
 	{
 		// Get expirations list
 		$expirations = $this->userdata(self::EXPIRATION_KEY);
-- 
cgit v1.2.3-24-g4f1b


From 42b77a9a1a5d4ec7ceb94b421b12af9c442769ba Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Mon, 23 Jul 2012 11:28:42 -0400
Subject: Made cookie driver default and did miniscule code cleanup on drivers

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 94fb4b10a..474ca9c7a 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -84,7 +84,7 @@ class CI_Session extends CI_Driver_Library {
 		// Get driver to load
 		$key = 'sess_driver';
 		$driver = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
-		if (!$driver) $driver = 'native';
+		if (!$driver) $driver = 'cookie';
 		if (!in_array('session_'.strtolower($driver), array_map('strtolower', $this->valid_drivers)))
 		{
 			$this->valid_drivers[] = 'Session_'.$driver;
-- 
cgit v1.2.3-24-g4f1b


From 77ee3fdac34d317b600a269e0b845588c88fa4c5 Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Tue, 24 Jul 2012 11:50:01 -0400
Subject: Cleaned up bangs and lowercase booleans, and fixed userdata return on
 not found to NULL

---
 system/libraries/Session/Session.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 474ca9c7a..9c887d88e 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -69,12 +69,12 @@ class CI_Session extends CI_Driver_Library {
 		$drivers = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
 		if ($drivers)
 		{
-			if (!is_array($drivers)) $drivers = array($drivers);
+			if ( ! is_array($drivers)) $drivers = array($drivers);
 
 			// Add driver names to valid list
 			foreach ($drivers as $driver)
 			{
-				if (!in_array(strtolower($driver), array_map('strtolower', $this->valid_drivers)))
+				if ( ! in_array(strtolower($driver), array_map('strtolower', $this->valid_drivers)))
 				{
 					$this->valid_drivers[] = $driver;
 				}
@@ -84,8 +84,8 @@ class CI_Session extends CI_Driver_Library {
 		// Get driver to load
 		$key = 'sess_driver';
 		$driver = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
-		if (!$driver) $driver = 'cookie';
-		if (!in_array('session_'.strtolower($driver), array_map('strtolower', $this->valid_drivers)))
+		if ( ! $driver) $driver = 'cookie';
+		if ( ! in_array('session_'.strtolower($driver), array_map('strtolower', $this->valid_drivers)))
 		{
 			$this->valid_drivers[] = 'Session_'.$driver;
 		}
@@ -182,7 +182,7 @@ class CI_Session extends CI_Driver_Library {
 	public function userdata($item)
 	{
 		// Return value or FALSE if not found
-		return (!isset($this->userdata[$item])) ? FALSE : $this->userdata[$item];
+		return ( ! isset($this->userdata[$item])) ? NULL : $this->userdata[$item];
 	}
 
 	/**
@@ -193,7 +193,7 @@ class CI_Session extends CI_Driver_Library {
 	public function all_userdata()
 	{
 		// Return entire array
-		return (!isset($this->userdata)) ? FALSE : $this->userdata;
+		return ( ! isset($this->userdata)) ? NULL : $this->userdata;
 	}
 
 	/**
@@ -362,7 +362,7 @@ class CI_Session extends CI_Driver_Library {
 
 		// Get or create expiration list
 		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if (!$expirations)
+		if ( ! $expirations)
 		{
 			$expirations = array();
 		}
@@ -392,7 +392,7 @@ class CI_Session extends CI_Driver_Library {
 	{
 		// Get expirations list
 		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if (!$expirations || !count($expirations))
+		if ( ! $expirations || ! count($expirations))
 		{
 			// Nothing to do
 			return;
@@ -482,7 +482,7 @@ class CI_Session extends CI_Driver_Library {
 	{
 		// Get expirations list
 		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if (!$expirations || !count($expirations))
+		if ( ! $expirations ||  ! count($expirations))
 		{
 			// Nothing to do
 			return;
-- 
cgit v1.2.3-24-g4f1b


From c58722535e0358367f351c168480ef98a033264c Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Mon, 30 Jul 2012 14:53:11 -0400
Subject: Fixed _parent references and several minor bugs

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 9c887d88e..734334249 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -64,7 +64,7 @@ class CI_Session extends CI_Driver_Library {
 
 		// Get valid drivers list
 		$CI =& get_instance();
-		$this->valid_drivers = array('CI_Session_native', 'CI_Session_cookie');
+		$this->valid_drivers = array('Session_native', 'Session_cookie');
 		$key = 'sess_valid_drivers';
 		$drivers = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
 		if ($drivers)
@@ -131,7 +131,7 @@ class CI_Session extends CI_Driver_Library {
 	public function select_driver($driver)
 	{
 		// Validate driver name
-		$lowername = strtolower($driver);
+		$lowername = strtolower(str_replace('CI_', '', $driver));
 		if (in_array($lowername, array_map('strtolower', $this->valid_drivers)))
 		{
 			// See if regular or lowercase variant is loaded
@@ -177,11 +177,11 @@ class CI_Session extends CI_Driver_Library {
 	 * Fetch a specific item from the session array
 	 *
 	 * @param	string	Item key
-	 * @return	string	Item value
+	 * @return	string	Item value or NULL if not found
 	 */
 	public function userdata($item)
 	{
-		// Return value or FALSE if not found
+		// Return value or NULL if not found
 		return ( ! isset($this->userdata[$item])) ? NULL : $this->userdata[$item];
 	}
 
@@ -208,7 +208,7 @@ class CI_Session extends CI_Driver_Library {
 		// loop through all userdata
 		foreach ($this->all_userdata() as $key => $val)
 		{
-            // if it contains flashdata, add it
+			// if it contains flashdata, add it
 			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_OLD) !== FALSE)
 			{
 				$out[$key] = $val;
@@ -543,7 +543,7 @@ abstract class CI_Session_driver extends CI_Driver {
 		// Call base class decorate first
 		parent::decorate($parent);
 
-		// Call initialize method now that driver has access to $this->parent
+		// Call initialize method now that driver has access to $this->_parent
 		$this->initialize();
 	}
 
@@ -559,7 +559,7 @@ abstract class CI_Session_driver extends CI_Driver {
 	public function __call($method, $args = array())
 	{
 		// Make sure the parent library uses this driver
-		$this->parent->select_driver(get_class($this));
+		$this->_parent->select_driver(get_class($this));
 		return parent::__call($method, $args);
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From b185537938061bf9b8f132f9f3c3992e12902be8 Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Tue, 31 Jul 2012 09:32:23 -0400
Subject: Fixed userdata synchronization, loaded driver check, and
 all_flashdata keys

---
 system/libraries/Session/Session.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 734334249..68819a665 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -95,7 +95,6 @@ class CI_Session extends CI_Driver_Library {
 
 		// Load driver and get array reference
 		$this->load_driver($driver);
-		$this->userdata =& $this->current->get_userdata();
 
 		// Delete 'old' flashdata (from last request)
 		$this->_flashdata_sweep();
@@ -119,6 +118,7 @@ class CI_Session extends CI_Driver_Library {
 	{
 		// Save reference to most recently loaded driver as library default
 		$this->current = parent::load_driver($driver);
+		$this->userdata =& $this->current->get_userdata();
 		return $this->current;
 	}
 
@@ -134,14 +134,12 @@ class CI_Session extends CI_Driver_Library {
 		$lowername = strtolower(str_replace('CI_', '', $driver));
 		if (in_array($lowername, array_map('strtolower', $this->valid_drivers)))
 		{
-			// See if regular or lowercase variant is loaded
-			if (class_exists($driver))
-			{
-				$this->current = $this->$driver;
-			}
-			else if (class_exists($lowername))
+			// See if driver is loaded
+			$child = str_replace($this->lib_name.'_', '', $driver);
+			if (isset($this->$child))
 			{
-				$this->current = $this->$lowername;
+				$this->current = $this->$child;
+		        $this->userdata =& $this->current->get_userdata();
 			}
 			else
 			{
@@ -211,6 +209,7 @@ class CI_Session extends CI_Driver_Library {
 			// if it contains flashdata, add it
 			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_OLD) !== FALSE)
 			{
+                $key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_OLD, '', $key);
 				$out[$key] = $val;
 			}
 		}
-- 
cgit v1.2.3-24-g4f1b


From 2642920e4781db091309ab97d0ff43c22e7c7e44 Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Tue, 31 Jul 2012 10:55:07 -0400
Subject: Damn, missed files on last commit

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 68819a665..41539a598 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -64,7 +64,10 @@ class CI_Session extends CI_Driver_Library {
 
 		// Get valid drivers list
 		$CI =& get_instance();
-		$this->valid_drivers = array('Session_native', 'Session_cookie');
+		$this->valid_drivers = array(
+			'Session_native',
+		   	'Session_cookie'
+		);
 		$key = 'sess_valid_drivers';
 		$drivers = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
 		if ($drivers)
@@ -116,7 +119,7 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	public function load_driver($driver)
 	{
-		// Save reference to most recently loaded driver as library default
+		// Save reference to most recently loaded driver as library default and sync userdata
 		$this->current = parent::load_driver($driver);
 		$this->userdata =& $this->current->get_userdata();
 		return $this->current;
@@ -138,11 +141,13 @@ class CI_Session extends CI_Driver_Library {
 			$child = str_replace($this->lib_name.'_', '', $driver);
 			if (isset($this->$child))
 			{
+				// Make driver current and sync userdata
 				$this->current = $this->$child;
-		        $this->userdata =& $this->current->get_userdata();
+				$this->userdata =& $this->current->get_userdata();
 			}
 			else
 			{
+				// Load new driver
 				$this->load_driver($driver);
 			}
 		}
@@ -167,8 +172,9 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	public function sess_regenerate($destroy = false)
 	{
-		// Just call regenerate on driver
+		// Call regenerate on driver and resync userdata
 		$this->current->sess_regenerate($destroy);
+		$this->userdata =& $this->current->get_userdata();
 	}
 
 	/**
@@ -209,7 +215,7 @@ class CI_Session extends CI_Driver_Library {
 			// if it contains flashdata, add it
 			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_OLD) !== FALSE)
 			{
-                $key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_OLD, '', $key);
+				$key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_OLD, '', $key);
 				$out[$key] = $val;
 			}
 		}
-- 
cgit v1.2.3-24-g4f1b


From 0e88408d0965ee539d9af3ff7eca5415d3276c74 Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Sat, 11 Aug 2012 20:10:17 -0400
Subject: Updated comments about default driver

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 41539a598..97eab803f 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -18,8 +18,8 @@
  * CI_Session Class
  *
  * The user interface defined by EllisLabs, now with puggable drivers to manage different storage mechanisms.
- * By default, the native PHP session driver will load, but the 'sess_driver' config/param item (see above) can be
- * used to specify the 'cookie' driver, or any other you might create.
+ * By default, the cookie session driver will load, but the 'sess_driver' config/param item (see above) can be
+ * used to specify the 'native' driver, or any other you might create.
  * Once loaded, this driver setup is a drop-in replacement for the former CI_Session library, taking its place as the
  * 'session' member of the global controller framework (e.g.: $CI->session or $this->session).
  * In keeping with the CI_Driver methodology, multiple drivers may be loaded, although this might be a bit confusing.
-- 
cgit v1.2.3-24-g4f1b


From aee9265602c3bb30a1f7f3dfd562b9b36cc612a4 Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Sun, 26 Aug 2012 21:45:35 -0400
Subject: Fixed select_driver(), cookie sess_destroy(), and native cookie name
 conflict

---
 system/libraries/Session/Session.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 97eab803f..1f24456a4 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -141,14 +141,17 @@ class CI_Session extends CI_Driver_Library {
 			$child = str_replace($this->lib_name.'_', '', $driver);
 			if (isset($this->$child))
 			{
-				// Make driver current and sync userdata
-				$this->current = $this->$child;
-				$this->userdata =& $this->current->get_userdata();
+				// See if driver is already current
+				if ($this->$child !== $this->current) {
+					// Make driver current and sync userdata
+					$this->current = $this->$child;
+					$this->userdata =& $this->current->get_userdata();
+				}
 			}
 			else
 			{
 				// Load new driver
-				$this->load_driver($driver);
+				$this->load_driver($child);
 			}
 		}
 	}
-- 
cgit v1.2.3-24-g4f1b


From 3cecd8234d3bb9045e9cc41e15f603a6e87c5fac Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Tue, 28 Aug 2012 21:37:27 -0400
Subject: Extracted cookie database saves to shutdown and cleaned up code

Signed-off-by: dchill42 <dchill42@gmail.com>
---
 system/libraries/Session/Session.php | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1f24456a4..1195ed955 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -42,6 +42,7 @@ class CI_Session extends CI_Driver_Library {
 	public $params = array();
 	protected $current = null;
 	protected $userdata = array();
+	protected $loaded = array();
 
 	const FLASHDATA_KEY = 'flash';
 	const FLASHDATA_NEW = ':new:';
@@ -111,6 +112,22 @@ class CI_Session extends CI_Driver_Library {
 		log_message('debug', 'CI_Session routines successfully run');
 	}
 
+	/**
+	 * CI_Session destructor
+	 *
+	 * The destructor calls shutdown() on each loaded driver
+	 */
+	public function __destruct()
+	{
+		// Call shutdown for each loaded driver
+		foreach ($this->loaded as $driver)
+		{
+			$this->$driver->shutdown();
+		}
+
+		log_message('debug', 'CI_Session Class Shutdown');
+	}
+
 	/**
 	 * Loads session storage driver
 	 *
@@ -122,6 +139,14 @@ class CI_Session extends CI_Driver_Library {
 		// Save reference to most recently loaded driver as library default and sync userdata
 		$this->current = parent::load_driver($driver);
 		$this->userdata =& $this->current->get_userdata();
+
+		// Mark driver as loaded
+		if (!in_array($driver, $this->loaded))
+		{
+			$this->loaded[] = $driver;
+		}
+
+		// Return driver object
 		return $this->current;
 	}
 
@@ -581,6 +606,16 @@ abstract class CI_Session_driver extends CI_Driver {
 		// Overload this method to implement initialization
 	}
 
+	/**
+	 * Shut down driver
+	 *
+	 * @return	void
+	 */
+	public function shutdown()
+	{
+		// Overload this method to implement shutdown
+	}
+
 	/**
 	 * Save the session data
 	 *
-- 
cgit v1.2.3-24-g4f1b


From 88b636b06dd91807706e2d442d910fe8b6a3b50c Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Wed, 29 Aug 2012 08:47:05 -0400
Subject: Fixed defaults and database check, reverted redundant shutdown
 feature

Signed-off-by: dchill42 <dchill42@gmail.com>
---
 system/libraries/Session/Session.php | 35 -----------------------------------
 1 file changed, 35 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1195ed955..1f24456a4 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -42,7 +42,6 @@ class CI_Session extends CI_Driver_Library {
 	public $params = array();
 	protected $current = null;
 	protected $userdata = array();
-	protected $loaded = array();
 
 	const FLASHDATA_KEY = 'flash';
 	const FLASHDATA_NEW = ':new:';
@@ -112,22 +111,6 @@ class CI_Session extends CI_Driver_Library {
 		log_message('debug', 'CI_Session routines successfully run');
 	}
 
-	/**
-	 * CI_Session destructor
-	 *
-	 * The destructor calls shutdown() on each loaded driver
-	 */
-	public function __destruct()
-	{
-		// Call shutdown for each loaded driver
-		foreach ($this->loaded as $driver)
-		{
-			$this->$driver->shutdown();
-		}
-
-		log_message('debug', 'CI_Session Class Shutdown');
-	}
-
 	/**
 	 * Loads session storage driver
 	 *
@@ -139,14 +122,6 @@ class CI_Session extends CI_Driver_Library {
 		// Save reference to most recently loaded driver as library default and sync userdata
 		$this->current = parent::load_driver($driver);
 		$this->userdata =& $this->current->get_userdata();
-
-		// Mark driver as loaded
-		if (!in_array($driver, $this->loaded))
-		{
-			$this->loaded[] = $driver;
-		}
-
-		// Return driver object
 		return $this->current;
 	}
 
@@ -606,16 +581,6 @@ abstract class CI_Session_driver extends CI_Driver {
 		// Overload this method to implement initialization
 	}
 
-	/**
-	 * Shut down driver
-	 *
-	 * @return	void
-	 */
-	public function shutdown()
-	{
-		// Overload this method to implement shutdown
-	}
-
 	/**
 	 * Save the session data
 	 *
-- 
cgit v1.2.3-24-g4f1b


From 9ffcee60140b20ca3ec4e7688f83a039c7c080f7 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Wed, 5 Sep 2012 16:25:16 +0300
Subject: Cleanup and optimize new Session classes

---
 system/libraries/Session/Session.php | 155 ++++++++++++++++++++++++-----------
 1 file changed, 107 insertions(+), 48 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1f24456a4..e6f6050c0 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -2,20 +2,31 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 5.1.6 or newer
+ * An open source application development framework for PHP 5.2.4 or newer
+ *
+ * NOTICE OF LICENSE
+ *
+ * Licensed under the Open Software License version 3.0
+ *
+ * This source file is subject to the Open Software License (OSL 3.0) that is
+ * bundled with this package in the files license.txt / license.rst.  It is
+ * also available through the world wide web at this URL:
+ * http://opensource.org/licenses/OSL-3.0
+ * If you did not receive a copy of the license and are unable to obtain it
+ * through the world wide web, please send an email to
+ * licensing@ellislab.com so we can send you a copy immediately.
  *
  * @package		CodeIgniter
- * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008 - 2010, EllisLab, Inc.
- * @license		http://codeigniter.com/user_guide/license.html
+ * @author		EllisLab Dev Team
+ * @copyright	Copyright (c) 2006 - 2012 EllisLab, Inc.
+ * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 2.0
  * @filesource
  */
 
-
 /**
- * CI_Session Class
+ * CodeIgniter Session Class
  *
  * The user interface defined by EllisLabs, now with puggable drivers to manage different storage mechanisms.
  * By default, the cookie session driver will load, but the 'sess_driver' config/param item (see above) can be
@@ -35,12 +46,13 @@
  * @package		CodeIgniter
  * @subpackage	Libraries
  * @category	Sessions
- * @author		ExpressionEngine Dev Team
+ * @author		EllisLab Dev Team
  * @link		http://codeigniter.com/user_guide/libraries/sessions.html
  */
 class CI_Session extends CI_Driver_Library {
+
 	public $params = array();
-	protected $current = null;
+	protected $current = NULL;
 	protected $userdata = array();
 
 	const FLASHDATA_KEY = 'flash';
@@ -69,10 +81,10 @@ class CI_Session extends CI_Driver_Library {
 		   	'Session_cookie'
 		);
 		$key = 'sess_valid_drivers';
-		$drivers = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
+		$drivers = isset($params[$key]) ? $params[$key] : $CI->config->item($key);
 		if ($drivers)
 		{
-			if ( ! is_array($drivers)) $drivers = array($drivers);
+			is_array($drivers) OR $drivers = array($drivers);
 
 			// Add driver names to valid list
 			foreach ($drivers as $driver)
@@ -86,8 +98,12 @@ class CI_Session extends CI_Driver_Library {
 
 		// Get driver to load
 		$key = 'sess_driver';
-		$driver = (isset($params[$key])) ? $params[$key] : $CI->config->item($key);
-		if ( ! $driver) $driver = 'cookie';
+		$driver = isset($params[$key]) ? $params[$key] : $CI->config->item($key);
+		if ( ! $driver)
+		{
+			$driver = 'cookie';
+		}
+
 		if ( ! in_array('session_'.strtolower($driver), array_map('strtolower', $this->valid_drivers)))
 		{
 			$this->valid_drivers[] = 'Session_'.$driver;
@@ -111,6 +127,8 @@ class CI_Session extends CI_Driver_Library {
 		log_message('debug', 'CI_Session routines successfully run');
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Loads session storage driver
 	 *
@@ -125,6 +143,8 @@ class CI_Session extends CI_Driver_Library {
 		return $this->current;
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Select default session storage driver
 	 *
@@ -142,7 +162,8 @@ class CI_Session extends CI_Driver_Library {
 			if (isset($this->$child))
 			{
 				// See if driver is already current
-				if ($this->$child !== $this->current) {
+				if ($this->$child !== $this->current)
+				{
 					// Make driver current and sync userdata
 					$this->current = $this->$child;
 					$this->userdata =& $this->current->get_userdata();
@@ -156,6 +177,8 @@ class CI_Session extends CI_Driver_Library {
 		}
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Destroy the current session
 	 *
@@ -167,19 +190,23 @@ class CI_Session extends CI_Driver_Library {
 		$this->current->sess_destroy();
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Regenerate the current session
 	 *
-	 * @param	boolean	Destroy session data flag (default: false)
+	 * @param	bool	Destroy session data flag (default: false)
 	 * @return	void
 	 */
-	public function sess_regenerate($destroy = false)
+	public function sess_regenerate($destroy = FALSE)
 	{
 		// Call regenerate on driver and resync userdata
 		$this->current->sess_regenerate($destroy);
 		$this->userdata =& $this->current->get_userdata();
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Fetch a specific item from the session array
 	 *
@@ -188,10 +215,11 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	public function userdata($item)
 	{
-		// Return value or NULL if not found
-		return ( ! isset($this->userdata[$item])) ? NULL : $this->userdata[$item];
+		return isset($this->userdata[$item]) ? $this->userdata[$item] : NULL;
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Fetch all session data
 	 *
@@ -199,10 +227,11 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	public function all_userdata()
 	{
-		// Return entire array
-		return ( ! isset($this->userdata)) ? NULL : $this->userdata;
+		return isset($this->userdata) ? $this->userdata : NULL;
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Fetch all flashdata
 	 *
@@ -225,6 +254,8 @@ class CI_Session extends CI_Driver_Library {
 		return $out;
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Add or change data in the "userdata" array
 	 *
@@ -253,6 +284,8 @@ class CI_Session extends CI_Driver_Library {
 		$this->current->sess_save();
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Delete a session variable from the "userdata" array
 	 *
@@ -270,7 +303,7 @@ class CI_Session extends CI_Driver_Library {
 		// Unset each item name
 		if (count($newdata) > 0)
 		{
-			foreach ($newdata as $key => $val)
+			foreach (array_keys($newdata) as $key)
 			{
 				unset($this->userdata[$key]);
 			}
@@ -280,18 +313,21 @@ class CI_Session extends CI_Driver_Library {
 		$this->current->sess_save();
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Determine if an item exists
 	 *
 	 * @param	string	Item name
-	 * @return	boolean
+	 * @return	bool
 	 */
 	public function has_userdata($item)
 	{
-		// Check for item name
 		return isset($this->userdata[$item]);
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Add or change flashdata, only available until the next request
 	 *
@@ -318,6 +354,8 @@ class CI_Session extends CI_Driver_Library {
 		}
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Keeps existing flashdata available to next request.
 	 *
@@ -335,6 +373,8 @@ class CI_Session extends CI_Driver_Library {
 		$this->set_userdata($new_flashdata_key, $value);
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Fetch a specific flashdata item from the session array
 	 *
@@ -348,13 +388,14 @@ class CI_Session extends CI_Driver_Library {
 		return $this->userdata($flashdata_key);
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
-	 * Add or change tempdata, only available
-	 * until expiration
+	 * Add or change tempdata, only available until expiration
 	 *
 	 * @param	mixed	Item name or array of items
 	 * @param	string	Item value or empty string
-	 * @param	int		Item lifetime in seconds or 0 for default
+	 * @param	int	Item lifetime in seconds or 0 for default
 	 * @return	void
 	 */
 	public function set_tempdata($newdata = array(), $newval = '', $expire = 0)
@@ -390,6 +431,8 @@ class CI_Session extends CI_Driver_Library {
 		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Delete a temporary session variable from the "userdata" array
 	 *
@@ -400,7 +443,7 @@ class CI_Session extends CI_Driver_Library {
 	{
 		// Get expirations list
 		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if ( ! $expirations || ! count($expirations))
+		if (empty($expirations))
 		{
 			// Nothing to do
 			return;
@@ -415,7 +458,7 @@ class CI_Session extends CI_Driver_Library {
 		// Prepend each item name and unset
 		if (count($newdata) > 0)
 		{
-			foreach ($newdata as $key => $val)
+			foreach (array_keys($newdata) as $key)
 			{
 				$tempdata_key = self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key;
 				unset($expirations[$tempdata_key]);
@@ -427,6 +470,8 @@ class CI_Session extends CI_Driver_Library {
 		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Fetch a specific tempdata item from the session array
 	 *
@@ -440,17 +485,17 @@ class CI_Session extends CI_Driver_Library {
 		return $this->userdata($tempdata_key);
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Identifies flashdata as 'old' for removal
 	 * when _flashdata_sweep() runs.
 	 *
-	 * @access	protected
 	 * @return	void
 	 */
 	protected function _flashdata_mark()
 	{
-		$userdata = $this->all_userdata();
-		foreach ($userdata as $name => $value)
+		foreach ($this->all_userdata() as $name => $value)
 		{
 			$parts = explode(self::FLASHDATA_NEW, $name);
 			if (is_array($parts) && count($parts) === 2)
@@ -462,16 +507,17 @@ class CI_Session extends CI_Driver_Library {
 		}
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Removes all flashdata marked as 'old'
 	 *
-	 * @access	protected
 	 * @return	void
 	 */
 	protected function _flashdata_sweep()
 	{
 		$userdata = $this->all_userdata();
-		foreach ($userdata as $key => $value)
+		foreach (array_keys($userdata) as $key)
 		{
 			if (strpos($key, self::FLASHDATA_OLD))
 			{
@@ -480,17 +526,18 @@ class CI_Session extends CI_Driver_Library {
 		}
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Removes all expired tempdata
 	 *
-	 * @access	protected
 	 * @return	void
 	 */
 	protected function _tempdata_sweep()
 	{
 		// Get expirations list
 		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if ( ! $expirations ||  ! count($expirations))
+		if (empty($expirations))
 		{
 			// Nothing to do
 			return;
@@ -499,7 +546,7 @@ class CI_Session extends CI_Driver_Library {
 		// Unset expired elements
 		$now = time();
 		$userdata = $this->all_userdata();
-		foreach ($userdata as $key => $value)
+		foreach (array_keys($userdata) as $key)
 		{
 			if (strpos($key, self::FLASHDATA_EXP) && $expirations[$key] < $now)
 			{
@@ -511,9 +558,10 @@ class CI_Session extends CI_Driver_Library {
 		// Update expiration list
 		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
 	}
+
 }
-// END CI_Session Class
 
+// ------------------------------------------------------------------------
 
 /**
  * CI_Session_driver Class
@@ -535,9 +583,10 @@ class CI_Session extends CI_Driver_Library {
  * @package		CodeIgniter
  * @subpackage	Libraries
  * @category	Sessions
- * @author		ExpressionEngine Dev Team
+ * @author		EllisLab Dev Team
  */
 abstract class CI_Session_driver extends CI_Driver {
+
 	/**
 	 * Decorate
 	 *
@@ -555,6 +604,8 @@ abstract class CI_Session_driver extends CI_Driver {
 		$this->initialize();
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * __call magic method
 	 *
@@ -571,6 +622,8 @@ abstract class CI_Session_driver extends CI_Driver {
 		return parent::__call($method, $args);
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Initialize driver
 	 *
@@ -581,50 +634,56 @@ abstract class CI_Session_driver extends CI_Driver {
 		// Overload this method to implement initialization
 	}
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Save the session data
 	 *
-	 * Data in the array has changed - perform any storage synchronization necessary
-	 * The child class MUST implement this abstract method!
+	 * Data in the array has changed - perform any storage synchronization
+	 * necessary. The child class MUST implement this abstract method!
 	 *
 	 * @return	void
 	 */
 	abstract public function sess_save();
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Destroy the current session
 	 *
-	 * Clean up storage for this session - it has been terminated
+	 * Clean up storage for this session - it has been terminated.
 	 * The child class MUST implement this abstract method!
 	 *
 	 * @return	void
 	 */
 	abstract public function sess_destroy();
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Regenerate the current session
 	 *
-	 * Regenerate the session id
+	 * Regenerate the session ID.
 	 * The child class MUST implement this abstract method!
 	 *
-	 * @param	boolean	Destroy session data flag (default: false)
+	 * @param	bool	Destroy session data flag (default: false)
 	 * @return	void
 	 */
-	abstract public function sess_regenerate($destroy = false);
+	abstract public function sess_regenerate($destroy = FALSE);
+
+	// ------------------------------------------------------------------------
 
 	/**
 	 * Get a reference to user data array
 	 *
-	 * Give array access to the main CI_Session object
+	 * Give array access to the main CI_Session object.
 	 * The child class MUST implement this abstract method!
 	 *
 	 * @return	array	Reference to userdata
 	 */
 	abstract public function &get_userdata();
-}
-// END CI_Session_driver Class
 
+}
 
 /* End of file Session.php */
-/* Location: ./system/libraries/Session/Session.php */
-?>
+/* Location: ./system/libraries/Session/Session.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 2e3e23053d9748c68fa2c0e11f43af67da8743e8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 9 Oct 2012 15:52:34 +0300
Subject: Disable Session library under CLI and create a CI singleton to be
 used by its drivers

---
 system/libraries/Session/Session.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index e6f6050c0..978506062 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -69,13 +69,21 @@ class CI_Session extends CI_Driver_Library {
 	 * routines in its constructor, and manages flashdata aging.
 	 *
 	 * @param	array	Configuration parameters
+	 * @return	void
 	 */
 	public function __construct(array $params = array())
 	{
+		$CI =& get_instance();
+
+		// No sessions under CLI
+		if ($CI->input->is_cli_request())
+		{
+			return;
+		}
+
 		log_message('debug', 'CI_Session Class Initialized');
 
 		// Get valid drivers list
-		$CI =& get_instance();
 		$this->valid_drivers = array(
 			'Session_native',
 		   	'Session_cookie'
@@ -587,6 +595,23 @@ class CI_Session extends CI_Driver_Library {
  */
 abstract class CI_Session_driver extends CI_Driver {
 
+	protected $CI;
+
+	/**
+	 * Constructor
+	 *
+	 * Gets the CI singleton, so that individual drivers
+	 * don't have to do it separately.
+	 *
+	 * @return	void
+	 */
+	public function __construct()
+	{
+		$this->CI =& get_instance();
+	}
+
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Decorate
 	 *
-- 
cgit v1.2.3-24-g4f1b


From 3bb4029bbe0db9625be21e2dad82ef18286560ca Mon Sep 17 00:00:00 2001
From: vkeranov <vkeranov@gmail.com>
Date: Sat, 27 Oct 2012 18:47:26 +0300
Subject: Remove extra spaces...

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 978506062..fec9b5b31 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -1,4 +1,4 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -86,7 +86,7 @@ class CI_Session extends CI_Driver_Library {
 		// Get valid drivers list
 		$this->valid_drivers = array(
 			'Session_native',
-		   	'Session_cookie'
+			'Session_cookie'
 		);
 		$key = 'sess_valid_drivers';
 		$drivers = isset($params[$key]) ? $params[$key] : $CI->config->item($key);
@@ -243,7 +243,7 @@ class CI_Session extends CI_Driver_Library {
 	/**
 	 * Fetch all flashdata
 	 *
-	 * @return	array   Flash data array
+	 * @return	array	Flash data array
 	 */
 	public function all_flashdata()
 	{
-- 
cgit v1.2.3-24-g4f1b


From c5536aac5752054f7f76e448d58b86407d8f574e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 1 Nov 2012 17:33:58 +0200
Subject: Manually apply PR #1594 (fixing phpdoc page-level
 generation/warnings)

Also partially fixes issue #1295, fixes inconsistencies in some page-level docblocks and adds include checks in language files.
---
 system/libraries/Session/Session.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index fec9b5b31..fb5b9fdd3 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php
 /**
  * CodeIgniter
  *
@@ -18,12 +18,13 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright	Copyright (c) 2006 - 2012 EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 2.0
  * @filesource
  */
+defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
  * CodeIgniter Session Class
-- 
cgit v1.2.3-24-g4f1b


From 0fa95bd5a7215da06f332c91f5857f563a1cce3d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Thu, 1 Nov 2012 23:33:14 +0200
Subject: [ci skip] DocBlocks for Pagination, Session, Trackback, Jquery
 libraries

Partially fixes issue #1295
---
 system/libraries/Session/Session.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index fb5b9fdd3..bb13c3376 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -52,10 +52,29 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class CI_Session extends CI_Driver_Library {
 
+	/**
+	 * Initialization parameters
+	 *
+	 * @var	array
+	 */
 	public $params = array();
+
+	/**
+	 * Current driver in use
+	 *
+	 * @var	string
+	 */
 	protected $current = NULL;
+
+	/**
+	 * User data
+	 *
+	 * @var	array
+	 */
 	protected $userdata = array();
 
+	// ------------------------------------------------------------------------
+
 	const FLASHDATA_KEY = 'flash';
 	const FLASHDATA_NEW = ':new:';
 	const FLASHDATA_OLD = ':old:';
@@ -63,6 +82,8 @@ class CI_Session extends CI_Driver_Library {
 	const EXPIRATION_KEY = '__expirations';
 	const TEMP_EXP_DEF = 300;
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * CI_Session constructor
 	 *
@@ -596,8 +617,16 @@ class CI_Session extends CI_Driver_Library {
  */
 abstract class CI_Session_driver extends CI_Driver {
 
+	/**
+	 * CI Singleton
+	 *
+	 * @see	get_instance()
+	 * @var	object
+	 */
 	protected $CI;
 
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Constructor
 	 *
-- 
cgit v1.2.3-24-g4f1b


From e24eed7e4e410fabf7479a67d3a27e2596444505 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Fri, 2 Nov 2012 23:33:45 +0200
Subject: Some micro-optimizations

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bb13c3376..96e65f154 100755
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -528,7 +528,7 @@ class CI_Session extends CI_Driver_Library {
 		foreach ($this->all_userdata() as $name => $value)
 		{
 			$parts = explode(self::FLASHDATA_NEW, $name);
-			if (is_array($parts) && count($parts) === 2)
+			if (count($parts) === 2)
 			{
 				$new_name = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$parts[1];
 				$this->set_userdata($new_name, $value);
-- 
cgit v1.2.3-24-g4f1b


From 2eaeee5aa3971932e58ffac48554e554d799249f Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Wed, 21 Nov 2012 14:31:26 +0200
Subject: Change fs permissions and add some missing index.html files (#2017)

---
 system/libraries/Session/Session.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 system/libraries/Session/Session.php

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
old mode 100755
new mode 100644
-- 
cgit v1.2.3-24-g4f1b


From 4beca5c9b64ba7bd1622e5c01666491f02cfa6db Mon Sep 17 00:00:00 2001
From: Johnathan Croom <johnathancroom@gmail.com>
Date: Fri, 23 Nov 2012 18:32:46 -0700
Subject: keep_flashdata accepts array

---
 system/libraries/Session/Session.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 96e65f154..81d63c304 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -389,18 +389,28 @@ class CI_Session extends CI_Driver_Library {
 	/**
 	 * Keeps existing flashdata available to next request.
 	 *
-	 * @param	string	Item key
+	 * @param	mixed	Item key
 	 * @return	void
 	 */
-	public function keep_flashdata($key)
+	public function keep_flashdata($data)
 	{
-		// 'old' flashdata gets removed. Here we mark all flashdata as 'new' to preserve it from _flashdata_sweep()
-		// Note the function will return NULL if the $key provided cannot be found
-		$old_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
-		$value = $this->userdata($old_flashdata_key);
+		// Wrap item as array if singular
+		if (is_string($data))
+		{
+			$data = array($data);
+		}
+
+		foreach($data as $key)
+		{
+			// 'old' flashdata gets removed. Here we mark all flashdata as 'new' to preserve it from _flashdata_sweep()
+			// Note the function will return NULL if the $key provided cannot be found
+			$old_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
+			$value = $this->userdata($old_flashdata_key);
+
+			$new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
+			$this->set_userdata($new_flashdata_key, $value);
+		}
 
-		$new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
-		$this->set_userdata($new_flashdata_key, $value);
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 9d9849b2c459cb09ccebcdf89b2b3a15bc4fd722 Mon Sep 17 00:00:00 2001
From: Johnathan Croom <johnathancroom@gmail.com>
Date: Sat, 24 Nov 2012 13:03:13 -0700
Subject: Requested changed to keep_flashdata

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 81d63c304..910b99936 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -389,18 +389,18 @@ class CI_Session extends CI_Driver_Library {
 	/**
 	 * Keeps existing flashdata available to next request.
 	 *
-	 * @param	mixed	Item key
+	 * @param	mixed	Item key(s)
 	 * @return	void
 	 */
 	public function keep_flashdata($data)
 	{
 		// Wrap item as array if singular
-		if (is_string($data))
+		if (!is_array($data))
 		{
 			$data = array($data);
 		}
 
-		foreach($data as $key)
+		foreach ($data as $key)
 		{
 			// 'old' flashdata gets removed. Here we mark all flashdata as 'new' to preserve it from _flashdata_sweep()
 			// Note the function will return NULL if the $key provided cannot be found
@@ -410,7 +410,6 @@ class CI_Session extends CI_Driver_Library {
 			$new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
 			$this->set_userdata($new_flashdata_key, $value);
 		}
-
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 6262d053db57957c4445ef7fce76070854c3e30d Mon Sep 17 00:00:00 2001
From: dchill42 <dchill42@gmail.com>
Date: Sat, 24 Nov 2012 18:41:13 -0500
Subject: Added support for extending individual driver classes and driver unit
 tests

Signed-off-by: dchill42 <dchill42@gmail.com>
---
 system/libraries/Session/Session.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 96e65f154..b6c862dae 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -107,17 +107,15 @@ class CI_Session extends CI_Driver_Library {
 
 		// Get valid drivers list
 		$this->valid_drivers = array(
-			'Session_native',
-			'Session_cookie'
+			'native',
+			'cookie'
 		);
 		$key = 'sess_valid_drivers';
 		$drivers = isset($params[$key]) ? $params[$key] : $CI->config->item($key);
 		if ($drivers)
 		{
-			is_array($drivers) OR $drivers = array($drivers);
-
 			// Add driver names to valid list
-			foreach ($drivers as $driver)
+			foreach ((array) $drivers as $driver)
 			{
 				if ( ! in_array(strtolower($driver), array_map('strtolower', $this->valid_drivers)))
 				{
@@ -134,9 +132,9 @@ class CI_Session extends CI_Driver_Library {
 			$driver = 'cookie';
 		}
 
-		if ( ! in_array('session_'.strtolower($driver), array_map('strtolower', $this->valid_drivers)))
+		if ( ! in_array(strtolower($driver), array_map('strtolower', $this->valid_drivers)))
 		{
-			$this->valid_drivers[] = 'Session_'.$driver;
+			$this->valid_drivers[] = $driver;
 		}
 
 		// Save a copy of parameters in case drivers need access
@@ -178,17 +176,17 @@ class CI_Session extends CI_Driver_Library {
 	/**
 	 * Select default session storage driver
 	 *
-	 * @param	string	Driver classname
+	 * @param	string	Driver name
 	 * @return	void
 	 */
 	public function select_driver($driver)
 	{
 		// Validate driver name
-		$lowername = strtolower(str_replace('CI_', '', $driver));
-		if (in_array($lowername, array_map('strtolower', $this->valid_drivers)))
+		$prefix = (string) get_instance()->config->item('subclass_prefix');
+		$child = strtolower(str_replace(array('CI_', $prefix, $this->lib_name.'_'), '', $driver));
+		if (in_array($child, array_map('strtolower', $this->valid_drivers)))
 		{
 			// See if driver is loaded
-			$child = str_replace($this->lib_name.'_', '', $driver);
 			if (isset($this->$child))
 			{
 				// See if driver is already current
-- 
cgit v1.2.3-24-g4f1b


From 8d8543da992985ae61a6903a138d949f189721e9 Mon Sep 17 00:00:00 2001
From: Johnathan Croom <johnathancroom@gmail.com>
Date: Sun, 25 Nov 2012 10:36:57 -0700
Subject: Improved array keey_flashdata + Changelog

---
 system/libraries/Session/Session.php | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 910b99936..9b011dea3 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -392,24 +392,26 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	mixed	Item key(s)
 	 * @return	void
 	 */
-	public function keep_flashdata($data)
+	public function keep_flashdata($key)
 	{
-		// Wrap item as array if singular
-		if (!is_array($data))
-		{
-			$data = array($data);
-		}
 
-		foreach ($data as $key)
+		if (is_array($key))
 		{
-			// 'old' flashdata gets removed. Here we mark all flashdata as 'new' to preserve it from _flashdata_sweep()
-			// Note the function will return NULL if the $key provided cannot be found
-			$old_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
-			$value = $this->userdata($old_flashdata_key);
+			foreach ($key as $k)
+			{
+				$this->keep_flashdata($k);
+			}
 
-			$new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
-			$this->set_userdata($new_flashdata_key, $value);
+			return;
 		}
+
+		// 'old' flashdata gets removed. Here we mark all flashdata as 'new' to preserve it from _flashdata_sweep()
+		// Note the function will return NULL if the $key provided cannot be found
+		$old_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
+		$value = $this->userdata($old_flashdata_key);
+
+		$new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
+		$this->set_userdata($new_flashdata_key, $value);
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 80500afbd188600212ca913a7bac073009feac73 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Tue, 1 Jan 2013 08:16:53 +0200
Subject: [ci skip] Happy new year

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 85a483592..c7f6f828c 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -18,7 +18,7 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 2.0
-- 
cgit v1.2.3-24-g4f1b


From c958eebea2525133bcef9fe47a5dfab9e23128dd Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 31 Jul 2013 14:28:50 +0300
Subject: Optimize CI_Session::__construct() routines and make driver validity
 check stricter

---
 system/libraries/Session/Session.php | 39 +++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index c7f6f828c..659a0269e 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -59,12 +59,19 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	public $params = array();
 
+	/**
+	 * Valid drivers list
+	 *
+	 * @var	array
+	 */
+	public $valid_drivers = array('native',	'cookie');
+
 	/**
 	 * Current driver in use
 	 *
 	 * @var	string
 	 */
-	protected $current = NULL;
+	public $current = NULL;
 
 	/**
 	 * User data
@@ -105,36 +112,26 @@ class CI_Session extends CI_Driver_Library {
 
 		log_message('debug', 'CI_Session Class Initialized');
 
-		// Get valid drivers list
-		$this->valid_drivers = array(
-			'native',
-			'cookie'
-		);
-		$key = 'sess_valid_drivers';
-		$drivers = isset($params[$key]) ? $params[$key] : $CI->config->item($key);
-		if ($drivers)
+		// Add possible extra entries to our valid drivers list
+		$drivers = isset($params['sess_valid_drivers']) ? $params['sess_valid_drivers'] : $CI->config->item('sess_valid_drivers');
+		if ( ! empty($drivers))
 		{
-			// Add driver names to valid list
-			foreach ((array) $drivers as $driver)
-			{
-				if ( ! in_array(strtolower($driver), array_map('strtolower', $this->valid_drivers)))
-				{
-					$this->valid_drivers[] = $driver;
-				}
-			}
+			$drivers = array_map('strtolower', (array) $drivers);
+			$this->valid_drivers = array_merge($this->valid_drivers, array_diff($drivers, $this->valid_drivers));
 		}
 
 		// Get driver to load
-		$key = 'sess_driver';
-		$driver = isset($params[$key]) ? $params[$key] : $CI->config->item($key);
+		$driver = isset($params['sess_driver']) ? $params['sess_driver'] : $CI->config->item('sess_driver');
 		if ( ! $driver)
 		{
+			log_message('debug', "Session: No driver name is configured, defaulting to 'cookie'.");
 			$driver = 'cookie';
 		}
 
-		if ( ! in_array(strtolower($driver), array_map('strtolower', $this->valid_drivers)))
+		if ( ! in_array($driver, $this->valid_drivers))
 		{
-			$this->valid_drivers[] = $driver;
+			log_message('error', 'Session: Configured driver name is not valid, aborting.');
+			return;
 		}
 
 		// Save a copy of parameters in case drivers need access
-- 
cgit v1.2.3-24-g4f1b


From f964b16f3db95d655420dfae2012ee9fbb98a1a8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 12 Nov 2013 17:04:55 +0200
Subject: Deprecate CI_Input::is_cli_request() and add common function is_cli()
 to replace it

Calls to this function are often needed before the Input library is available
---
 system/libraries/Session/Session.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 659a0269e..19de97994 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -102,10 +102,10 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	public function __construct(array $params = array())
 	{
-		$CI =& get_instance();
+		$_config =& get_instance()->config;
 
 		// No sessions under CLI
-		if ($CI->input->is_cli_request())
+		if (is_cli())
 		{
 			return;
 		}
@@ -113,7 +113,7 @@ class CI_Session extends CI_Driver_Library {
 		log_message('debug', 'CI_Session Class Initialized');
 
 		// Add possible extra entries to our valid drivers list
-		$drivers = isset($params['sess_valid_drivers']) ? $params['sess_valid_drivers'] : $CI->config->item('sess_valid_drivers');
+		$drivers = isset($params['sess_valid_drivers']) ? $params['sess_valid_drivers'] : $_config->item('sess_valid_drivers');
 		if ( ! empty($drivers))
 		{
 			$drivers = array_map('strtolower', (array) $drivers);
@@ -121,7 +121,7 @@ class CI_Session extends CI_Driver_Library {
 		}
 
 		// Get driver to load
-		$driver = isset($params['sess_driver']) ? $params['sess_driver'] : $CI->config->item('sess_driver');
+		$driver = isset($params['sess_driver']) ? $params['sess_driver'] : $_config->item('sess_driver');
 		if ( ! $driver)
 		{
 			log_message('debug', "Session: No driver name is configured, defaulting to 'cookie'.");
-- 
cgit v1.2.3-24-g4f1b


From e6376aa4a95b7641a5d0cc5101118b9307be75bc Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Jan 2014 13:11:30 +0200
Subject: Make CI_Session's set_userdata(), set_flashdata(), set_tempdata(),
 unset_userdata() and unset_flashdata()'s first parameter mandatory

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 19de97994..ac97b944c 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -288,7 +288,7 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	string	Item value or empty string
 	 * @return	void
 	 */
-	public function set_userdata($newdata = array(), $newval = '')
+	public function set_userdata($newdata, $newval = '')
 	{
 		// Wrap params as array if singular
 		if (is_string($newdata))
@@ -317,7 +317,7 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	mixed	Item name or array of item names
 	 * @return	void
 	 */
-	public function unset_userdata($newdata = array())
+	public function unset_userdata($newdata)
 	{
 		// Wrap single name as array
 		if (is_string($newdata))
@@ -360,7 +360,7 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	string	Item value or empty string
 	 * @return	void
 	 */
-	public function set_flashdata($newdata = array(), $newval = '')
+	public function set_flashdata($newdata, $newval = '')
 	{
 		// Wrap item as array if singular
 		if (is_string($newdata))
@@ -434,7 +434,7 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	int	Item lifetime in seconds or 0 for default
 	 * @return	void
 	 */
-	public function set_tempdata($newdata = array(), $newval = '', $expire = 0)
+	public function set_tempdata($newdata, $newval = '', $expire = 0)
 	{
 		// Set expiration time
 		$expire = time() + ($expire ? $expire : self::TEMP_EXP_DEF);
@@ -475,7 +475,7 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	mixed	Item name or array of item names
 	 * @return	void
 	 */
-	public function unset_tempdata($newdata = array())
+	public function unset_tempdata($newdata)
 	{
 		// Get expirations list
 		$expirations = $this->userdata(self::EXPIRATION_KEY);
-- 
cgit v1.2.3-24-g4f1b


From ecc260e0be0cdb55c4e4802b78ddd78b0d8b0ebc Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 24 Jan 2014 14:20:13 +0200
Subject: Righting a wrong in the Session library

 - Change userdata(), flashdata(), tempdata() to return all the respective data when no parameter is passed.
 - Revert the addition of all_flashdata().
 - Deprecate all_userdata().
 - Fix related changelog entries that were all inconsistent.
---
 system/libraries/Session/Session.php | 89 ++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 40 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index ac97b944c..d9f2f506f 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -238,9 +238,14 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	string	Item key
 	 * @return	string	Item value or NULL if not found
 	 */
-	public function userdata($item)
+	public function userdata($item = NULL)
 	{
-		return isset($this->userdata[$item]) ? $this->userdata[$item] : NULL;
+		if (isset($item))
+		{
+			return isset($this->userdata[$item]) ? $this->userdata[$item] : NULL;
+		}
+
+		return isset($this->userdata) ? $this->userdata : array();
 	}
 
 	// ------------------------------------------------------------------------
@@ -248,35 +253,12 @@ class CI_Session extends CI_Driver_Library {
 	/**
 	 * Fetch all session data
 	 *
+	 * @deprecated	3.0.0	Use userdata() with no parameters instead
 	 * @return	array	User data array
 	 */
 	public function all_userdata()
 	{
-		return isset($this->userdata) ? $this->userdata : NULL;
-	}
-
-	// ------------------------------------------------------------------------
-
-	/**
-	 * Fetch all flashdata
-	 *
-	 * @return	array	Flash data array
-	 */
-	public function all_flashdata()
-	{
-		$out = array();
-
-		// loop through all userdata
-		foreach ($this->all_userdata() as $key => $val)
-		{
-			// if it contains flashdata, add it
-			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_OLD) !== FALSE)
-			{
-				$key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_OLD, '', $key);
-				$out[$key] = $val;
-			}
-		}
-		return $out;
+		return isset($this->userdata) ? $this->userdata : array();
 	}
 
 	// ------------------------------------------------------------------------
@@ -417,11 +399,25 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	string	Item key
 	 * @return	string
 	 */
-	public function flashdata($key)
+	public function flashdata($key = NULL)
 	{
-		// Prepend key and retrieve value
-		$flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
-		return $this->userdata($flashdata_key);
+		if (isset($key))
+		{
+			return $this->userdata(self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key);
+		}
+
+		// Get our flashdata items from userdata
+		$out = array();
+		foreach ($this->userdata() as $key => $val)
+		{
+			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_OLD) !== FALSE)
+			{
+				$key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_OLD, '', $key);
+				$out[$key] = $val;
+			}
+		}
+
+		return $out;
 	}
 
 	// ------------------------------------------------------------------------
@@ -514,11 +510,25 @@ class CI_Session extends CI_Driver_Library {
 	 * @param	string	Item key
 	 * @return	string
 	 */
-	public function tempdata($key)
+	public function tempdata($key = NULL)
 	{
-		// Prepend key and return value
-		$tempdata_key = self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key;
-		return $this->userdata($tempdata_key);
+		if (isset($key))
+		{
+			return $this->userdata(self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key);
+		}
+
+		// Get our tempdata items from userdata
+		$out = array();
+		foreach ($this->userdata() as $key => $val)
+		{
+			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_EXP) !== FALSE)
+			{
+				$key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_EXP, '', $key);
+				$out[$key] = $val;
+			}
+		}
+
+		return $out;
 	}
 
 	// ------------------------------------------------------------------------
@@ -531,13 +541,12 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	protected function _flashdata_mark()
 	{
-		foreach ($this->all_userdata() as $name => $value)
+		foreach ($this->userdata() as $name => $value)
 		{
 			$parts = explode(self::FLASHDATA_NEW, $name);
 			if (count($parts) === 2)
 			{
-				$new_name = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$parts[1];
-				$this->set_userdata($new_name, $value);
+				$this->set_userdata(self::FLASHDATA_KEY.self::FLASHDATA_OLD.$parts[1], $value);
 				$this->unset_userdata($name);
 			}
 		}
@@ -552,7 +561,7 @@ class CI_Session extends CI_Driver_Library {
 	 */
 	protected function _flashdata_sweep()
 	{
-		$userdata = $this->all_userdata();
+		$userdata = $this->userdata();
 		foreach (array_keys($userdata) as $key)
 		{
 			if (strpos($key, self::FLASHDATA_OLD))
@@ -581,7 +590,7 @@ class CI_Session extends CI_Driver_Library {
 
 		// Unset expired elements
 		$now = time();
-		$userdata = $this->all_userdata();
+		$userdata = $this->userdata();
 		foreach (array_keys($userdata) as $key)
 		{
 			if (strpos($key, self::FLASHDATA_EXP) && $expirations[$key] < $now)
-- 
cgit v1.2.3-24-g4f1b


From 871754af60251993d640981e107d2def5f2db396 Mon Sep 17 00:00:00 2001
From: darwinel <kmorssink@gmail.com>
Date: Tue, 11 Feb 2014 17:34:57 +0100
Subject: 2013 > 2014

Update copyright notices from 2013 to 2014.
And update one calendar example in user_guide from year 2013/2014 to
2014/2015.
---
 system/libraries/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index d9f2f506f..905352bb3 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -18,7 +18,7 @@
  *
  * @package		CodeIgniter
  * @author		EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2013, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
  * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
  * @link		http://codeigniter.com
  * @since		Version 2.0
-- 
cgit v1.2.3-24-g4f1b


From 47a47fb9fafdb26206d01d846d8013f6e883eb37 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Sat, 31 May 2014 16:08:30 +0300
Subject: Initial version of new Session library

---
 system/libraries/Session/Session.php | 846 +++++++++++++++++------------------
 1 file changed, 409 insertions(+), 437 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 905352bb3..0d444e8ca 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -29,729 +29,701 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 /**
  * CodeIgniter Session Class
  *
- * The user interface defined by EllisLabs, now with puggable drivers to manage different storage mechanisms.
- * By default, the cookie session driver will load, but the 'sess_driver' config/param item (see above) can be
- * used to specify the 'native' driver, or any other you might create.
- * Once loaded, this driver setup is a drop-in replacement for the former CI_Session library, taking its place as the
- * 'session' member of the global controller framework (e.g.: $CI->session or $this->session).
- * In keeping with the CI_Driver methodology, multiple drivers may be loaded, although this might be a bit confusing.
- * The CI_Session library class keeps track of the most recently loaded driver as "current" to call for driver methods.
- * Ideally, one driver is loaded and all calls go directly through the main library interface. However, any methods
- * called through the specific driver will switch the "current" driver to itself before invoking the library method
- * (which will then call back into the driver for low-level operations). So, alternation between two drivers can be
- * achieved by specifying which driver to use for each call (e.g.: $this->session->native->set_userdata('foo', 'bar');
- * $this->session->cookie->userdata('foo'); $this->session->native->unset_userdata('foo');). Notice in the previous
- * example that the _native_ userdata value 'foo' would be set to 'bar', which would NOT be returned by the call for
- * the _cookie_ userdata 'foo', nor would the _cookie_ value be unset by the call to unset the _native_ 'foo' value.
- *
  * @package		CodeIgniter
  * @subpackage	Libraries
  * @category	Sessions
- * @author		EllisLab Dev Team
+ * @author		Andrey Andreev
  * @link		http://codeigniter.com/user_guide/libraries/sessions.html
  */
-class CI_Session extends CI_Driver_Library {
-
-	/**
-	 * Initialization parameters
-	 *
-	 * @var	array
-	 */
-	public $params = array();
-
-	/**
-	 * Valid drivers list
-	 *
-	 * @var	array
-	 */
-	public $valid_drivers = array('native',	'cookie');
+class CI_Session {
 
-	/**
-	 * Current driver in use
-	 *
-	 * @var	string
-	 */
-	public $current = NULL;
-
-	/**
-	 * User data
-	 *
-	 * @var	array
-	 */
-	protected $userdata = array();
-
-	// ------------------------------------------------------------------------
-
-	const FLASHDATA_KEY = 'flash';
-	const FLASHDATA_NEW = ':new:';
-	const FLASHDATA_OLD = ':old:';
-	const FLASHDATA_EXP = ':exp:';
-	const EXPIRATION_KEY = '__expirations';
-	const TEMP_EXP_DEF = 300;
+	protected $_driver = 'files';
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * CI_Session constructor
-	 *
-	 * The constructor loads the configured driver ('sess_driver' in config.php or as a parameter), running
-	 * routines in its constructor, and manages flashdata aging.
+	 * Class constructor
 	 *
-	 * @param	array	Configuration parameters
+	 * @param	array	$params	Configuration parameters
 	 * @return	void
 	 */
 	public function __construct(array $params = array())
 	{
-		$_config =& get_instance()->config;
 
 		// No sessions under CLI
 		if (is_cli())
 		{
+			log_message('debug', 'Session: Initialization under CLI aborted.');
 			return;
 		}
-
-		log_message('debug', 'CI_Session Class Initialized');
-
-		// Add possible extra entries to our valid drivers list
-		$drivers = isset($params['sess_valid_drivers']) ? $params['sess_valid_drivers'] : $_config->item('sess_valid_drivers');
-		if ( ! empty($drivers))
+		elseif ((bool) ini_get('session.auto_start'))
 		{
-			$drivers = array_map('strtolower', (array) $drivers);
-			$this->valid_drivers = array_merge($this->valid_drivers, array_diff($drivers, $this->valid_drivers));
+			log_message('error', 'Session: session.auto_start is enabled in php.ini. Aborting.');
+			return;
+		}
+		elseif ( ! empty($params['driver']))
+		{
+			$this->_driver = $params['driver'];
+			unset($params['driver']);
 		}
 
-		// Get driver to load
-		$driver = isset($params['sess_driver']) ? $params['sess_driver'] : $_config->item('sess_driver');
-		if ( ! $driver)
+		if (($class = $this->_ci_load_classes($this->_driver)) === FALSE)
 		{
-			log_message('debug', "Session: No driver name is configured, defaulting to 'cookie'.");
-			$driver = 'cookie';
+			return;
 		}
 
-		if ( ! in_array($driver, $this->valid_drivers))
+		$class = new $class($params);
+		if ($class instanceof SessionHandlerInterface)
 		{
-			log_message('error', 'Session: Configured driver name is not valid, aborting.');
+			if (is_php('5.4'))
+			{
+				session_set_save_handler($class, TRUE);
+			}
+			else
+			{
+				session_set_save_handler(
+					array($class, 'open'),
+					array($class, 'close'),
+					array($class, 'read'),
+					array($class, 'write'),
+					array($class, 'destroy'),
+					array($class, 'gc')
+				);
+
+				register_shutdown_function('session_write_close');
+			}
+		}
+		else
+		{
+			log_message('error', "Session: Driver '".$this->_driver."' doesn't implement SessionHandlerInterface. Aborting.");
 			return;
 		}
 
-		// Save a copy of parameters in case drivers need access
-		$this->params = $params;
+		session_start();
+		$this->_ci_init_vars();
 
-		// Load driver and get array reference
-		$this->load_driver($driver);
+		log_message('debug', "Session: Class initialized using '".$this->_driver."' driver.");
+	}
 
-		// Delete 'old' flashdata (from last request)
-		$this->_flashdata_sweep();
+	// ------------------------------------------------------------------------
 
-		// Mark all new flashdata as old (data will be deleted before next request)
-		$this->_flashdata_mark();
+	protected function _ci_load_classes($driver)
+	{
+		// PHP 5.4 compatibility
+		interface_exists('SessionHandlerInterface', FALSE) OR require_once(BASEPATH.'libraries/Session/SessionHandlerInterface.php');
 
-		// Delete expired tempdata
-		$this->_tempdata_sweep();
+		$prefix = config_item('subclass_prefix');
 
-		log_message('debug', 'CI_Session routines successfully run');
-	}
+		if ( ! class_exists('CI_Session_driver', FALSE))
+		{
+			if (file_exists($file_path = APPPATH.'libraries/Session/Session_driver.php') OR file_exists($file_path = BASEPATH.'libraries/Session/Session_driver.php'))
+			{
+				require_once($file_path);
+			}
 
-	// ------------------------------------------------------------------------
+			if (file_exists($file_path = APPPATH.'libraries/Session/'.$prefix.'Session_driver.php'))
+			{
+				require_once($file_path);
+			}
+		}
 
-	/**
-	 * Loads session storage driver
-	 *
-	 * @param	string	Driver classname
-	 * @return	object	Loaded driver object
-	 */
-	public function load_driver($driver)
-	{
-		// Save reference to most recently loaded driver as library default and sync userdata
-		$this->current = parent::load_driver($driver);
-		$this->userdata =& $this->current->get_userdata();
-		return $this->current;
-	}
+		$class = 'Session_'.$driver.'_driver';
 
-	// ------------------------------------------------------------------------
+		if ( ! class_exists('CI_'.$class, FALSE))
+		{
+			if (file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$class.'.php') OR file_exists($file_path = BASEPATH.'libraries/Session/drivers/'.$class.'.php'))
+			{
+				require_once($file_path);
+			}
 
-	/**
-	 * Select default session storage driver
-	 *
-	 * @param	string	Driver name
-	 * @return	void
-	 */
-	public function select_driver($driver)
-	{
-		// Validate driver name
-		$prefix = (string) get_instance()->config->item('subclass_prefix');
-		$child = strtolower(str_replace(array('CI_', $prefix, $this->lib_name.'_'), '', $driver));
-		if (in_array($child, array_map('strtolower', $this->valid_drivers)))
+			if ( ! class_exists('CI_'.$class, FALSE))
+			{
+				log_message('error', "Session: Configured driver '".$driver."' was not found. Aborting.");
+				return FALSE;
+			}
+		}
+
+		if ( ! class_exists($prefix.$class) && file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$prefix.$class.'.php'))
 		{
-			// See if driver is loaded
-			if (isset($this->$child))
+			require_once($file_path);
+			if (class_exists($prefix.$class, FALSE))
 			{
-				// See if driver is already current
-				if ($this->$child !== $this->current)
-				{
-					// Make driver current and sync userdata
-					$this->current = $this->$child;
-					$this->userdata =& $this->current->get_userdata();
-				}
+				return $prefix.$class;
 			}
 			else
 			{
-				// Load new driver
-				$this->load_driver($child);
+				log_message('debug', 'Session: '.$prefix.$class.".php found but it doesn't declare class ".$prefix.$class.'.');
 			}
 		}
+
+		return 'CI_'.$class;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Destroy the current session
+	 * Handle temporary variables
+	 *
+	 * Clears old "flash" data, marks the new one for deletion and handles
+	 * "temp" data deletion.
 	 *
 	 * @return	void
 	 */
-	public function sess_destroy()
+	protected function _ci_init_vars()
 	{
-		// Just call destroy on driver
-		$this->current->sess_destroy();
-	}
+		if ( ! empty($_SESSION['__ci_vars']))
+		{
+			$current_time = time();
 
-	// ------------------------------------------------------------------------
+			foreach ($_SESSION['__ci_vars'] as $key => &$value)
+			{
+				if ($value === 'new')
+				{
+					$_SESSION['__ci_vars'][$key] = 'old';
+				}
+				// Hacky, but 'old' will (implicitly) always be less than time() ;)
+				// DO NOT move this above the 'new' check!
+				elseif ($value < $current_time)
+				{
+					unset($_SESSION[$key], $_SESSION['__ci_vars'][$key]);
+				}
+			}
 
-	/**
-	 * Regenerate the current session
-	 *
-	 * @param	bool	Destroy session data flag (default: false)
-	 * @return	void
-	 */
-	public function sess_regenerate($destroy = FALSE)
-	{
-		// Call regenerate on driver and resync userdata
-		$this->current->sess_regenerate($destroy);
-		$this->userdata =& $this->current->get_userdata();
+			if (empty($_SESSION['__ci_vars']))
+			{
+				unset($_SESSION['__ci_vars']);
+			}
+		}
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Fetch a specific item from the session array
+	 * Mark as flash
 	 *
-	 * @param	string	Item key
-	 * @return	string	Item value or NULL if not found
+	 * @param	mixed	$key	Session data key(s)
+	 * @return	bool
 	 */
-	public function userdata($item = NULL)
+	public function mark_as_flash($key)
 	{
-		if (isset($item))
+		if (is_array($key))
 		{
-			return isset($this->userdata[$item]) ? $this->userdata[$item] : NULL;
-		}
+			for ($i = 0, $c = count($key); $i < $c; $i++)
+			{
+				if ( ! isset($_SESSION[$key[$i]]))
+				{
+					return FALSE;
+				}
+			}
 
-		return isset($this->userdata) ? $this->userdata : array();
-	}
+			$new = array_fill_keys($key, 'new');
 
-	// ------------------------------------------------------------------------
+			$_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars'])
+				? array_merge($_SESSION['__ci_vars'], $new)
+				: $new;
 
-	/**
-	 * Fetch all session data
-	 *
-	 * @deprecated	3.0.0	Use userdata() with no parameters instead
-	 * @return	array	User data array
-	 */
-	public function all_userdata()
-	{
-		return isset($this->userdata) ? $this->userdata : array();
+			return TRUE;
+		}
+
+		if ( ! isset($_SESSION[$key]))
+		{
+			return FALSE;
+		}
+
+		$_SESSION['__ci_vars'][$key] = 'new';
+		return TRUE;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Add or change data in the "userdata" array
+	 * Get flash keys
 	 *
-	 * @param	mixed	Item name or array of items
-	 * @param	string	Item value or empty string
-	 * @return	void
+	 * @return	array
 	 */
-	public function set_userdata($newdata, $newval = '')
+	public function get_flash_keys()
 	{
-		// Wrap params as array if singular
-		if (is_string($newdata))
+		if ( ! isset($_SESSION['__ci_vars']))
 		{
-			$newdata = array($newdata => $newval);
+			return array();
 		}
 
-		// Set each name/value pair
-		if (count($newdata) > 0)
+		$keys = array();
+		foreach (array_keys($_SESSION['__ci_vars']) as $key)
 		{
-			foreach ($newdata as $key => $val)
-			{
-				$this->userdata[$key] = $val;
-			}
+			is_int($_SESSION['__ci_vars'][$key]) OR $keys[] = $key;
 		}
 
-		// Tell driver data changed
-		$this->current->sess_save();
+		return $keys;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Delete a session variable from the "userdata" array
+	 * Unmark flash
 	 *
-	 * @param	mixed	Item name or array of item names
+	 * @param	mixed	$key	Session data key(s)
 	 * @return	void
 	 */
-	public function unset_userdata($newdata)
+	public function unmark_flash($key)
 	{
-		// Wrap single name as array
-		if (is_string($newdata))
+		if (empty($_SESSION['__ci_vars']))
 		{
-			$newdata = array($newdata => '');
+			return;
 		}
 
-		// Unset each item name
-		if (count($newdata) > 0)
+		is_array($key) OR $key = array($key);
+
+		foreach ($key as $k)
 		{
-			foreach (array_keys($newdata) as $key)
+			if (isset($_SESSION['__ci_vars'][$k]) && ! is_int($_SESSION['__ci_vars'][$k]))
 			{
-				unset($this->userdata[$key]);
+				unset($_SESSION['__ci_vars'][$k]);
 			}
 		}
 
-		// Tell driver data changed
-		$this->current->sess_save();
+		if (empty($_SESSION['__ci_vars']))
+		{
+			unset($_SESSION['__ci_vars']);
+		}
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Determine if an item exists
+	 * Mark as temp
 	 *
-	 * @param	string	Item name
+	 * @param	mixed	$key	Session data key(s)
+	 * @param	int	$ttl	Time-to-live in seconds
 	 * @return	bool
 	 */
-	public function has_userdata($item)
+	public function mark_as_temp($key, $ttl = 300)
 	{
-		return isset($this->userdata[$item]);
+		$ttl += time();
+
+		if (is_array($key))
+		{
+			$temp = array();
+
+			foreach ($key as $k => $v)
+			{
+				// Do we have a key => ttl pair, or just a key?
+				if (is_int($k))
+				{
+					$k = $v;
+					$v = $ttl;
+				}
+				else
+				{
+					$v += time();
+				}
+
+				if ( ! isset($_SESSION[$k]))
+				{
+					return FALSE;
+				}
+
+				$temp[$k] = $ts;
+			}
+
+			$_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars'])
+				? array_merge($_SESSION['__ci_vars'], $temp)
+				: $temp;
+
+			return TRUE;
+		}
+
+		if ( ! isset($_SESSION[$key]))
+		{
+			return FALSE;
+		}
+
+		$_SESSION['__ci_vars'][$key] = $ttl;
+		return TRUE;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Add or change flashdata, only available until the next request
+	 * Get temp keys
 	 *
-	 * @param	mixed	Item name or array of items
-	 * @param	string	Item value or empty string
-	 * @return	void
+	 * @return	array
 	 */
-	public function set_flashdata($newdata, $newval = '')
+	public function get_temp_keys()
 	{
-		// Wrap item as array if singular
-		if (is_string($newdata))
+		if ( ! isset($_SESSION['__ci_vars']))
 		{
-			$newdata = array($newdata => $newval);
+			return array();
 		}
 
-		// Prepend each key name and set value
-		if (count($newdata) > 0)
+		$keys = array();
+		foreach (array_keys($_SESSION['__ci_vars']) as $key)
 		{
-			foreach ($newdata as $key => $val)
-			{
-				$flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
-				$this->set_userdata($flashdata_key, $val);
-			}
+			is_int($_SESSION['__ci_vars'][$key]) && $keys[] = $key;
 		}
+
+		return $keys;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Keeps existing flashdata available to next request.
+	 * Unmark flash
 	 *
-	 * @param	mixed	Item key(s)
+	 * @param	mixed	$key	Session data key(s)
 	 * @return	void
 	 */
-	public function keep_flashdata($key)
+	public function unmark_temp($key)
 	{
+		if (empty($_SESSION['__ci_vars']))
+		{
+			return;
+		}
 
-		if (is_array($key))
+		is_array($key) OR $key = array($key);
+
+		foreach ($key as $k)
 		{
-			foreach ($key as $k)
+			if (isset($_SESSION['__ci_vars'][$k]) && is_int($_SESSION['__ci_vars'][$k]))
 			{
-				$this->keep_flashdata($k);
+				unset($_SESSION['__ci_vars'][$k]);
 			}
-
-			return;
 		}
 
-		// 'old' flashdata gets removed. Here we mark all flashdata as 'new' to preserve it from _flashdata_sweep()
-		// Note the function will return NULL if the $key provided cannot be found
-		$old_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key;
-		$value = $this->userdata($old_flashdata_key);
-
-		$new_flashdata_key = self::FLASHDATA_KEY.self::FLASHDATA_NEW.$key;
-		$this->set_userdata($new_flashdata_key, $value);
+		if (empty($_SESSION['__ci_vars']))
+		{
+			unset($_SESSION['__ci_vars']);
+		}
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Fetch a specific flashdata item from the session array
+	 * __get()
 	 *
-	 * @param	string	Item key
-	 * @return	string
+	 * @param	string	$key	'session_id' or a session data key
+	 * @return	mixed
 	 */
-	public function flashdata($key = NULL)
+	public function __get($key)
 	{
-		if (isset($key))
+		// Note: Keep this order the same, just in case somebody wants to
+		//       use 'session_id' as a session data key, for whatever reason
+		if (isset($_SESSION[$key]))
 		{
-			return $this->userdata(self::FLASHDATA_KEY.self::FLASHDATA_OLD.$key);
+			return $_SESSION[$key];
 		}
-
-		// Get our flashdata items from userdata
-		$out = array();
-		foreach ($this->userdata() as $key => $val)
+		elseif ($key === 'session_id')
 		{
-			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_OLD) !== FALSE)
-			{
-				$key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_OLD, '', $key);
-				$out[$key] = $val;
-			}
+			return session_id();
 		}
 
-		return $out;
+		return NULL;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Add or change tempdata, only available until expiration
+	 * __set()
 	 *
-	 * @param	mixed	Item name or array of items
-	 * @param	string	Item value or empty string
-	 * @param	int	Item lifetime in seconds or 0 for default
+	 * @param	string	$key	Session data key
+	 * @param	mixed	$value	Session data value
 	 * @return	void
 	 */
-	public function set_tempdata($newdata, $newval = '', $expire = 0)
+	public function __set($key, $value)
 	{
-		// Set expiration time
-		$expire = time() + ($expire ? $expire : self::TEMP_EXP_DEF);
-
-		// Wrap item as array if singular
-		if (is_string($newdata))
-		{
-			$newdata = array($newdata => $newval);
-		}
-
-		// Get or create expiration list
-		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if ( ! $expirations)
-		{
-			$expirations = array();
-		}
+		$_SESSION[$key] = $value;
+	}
 
-		// Prepend each key name and set value
-		if (count($newdata) > 0)
-		{
-			foreach ($newdata as $key => $val)
-			{
-				$tempdata_key = self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key;
-				$expirations[$tempdata_key] = $expire;
-				$this->set_userdata($tempdata_key, $val);
-			}
-		}
+	// ------------------------------------------------------------------------
 
-		// Update expiration list
-		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
+	/**
+	 * Session destroy
+	 *
+	 * Legacy CI_Session compatibility method
+	 *
+	 * @return	void
+	 */
+	public function sess_destroy()
+	{
+		session_destroy();
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Delete a temporary session variable from the "userdata" array
+	 * Session regenerate
+	 *
+	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	mixed	Item name or array of item names
+	 * @param	bool	$destroy	Destroy old session data flag
 	 * @return	void
 	 */
-	public function unset_tempdata($newdata)
+	public function sess_regenerate($destroy = FALSE)
 	{
-		// Get expirations list
-		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if (empty($expirations))
-		{
-			// Nothing to do
-			return;
-		}
-
-		// Wrap single name as array
-		if (is_string($newdata))
-		{
-			$newdata = array($newdata => '');
-		}
+		session_regenerate_id($destroy);
+	}
 
-		// Prepend each item name and unset
-		if (count($newdata) > 0)
-		{
-			foreach (array_keys($newdata) as $key)
-			{
-				$tempdata_key = self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key;
-				unset($expirations[$tempdata_key]);
-				$this->unset_userdata($tempdata_key);
-			}
-		}
+	// ------------------------------------------------------------------------
 
-		// Update expiration list
-		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
+	/**
+	 * Get userdata reference
+	 *
+	 * Legacy CI_Session compatibility method
+	 *
+	 * @returns	array
+	 */
+	public function &get_userdata()
+	{
+		return $_SESSION;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Fetch a specific tempdata item from the session array
+	 * Userdata (fetch)
 	 *
-	 * @param	string	Item key
-	 * @return	string
+	 * Legacy CI_Session compatibility method
+	 *
+	 * @param	string	$key	Session data key
+	 * @return	mixed	Session data value or NULL if not found
 	 */
-	public function tempdata($key = NULL)
+	public function userdata($key = NULL)
 	{
 		if (isset($key))
 		{
-			return $this->userdata(self::FLASHDATA_KEY.self::FLASHDATA_EXP.$key);
+			return isset($_SESSION[$key]) ? $_SESSION[$key] : NULL;
 		}
-
-		// Get our tempdata items from userdata
-		$out = array();
-		foreach ($this->userdata() as $key => $val)
+		elseif (empty($_SESSION))
 		{
-			if (strpos($key, self::FLASHDATA_KEY.self::FLASHDATA_EXP) !== FALSE)
-			{
-				$key = str_replace(self::FLASHDATA_KEY.self::FLASHDATA_EXP, '', $key);
-				$out[$key] = $val;
-			}
+			return array();
 		}
 
-		return $out;
-	}
+		$userdata = array();
+		$_exclude = array_merge(
+			array('__ci_f', '__ci_t'),
+			$this->get_flash_keys(),
+			$this->get_temp_keys()
+		);
 
-	// ------------------------------------------------------------------------
-
-	/**
-	 * Identifies flashdata as 'old' for removal
-	 * when _flashdata_sweep() runs.
-	 *
-	 * @return	void
-	 */
-	protected function _flashdata_mark()
-	{
-		foreach ($this->userdata() as $name => $value)
+		foreach (array_keys($_SESSION) as $key)
 		{
-			$parts = explode(self::FLASHDATA_NEW, $name);
-			if (count($parts) === 2)
+			if ( ! in_array($key, $_exclude, TRUE))
 			{
-				$this->set_userdata(self::FLASHDATA_KEY.self::FLASHDATA_OLD.$parts[1], $value);
-				$this->unset_userdata($name);
+				$userdata[$key] = $_SESSION[$key];
 			}
 		}
+
+		return $userdata;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Removes all flashdata marked as 'old'
+	 * Set userdata
 	 *
+	 * Legacy CI_Session compatibility method
+	 *
+	 * @param	mixed	$data	Session data key or an associative array
+	 * @param	mixed	$value	Value to store
 	 * @return	void
 	 */
-	protected function _flashdata_sweep()
+	public function set_userdata($data, $value = NULL)
 	{
-		$userdata = $this->userdata();
-		foreach (array_keys($userdata) as $key)
+		if (is_array($data))
 		{
-			if (strpos($key, self::FLASHDATA_OLD))
+			foreach ($data as $key => &$value)
 			{
-				$this->unset_userdata($key);
+				$_SESSION[$key] = $value;
 			}
+
+			return;
 		}
+
+		$_SESSION[$data] = $value;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Removes all expired tempdata
+	 * Unset userdata
+	 *
+	 * Legacy CI_Session compatibility method
 	 *
+	 * @param	mixed	$data	Session data key(s)
 	 * @return	void
 	 */
-	protected function _tempdata_sweep()
+	public function unset_userdata($key)
 	{
-		// Get expirations list
-		$expirations = $this->userdata(self::EXPIRATION_KEY);
-		if (empty($expirations))
-		{
-			// Nothing to do
-			return;
-		}
-
-		// Unset expired elements
-		$now = time();
-		$userdata = $this->userdata();
-		foreach (array_keys($userdata) as $key)
+		if (is_array($key))
 		{
-			if (strpos($key, self::FLASHDATA_EXP) && $expirations[$key] < $now)
+			foreach ($key as $k)
 			{
-				unset($expirations[$key]);
-				$this->unset_userdata($key);
+				unset($_SESSION[$key]);
 			}
+
+			return;
 		}
 
-		// Update expiration list
-		$this->set_userdata(self::EXPIRATION_KEY, $expirations);
+		unset($_SESSION[$key]);
 	}
 
-}
-
-// ------------------------------------------------------------------------
-
-/**
- * CI_Session_driver Class
- *
- * Extend this class to make a new CI_Session driver.
- * A CI_Session driver basically manages an array of name/value pairs with some sort of storage mechanism.
- * To make a new driver, derive from (extend) CI_Session_driver. Overload the initialize method and read or create
- * session data. Then implement a save handler to write changed data to storage (sess_save), a destroy handler
- * to remove deleted data (sess_destroy), and an access handler to expose the data (get_userdata).
- * Put your driver in the libraries/Session/drivers folder anywhere in the loader paths. This includes the
- * application directory, the system directory, or any path you add with $CI->load->add_package_path().
- * Your driver must be named CI_Session_<name>, and your filename must be Session_<name>.php,
- * preferably also capitalized. (e.g.: CI_Session_foo in libraries/Session/drivers/Session_foo.php)
- * Then specify the driver by setting 'sess_driver' in your config file or as a parameter when loading the CI_Session
- * object. (e.g.: $config['sess_driver'] = 'foo'; OR $CI->load->driver('session', array('sess_driver' => 'foo')); )
- * Already provided are the Native driver, which manages the native PHP $_SESSION array, and
- * the Cookie driver, which manages the data in a browser cookie, with optional extra storage in a database table.
- *
- * @package		CodeIgniter
- * @subpackage	Libraries
- * @category	Sessions
- * @author		EllisLab Dev Team
- */
-abstract class CI_Session_driver extends CI_Driver {
-
-	/**
-	 * CI Singleton
-	 *
-	 * @see	get_instance()
-	 * @var	object
-	 */
-	protected $CI;
-
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Constructor
+	 * All userdata (fetch)
 	 *
-	 * Gets the CI singleton, so that individual drivers
-	 * don't have to do it separately.
+	 * Legacy CI_Session compatibility method
 	 *
-	 * @return	void
+	 * @return	array	$_SESSION, excluding flash data items
 	 */
-	public function __construct()
+	public function all_userdata()
 	{
-		$this->CI =& get_instance();
+		return $this->userdata();
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Decorate
+	 * Has userdata
 	 *
-	 * Decorates the child with the parent driver lib's methods and properties
+	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	object	Parent library object
-	 * @return	void
+	 * @param	string	$key	Session data key
+	 * @return	bool
 	 */
-	public function decorate($parent)
+	public function has_userdata($key)
 	{
-		// Call base class decorate first
-		parent::decorate($parent);
-
-		// Call initialize method now that driver has access to $this->_parent
-		$this->initialize();
+		return isset($_SESSION[$key]);
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * __call magic method
+	 * Flashdata (fetch)
 	 *
-	 * Handles access to the parent driver library's methods
+	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	string	Library method name
-	 * @param	array	Method arguments (default: none)
-	 * @return	mixed
+	 * @param	string	$key	Session data key
+	 * @return	mixed	Session data value or NULL if not found
 	 */
-	public function __call($method, $args = array())
+	public function flashdata($key = NULL)
 	{
-		// Make sure the parent library uses this driver
-		$this->_parent->select_driver(get_class($this));
-		return parent::__call($method, $args);
+		if (isset($key))
+		{
+			return isset($_SESSION['__ci_f'], $_SESSION['__ci_f'][$key], $_SESSION[$key])
+				? $_SESSION[$key]
+				: NULL;
+		}
+
+		$flashdata = array();
+
+		if ( ! empty($_SESSION['__ci_f']))
+		{
+			foreach (array_keys($_SESSION['__ci_f']) as $key)
+			{
+				$flashdata[$key] = $_SESSION[$key];
+			}
+		}
+
+		return $flashdata;
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Initialize driver
+	 * Set flashdata
 	 *
+	 * Legacy CI_Session compatibiliy method
+	 *
+	 * @param	mixed	$data	Session data key or an associative array
+	 * @param	mixed	$value	Value to store
 	 * @return	void
 	 */
-	protected function initialize()
+	public function set_flashdata($data, $value = NULL)
 	{
-		// Overload this method to implement initialization
+		$this->set_userdata($data, $value);
+		$this->mark_as_flash($data);
 	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Save the session data
+	 * Keep flashdata
 	 *
-	 * Data in the array has changed - perform any storage synchronization
-	 * necessary. The child class MUST implement this abstract method!
+	 * Legacy CI_Session compatibility method
 	 *
+	 * @param	mixed	$key	Session data key(s)
 	 * @return	void
 	 */
-	abstract public function sess_save();
+	public function keep_flashdata($key)
+	{
+		$this->mark_as_flash($key);
+	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Destroy the current session
+	 * Temp data (fetch)
 	 *
-	 * Clean up storage for this session - it has been terminated.
-	 * The child class MUST implement this abstract method!
+	 * Legacy CI_Session compatibility method
 	 *
-	 * @return	void
+	 * @param	string	$key	Session data key
+	 * @return	mixed	Session data value or NULL if not found
 	 */
-	abstract public function sess_destroy();
+	public function tempdata($key = NULL)
+	{
+		if (isset($key))
+		{
+			return isset($_SESSION['__ci_t'], $_SESSION['__ci_t'][$key], $_SESSION[$key])
+				? $_SESSION[$key]
+				: NULL;
+		}
+
+		$tempdata = array();
+
+		if ( ! empty($_SESSION['__ci_t']))
+		{
+			foreach (array_keys($_SESSION['__ci_t']) as $key)
+			{
+				$tempdata[$key] = $_SESSION[$key];
+			}
+		}
+
+		return $tempdata;
+	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Regenerate the current session
+	 * Set tempdata
 	 *
-	 * Regenerate the session ID.
-	 * The child class MUST implement this abstract method!
+	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	bool	Destroy session data flag (default: false)
+	 * @param	mixed	$data	Session data key or an associative array of items
+	 * @param	mixed	$value	Value to store
+	 * @param	int	$ttl	Time-to-live in seconds
 	 * @return	void
 	 */
-	abstract public function sess_regenerate($destroy = FALSE);
+	public function set_tempdata($data, $value = NULL, $ttl = 300)
+	{
+		$this->set_userdata($data, $value);
+		$this->mark_as_temp($data, $ttl);
+	}
 
 	// ------------------------------------------------------------------------
 
 	/**
-	 * Get a reference to user data array
+	 * Unset tempdata
 	 *
-	 * Give array access to the main CI_Session object.
-	 * The child class MUST implement this abstract method!
+	 * Legacy CI_Session compatibility method
 	 *
-	 * @return	array	Reference to userdata
+	 * @param	mixed	$data	Session data key(s)
+	 * @return	void
 	 */
-	abstract public function &get_userdata();
+	public function unset_tempdata($key)
+	{
+		$this->unmark_temp($key);
+	}
 
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 34b1ef5c13882c4a7827be71e82503ee47d4c271 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Sat, 31 May 2014 21:23:41 +0300
Subject: [ci skip] A quick and dirty fix for allowing 'sess_driver'
 configuration

---
 system/libraries/Session/Session.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 0d444e8ca..518dc28b0 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -49,7 +49,6 @@ class CI_Session {
 	 */
 	public function __construct(array $params = array())
 	{
-
 		// No sessions under CLI
 		if (is_cli())
 		{
@@ -66,6 +65,11 @@ class CI_Session {
 			$this->_driver = $params['driver'];
 			unset($params['driver']);
 		}
+		// Note: Make the autoloader pass sess_* params to this constructor
+		elseif (empty($params) && $driver = config_item('sess_driver'))
+		{
+			$this->_driver = $driver;
+		}
 
 		if (($class = $this->_ci_load_classes($this->_driver)) === FALSE)
 		{
-- 
cgit v1.2.3-24-g4f1b


From ac4f47283a6a8ce575f59c15c1a08ad3bc2efdd9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 2 Jun 2014 11:16:32 +0300
Subject: #3073: BC workarounds for sess_use_database, sess_expire_on_close

---
 system/libraries/Session/Session.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 518dc28b0..bdcde1e76 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -70,6 +70,11 @@ class CI_Session {
 		{
 			$this->_driver = $driver;
 		}
+		// Note: BC workaround
+		elseif (config_item('sess_use_database'))
+		{
+			$this->_driver = 'database';
+		}
 
 		if (($class = $this->_ci_load_classes($this->_driver)) === FALSE)
 		{
-- 
cgit v1.2.3-24-g4f1b


From ef41786a8a3e04d30fef757acd83c5ab888df88e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 4 Jun 2014 21:28:13 +0300
Subject: #3073: Fix temp/flash data getters

---
 system/libraries/Session/Session.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bdcde1e76..df6225e68 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -509,7 +509,7 @@ class CI_Session {
 
 		$userdata = array();
 		$_exclude = array_merge(
-			array('__ci_f', '__ci_t'),
+			array('__ci_vars'),
 			$this->get_flash_keys(),
 			$this->get_temp_keys()
 		);
@@ -619,18 +619,18 @@ class CI_Session {
 	{
 		if (isset($key))
 		{
-			return isset($_SESSION['__ci_f'], $_SESSION['__ci_f'][$key], $_SESSION[$key])
+			return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) && ! is_int($_SESSION['__ci_vars'][$key]))
 				? $_SESSION[$key]
 				: NULL;
 		}
 
 		$flashdata = array();
 
-		if ( ! empty($_SESSION['__ci_f']))
+		if ( ! empty($_SESSION['__ci_vars']))
 		{
-			foreach (array_keys($_SESSION['__ci_f']) as $key)
+			foreach ($_SESSION['__ci_vars'] as $key => &$value)
 			{
-				$flashdata[$key] = $_SESSION[$key];
+				is_int($value) OR $flashdata[$key] = $_SESSION[$key];
 			}
 		}
 
@@ -683,18 +683,18 @@ class CI_Session {
 	{
 		if (isset($key))
 		{
-			return isset($_SESSION['__ci_t'], $_SESSION['__ci_t'][$key], $_SESSION[$key])
+			return (isset($_SESSION['__ci_vars'], $_SESSION['__ci_vars'][$key], $_SESSION[$key]) && is_int($_SESSION['__ci_vars'][$key]))
 				? $_SESSION[$key]
 				: NULL;
 		}
 
 		$tempdata = array();
 
-		if ( ! empty($_SESSION['__ci_t']))
+		if ( ! empty($_SESSION['__ci_vars']))
 		{
-			foreach (array_keys($_SESSION['__ci_t']) as $key)
+			foreach ($_SESSION['__ci_vars'] as $key => &$value)
 			{
-				$tempdata[$key] = $_SESSION[$key];
+				is_int($value) && $tempdata[$key] = $_SESSION[$key];
 			}
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From e86603fb4eb218077e255d76a638a3e545e2fd0c Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 11 Jun 2014 14:03:36 +0300
Subject: [ci skip] A tiny optimization

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index df6225e68..a5c9737f7 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -125,10 +125,11 @@ class CI_Session {
 
 		if ( ! class_exists('CI_Session_driver', FALSE))
 		{
-			if (file_exists($file_path = APPPATH.'libraries/Session/Session_driver.php') OR file_exists($file_path = BASEPATH.'libraries/Session/Session_driver.php'))
-			{
-				require_once($file_path);
-			}
+			require_once(
+				file_exists(APPPATH.'libraries/Session/Session_driver.php')
+					? APPPATH.'libraries/Session/Session_driver.php'
+					: BASEPATH.'libraries/Session/Session_driver.php'
+			);
 
 			if (file_exists($file_path = APPPATH.'libraries/Session/'.$prefix.'Session_driver.php'))
 			{
@@ -137,7 +138,6 @@ class CI_Session {
 		}
 
 		$class = 'Session_'.$driver.'_driver';
-
 		if ( ! class_exists('CI_'.$class, FALSE))
 		{
 			if (file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$class.'.php') OR file_exists($file_path = BASEPATH.'libraries/Session/drivers/'.$class.'.php'))
-- 
cgit v1.2.3-24-g4f1b


From d069b9bc148f739733a5aa0a737e51e57c10b3ad Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 16 Sep 2014 10:18:16 +0300
Subject: feature/session (#3073): Bug fixes

- CI_Session_database_driver::read() didn't pass the session ID to _get_lock()
- CI_Session::unset_userdata() used a wrong key for unsetting when an array is passed to it
---
 system/libraries/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index a5c9737f7..be9f5e3c7 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -567,7 +567,7 @@ class CI_Session {
 		{
 			foreach ($key as $k)
 			{
-				unset($_SESSION[$key]);
+				unset($_SESSION[$k]);
 			}
 
 			return;
-- 
cgit v1.2.3-24-g4f1b


From dfb39bec5faf77e806e55f3ee9d2138e57d55010 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Oct 2014 01:50:14 +0300
Subject: feature/session (#3073): Refactor configuration & fix cookie expiry
 times

---
 system/libraries/Session/Session.php | 121 ++++++++++++++++++++++++++++++++++-
 1 file changed, 118 insertions(+), 3 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index be9f5e3c7..47c43074e 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -38,6 +38,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 class CI_Session {
 
 	protected $_driver = 'files';
+	protected $_config;
 
 	// ------------------------------------------------------------------------
 
@@ -65,8 +66,7 @@ class CI_Session {
 			$this->_driver = $params['driver'];
 			unset($params['driver']);
 		}
-		// Note: Make the autoloader pass sess_* params to this constructor
-		elseif (empty($params) && $driver = config_item('sess_driver'))
+		elseif ($driver = config_item('sess_driver'))
 		{
 			$this->_driver = $driver;
 		}
@@ -81,7 +81,10 @@ class CI_Session {
 			return;
 		}
 
-		$class = new $class($params);
+		// Configuration ...
+		$this->_configure($params);
+
+		$class = new $class($this->_config);
 		if ($class instanceof SessionHandlerInterface)
 		{
 			if (is_php('5.4'))
@@ -108,9 +111,50 @@ class CI_Session {
 			return;
 		}
 
+		// Work-around for PHP bug #66827 (https://bugs.php.net/bug.php?id=66827)
+		//
+		// The session ID sanitizer doesn't check for the value type and blindly does
+		// an implicit cast to string, which triggers an 'Array to string' E_NOTICE.
+		if (isset($_COOKIE[$this->_cookie_name]) && ! is_string($_COOKIE[$this->_cookie_name]))
+		{
+			unset($_COOKIE[$this->_cookie_name]);
+		}
+
 		session_start();
+
+		// Another work-around ... PHP doesn't seem to send the session cookie
+		// unless it is being currently created or regenerated
+		if (isset($_COOKIE[$this->_config['cookie_name']]) && $_COOKIE[$this->_config['cookie_name']] === session_id())
+		{
+			setcookie(
+				$this->_config['cookie_name'],
+				session_id(),
+				(empty($this->_config['cookie_lifetime']) ? 0 : time() + $this->_config['cookie_lifetime']),
+				$this->_config['cookie_path'],
+				$this->_config['cookie_domain'],
+				$this->_config['cookie_secure'],
+				TRUE
+			);
+		}
+
 		$this->_ci_init_vars();
 
+/*
+		Need to test if this is necessary for a custom driver or if it's only
+		relevant to PHP's own files handler.
+
+		https://bugs.php.net/bug.php?id=65475
+		do this after session is started:
+		if (is_php('5.5.2') && ! is_php('5.5.4'))
+		{
+			$session_id = session_id();
+			if ($_COOKIE[$this->_cookie_name] !== $session_id && file_exists(teh file))
+			{
+				unlink(<teh file>);
+			}
+		}
+*/
+
 		log_message('debug', "Session: Class initialized using '".$this->_driver."' driver.");
 	}
 
@@ -170,6 +214,77 @@ class CI_Session {
 
 	// ------------------------------------------------------------------------
 
+	/**
+	 * Configuration
+	 *
+	 * Handle input parameters and configuration defaults
+	 *
+	 * @param	array	&$params	Input parameters
+	 * @return	void
+	 */
+	protected function _configure(&$params)
+	{
+		$expiration = config_item('sess_expiration');
+
+		if (isset($params['cookie_lifetime']))
+		{
+			$params['cookie_lifetime'] = (int) $params['cookie_lifetime'];
+		}
+		else
+		{
+			$params['cookie_lifetime'] = ( ! isset($expiration) && config_item('sess_expire_on_close'))
+				? 0 : (int) $expiration;
+		}
+
+		isset($params['cookie_name']) OR $params['cookie_name'] = config_item('sess_cookie_name');
+		if (empty($params['cookie_name']))
+		{
+			$params['cookie_name'] = ini_get('session.name');
+		}
+		else
+		{
+			ini_set('session.name', $params['cookie_name']);
+		}
+
+		isset($params['cookie_path']) OR $params['cookie_path'] = config_item('cookie_path');
+		isset($params['cookie_domain']) OR $parrams['cookie_domain'] = config_item('cookie_domain');
+		isset($params['cookie_secure']) OR $params['cookie_secure'] = (bool) config_item('cookie_secure');
+
+		session_set_cookie_params(
+			$params['cookie_lifetime'],
+			$params['cookie_path'],
+			$params['cookie_domain'],
+			$params['cookie_secure'],
+			TRUE // HttpOnly; Yes, this is intentional and not configurable for security reasons
+		);
+
+		if (empty($expiration))
+		{
+			$params['expiration'] = (int) ini_get('session.gc_maxlifetime');
+		}
+		else
+		{
+			$params['expiration'] = (int) $expiration;
+			ini_set('session.gc_maxlifetime', $expiration);
+		}
+
+		$params['match_ip'] = (bool) (isset($params['match_ip']) ? $params['match_ip'] : config_item('sess_match_ip'));
+
+		isset($params['save_path']) OR $params['save_path'] = config_item('sess_save_path');
+
+		$this->_config = $params;
+
+		// Security is king
+		ini_set('session.use_trans_id', 0);
+		ini_set('session.use_strict_mode', 1);
+		ini_set('session.use_cookies', 1);
+		ini_set('session.use_only_cookies', 1);
+		ini_set('session.hash_function', 1);
+		ini_set('session.hash_bits_per_character', 4);
+	}
+
+	// ------------------------------------------------------------------------
+
 	/**
 	 * Handle temporary variables
 	 *
-- 
cgit v1.2.3-24-g4f1b


From 41b546deee9f1ed99f3820de5a2014b2d74a0c94 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Oct 2014 03:01:22 +0300
Subject: feature/session (#3073): Fix a variable name

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 47c43074e..c00262cc2 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -247,7 +247,7 @@ class CI_Session {
 		}
 
 		isset($params['cookie_path']) OR $params['cookie_path'] = config_item('cookie_path');
-		isset($params['cookie_domain']) OR $parrams['cookie_domain'] = config_item('cookie_domain');
+		isset($params['cookie_domain']) OR $params['cookie_domain'] = config_item('cookie_domain');
 		isset($params['cookie_secure']) OR $params['cookie_secure'] = (bool) config_item('cookie_secure');
 
 		session_set_cookie_params(
-- 
cgit v1.2.3-24-g4f1b


From c6e50989480d5e9a9847177b8dc7cefa6559329a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Sun, 26 Oct 2014 21:27:28 +0200
Subject: #3073 (feature/session): set_flashdata() crap

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index c00262cc2..7908badf8 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -766,7 +766,7 @@ class CI_Session {
 	public function set_flashdata($data, $value = NULL)
 	{
 		$this->set_userdata($data, $value);
-		$this->mark_as_flash($data);
+		$this->mark_as_flash(is_array($data) ? array_keys($data) : $data);
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From bdb96ca1b1dbfc1791172fd169d7751cbc4d7d55 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 28 Oct 2014 00:13:31 +0200
Subject: [ci skip] Switch to MIT license; close #3293

---
 system/libraries/Session/Session.php | 39 +++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 905352bb3..3b26a2f17 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -4,24 +4,35 @@
  *
  * An open source application development framework for PHP 5.2.4 or newer
  *
- * NOTICE OF LICENSE
+ * This content is released under the MIT License (MIT)
  *
- * Licensed under the Open Software License version 3.0
+ * Copyright (c) 2014, British Columbia Institute of Technology
  *
- * This source file is subject to the Open Software License (OSL 3.0) that is
- * bundled with this package in the files license.txt / license.rst.  It is
- * also available through the world wide web at this URL:
- * http://opensource.org/licenses/OSL-3.0
- * If you did not receive a copy of the license and are unable to obtain it
- * through the world wide web, please send an email to
- * licensing@ellislab.com so we can send you a copy immediately.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * @package		CodeIgniter
- * @author		EllisLab Dev Team
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @package	CodeIgniter
+ * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
- * @link		http://codeigniter.com
- * @since		Version 2.0
+ * @copyright	Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/)
+ * @license	http://opensource.org/licenses/MIT	MIT License
+ * @link	http://codeigniter.com
+ * @since	Version 2.0.0
  * @filesource
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
-- 
cgit v1.2.3-24-g4f1b


From 8e60b9a40a01a021e865b24e7d709e9e6ede0beb Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 4 Nov 2014 11:08:06 +0200
Subject: #3073 (feature/session): Implement automatic ID regeneration

---
 system/libraries/Session/Session.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 7908badf8..f250c3d64 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -122,9 +122,20 @@ class CI_Session {
 
 		session_start();
 
+		if (($regenerate_time = config_item('sess_time_to_update')) > 0)
+		{
+			if ( ! isset($_SESSION['__ci_last_regenerate']))
+			{
+				$_SESSION['__ci_last_regenerate'] = time();
+			}
+			elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerate_time))
+			{
+				$this->sess_regenerate(FALSE);
+			}
+		}
 		// Another work-around ... PHP doesn't seem to send the session cookie
 		// unless it is being currently created or regenerated
-		if (isset($_COOKIE[$this->_config['cookie_name']]) && $_COOKIE[$this->_config['cookie_name']] === session_id())
+		elseif (isset($_COOKIE[$this->_config['cookie_name']]) && $_COOKIE[$this->_config['cookie_name']] === session_id())
 		{
 			setcookie(
 				$this->_config['cookie_name'],
@@ -138,7 +149,6 @@ class CI_Session {
 		}
 
 		$this->_ci_init_vars();
-
 /*
 		Need to test if this is necessary for a custom driver or if it's only
 		relevant to PHP's own files handler.
@@ -584,6 +594,7 @@ class CI_Session {
 	 */
 	public function sess_regenerate($destroy = FALSE)
 	{
+		$_SESSION['__ci_last_regenerate'] = time();
 		session_regenerate_id($destroy);
 	}
 
-- 
cgit v1.2.3-24-g4f1b


From ff37ffe164443e53b24d529f967a1bdf065bff3a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 4 Nov 2014 12:28:57 +0200
Subject: #3073 (feature/session): Don't regenerate IDs on AJAX requests

---
 system/libraries/Session/Session.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index f250c3d64..bf11cd181 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -122,7 +122,11 @@ class CI_Session {
 
 		session_start();
 
-		if (($regenerate_time = config_item('sess_time_to_update')) > 0)
+		// Is session ID auto-regeneration configured? (ignoring ajax requests)
+		if ( ! empty($_SERVER['HTTP_X_REQUESTED_WITH'])
+			&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest'
+			&& $regenerate_time = config_item('sess_time_to_update')) > 0
+		)
 		{
 			if ( ! isset($_SESSION['__ci_last_regenerate']))
 			{
-- 
cgit v1.2.3-24-g4f1b


From de5c246dfcaf1c92e8b77830249df44b3cca2e8c Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 4 Nov 2014 12:31:03 +0200
Subject: #3073 (feature/session): Fix a typo from
 ff37ffe164443e53b24d529f967a1bdf065bff3a

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bf11cd181..e6ba341dd 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -125,7 +125,7 @@ class CI_Session {
 		// Is session ID auto-regeneration configured? (ignoring ajax requests)
 		if ( ! empty($_SERVER['HTTP_X_REQUESTED_WITH'])
 			&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest'
-			&& $regenerate_time = config_item('sess_time_to_update')) > 0
+			&& ($regenerate_time = config_item('sess_time_to_update')) > 0
 		)
 		{
 			if ( ! isset($_SESSION['__ci_last_regenerate']))
-- 
cgit v1.2.3-24-g4f1b


From 562e39bab43181fb709aeaf4dee14bf481a2cc6a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 12 Nov 2014 15:38:58 +0200
Subject: #3073 (feature/session): Validate incoming session IDs

---
 system/libraries/Session/Session.php | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 293811ec8..1d93cb1c8 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -122,13 +122,15 @@ class CI_Session {
 			return;
 		}
 
-		// Work-around for PHP bug #66827 (https://bugs.php.net/bug.php?id=66827)
-		//
-		// The session ID sanitizer doesn't check for the value type and blindly does
-		// an implicit cast to string, which triggers an 'Array to string' E_NOTICE.
-		if (isset($_COOKIE[$this->_cookie_name]) && ! is_string($_COOKIE[$this->_cookie_name]))
+		// Sanitize the cookie, because apparently PHP doesn't do that for userspace handlers
+		if (isset($_COOKIE[$this->_config['cookie_name']])
+			&& (
+				! is_string($_COOKIE[$this->_config['cookie_name']])
+				OR ! preg_match('/^[0-9a-f]{40}$/', $_COOKIE[$this->_config['cookie_name']])
+			)
+		)
 		{
-			unset($_COOKIE[$this->_cookie_name]);
+			unset($_COOKIE[$this->_config['cookie_name']]);
 		}
 
 		session_start();
@@ -164,21 +166,6 @@ class CI_Session {
 		}
 
 		$this->_ci_init_vars();
-/*
-		Need to test if this is necessary for a custom driver or if it's only
-		relevant to PHP's own files handler.
-
-		https://bugs.php.net/bug.php?id=65475
-		do this after session is started:
-		if (is_php('5.5.2') && ! is_php('5.5.4'))
-		{
-			$session_id = session_id();
-			if ($_COOKIE[$this->_cookie_name] !== $session_id && file_exists(teh file))
-			{
-				unlink(<teh file>);
-			}
-		}
-*/
 
 		log_message('debug', "Session: Class initialized using '".$this->_driver."' driver.");
 	}
-- 
cgit v1.2.3-24-g4f1b


From cd94dd7e1d8969658810ccc4158a75d2936d0a44 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 9 Dec 2014 17:38:56 +0200
Subject: #3073 (feature/session): Allow custom drivers without the CI_ or MY_
 prefix

---
 system/libraries/Session/Session.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1d93cb1c8..4fa9fd248 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -194,6 +194,17 @@ class CI_Session {
 		}
 
 		$class = 'Session_'.$driver.'_driver';
+
+		// Allow custom drivers without the CI_ or MY_ prefix
+		if ( ! class_exists($class, FALSE) && file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$class.'.php'))
+		{
+			require_once($file_path);
+			if (class_exists($class, FALSE))
+			{
+				return $class;
+			}
+		}
+
 		if ( ! class_exists('CI_'.$class, FALSE))
 		{
 			if (file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$class.'.php') OR file_exists($file_path = BASEPATH.'libraries/Session/drivers/'.$class.'.php'))
@@ -201,7 +212,7 @@ class CI_Session {
 				require_once($file_path);
 			}
 
-			if ( ! class_exists('CI_'.$class, FALSE))
+			if ( ! class_exists('CI_'.$class, FALSE) && ! class_exists($class, FALSE))
 			{
 				log_message('error', "Session: Configured driver '".$driver."' was not found. Aborting.");
 				return FALSE;
-- 
cgit v1.2.3-24-g4f1b


From fe9309d22c1b088f5363954d6dac013c8c955894 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 9 Jan 2015 17:48:58 +0200
Subject: Bulk (mostly documentation) update

 - Remove PHP version from license notices
 - Bump year number in copyright notices
 - Recommend PHP 5.4 or newer to be used
 - Tell Travis-CI to test on PHP 5.3.0 instead of the latest 5.3 version

Related: #3450
---
 system/libraries/Session/Session.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 3b26a2f17..452afd5e5 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -2,11 +2,11 @@
 /**
  * CodeIgniter
  *
- * An open source application development framework for PHP 5.2.4 or newer
+ * An open source application development framework for PHP
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	http://codeigniter.com
  * @since	Version 2.0.0
@@ -40,7 +40,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 /**
  * CodeIgniter Session Class
  *
- * The user interface defined by EllisLabs, now with puggable drivers to manage different storage mechanisms.
+ * The user interface defined by EllisLab, now with puggable drivers to manage different storage mechanisms.
  * By default, the cookie session driver will load, but the 'sess_driver' config/param item (see above) can be
  * used to specify the 'native' driver, or any other you might create.
  * Once loaded, this driver setup is a drop-in replacement for the former CI_Session library, taking its place as the
-- 
cgit v1.2.3-24-g4f1b


From b4b215e6baed4e61a7e1143e2ff22713846b0667 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 19 Jan 2015 11:59:11 +0200
Subject: feature/session (#3073): Add CI_Session:: as reference to

For backwards compatibility purposes.
---
 system/libraries/Session/Session.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 9c3b2b06c..4a96aa6b1 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -48,6 +48,13 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  */
 class CI_Session {
 
+	/**
+	 * Userdata array
+	 *
+	 * Just a reference to $_SESSION, for BC purposes.
+	 */
+	public $userdata;
+
 	protected $_driver = 'files';
 	protected $_config;
 
@@ -341,6 +348,8 @@ class CI_Session {
 				unset($_SESSION['__ci_vars']);
 			}
 		}
+
+		$this->userdata =& $_SESSION;
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 10411fc94395bdf217e8bbae61e0af3a73d37325 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 19 Jan 2015 13:54:53 +0200
Subject: [ci skip] feature/session (#3073): Add missing method docblocks

---
 system/libraries/Session/Session.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 4a96aa6b1..5c61002a6 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -179,6 +179,16 @@ class CI_Session {
 
 	// ------------------------------------------------------------------------
 
+	/**
+	 * CI Load Classes
+	 *
+	 * An internal method to load all possible dependency and extension
+	 * classes. It kind of emulates the CI_Driver library, but is
+	 * self-sufficient.
+	 *
+	 * @param	string	$driver	Driver name
+	 * @return	string	Driver class name
+	 */
 	protected function _ci_load_classes($driver)
 	{
 		// PHP 5.4 compatibility
-- 
cgit v1.2.3-24-g4f1b


From 90726b8c769ea75aec34814ddfa91655d488e6c3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 20 Jan 2015 12:39:22 +0200
Subject: [ci skip] Change some log messages' level

'Class Loaded' type of messages flood log files when
log_threshold is set to 2 (debug). They're now logged
as 'info' level.

This is manually applying PR #1528, which was created
to do the same thing, but became outdated.
---
 system/libraries/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 5c61002a6..bc4a5ca1c 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -174,7 +174,7 @@ class CI_Session {
 
 		$this->_ci_init_vars();
 
-		log_message('debug', "Session: Class initialized using '".$this->_driver."' driver.");
+		log_message('info', "Session: Class initialized using '".$this->_driver."' driver.");
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 4cbe463b4c442e0e2dae2f43565e77f7ac5ecb86 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Wed, 21 Jan 2015 22:56:22 +0100
Subject: Remove closing blocks at end of PHP files

---
 system/libraries/Session/Session.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bc4a5ca1c..5f7791dee 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -893,6 +893,3 @@ class CI_Session {
 	}
 
 }
-
-/* End of file Session.php */
-/* Location: ./system/libraries/Session/Session.php */
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 43df7bda07b1d0949bd50fb21148668fa6c235f5 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 2 Feb 2015 23:22:29 +0200
Subject: Fix a wrong var name in CI_Session::mark_as_temp()

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 5f7791dee..2551e54e9 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -489,7 +489,7 @@ class CI_Session {
 					return FALSE;
 				}
 
-				$temp[$k] = $ts;
+				$temp[$k] = $v;
 			}
 
 			$_SESSION['__ci_vars'] = isset($_SESSION['__ci_vars'])
-- 
cgit v1.2.3-24-g4f1b


From 395f92882afada9701ab2384772ce331ae9b3f9d Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 5 Feb 2015 13:29:56 +0200
Subject: [ci skip] Fix a bug where session IDs are not regenerated

Reported via the forums: http://forum.codeigniter.com/thread-996.html
---
 system/libraries/Session/Session.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 2551e54e9..ba1919b44 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -143,8 +143,7 @@ class CI_Session {
 		session_start();
 
 		// Is session ID auto-regeneration configured? (ignoring ajax requests)
-		if ( ! empty($_SERVER['HTTP_X_REQUESTED_WITH'])
-			&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) === 'xmlhttprequest'
+		if ((empty($_SERVER['HTTP_X_REQUESTED_WITH']) OR strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) !== 'xmlhttprequest')
 			&& ($regenerate_time = config_item('sess_time_to_update')) > 0
 		)
 		{
-- 
cgit v1.2.3-24-g4f1b


From 789b1fe3e78f59cdb35ac5e6cf7166f6b97436c7 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Sat, 7 Feb 2015 19:30:30 +0200
Subject: Add 'sess_regenerate_destroy' setting

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index ba1919b44..de9b1e829 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -153,7 +153,7 @@ class CI_Session {
 			}
 			elseif ($_SESSION['__ci_last_regenerate'] < (time() - $regenerate_time))
 			{
-				$this->sess_regenerate(FALSE);
+				$this->sess_regenerate((bool) config_item('sess_regenerate_destroy'));
 			}
 		}
 		// Another work-around ... PHP doesn't seem to send the session cookie
-- 
cgit v1.2.3-24-g4f1b


From c02952d2e6ccf0ee227836683d33239c8ef4e2df Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 13 Feb 2015 13:04:38 +0200
Subject: Fix a typo in CI_Session

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index de9b1e829..f3b819af9 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -314,7 +314,7 @@ class CI_Session {
 		$this->_config = $params;
 
 		// Security is king
-		ini_set('session.use_trans_id', 0);
+		ini_set('session.use_trans_sid', 0);
 		ini_set('session.use_strict_mode', 1);
 		ini_set('session.use_cookies', 1);
 		ini_set('session.use_only_cookies', 1);
-- 
cgit v1.2.3-24-g4f1b


From 34b92c6c058a27fda4572f16af41340e0b46f4df Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 12 Mar 2015 12:42:00 +0200
Subject: Throw an exception on invalid session driver config

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index f3b819af9..54d31ee1a 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -94,10 +94,7 @@ class CI_Session {
 			$this->_driver = 'database';
 		}
 
-		if (($class = $this->_ci_load_classes($this->_driver)) === FALSE)
-		{
-			return;
-		}
+		$class = $this->_ci_load_classes($this->_driver);
 
 		// Configuration ...
 		$this->_configure($params);
@@ -230,8 +227,7 @@ class CI_Session {
 
 			if ( ! class_exists('CI_'.$class, FALSE) && ! class_exists($class, FALSE))
 			{
-				log_message('error', "Session: Configured driver '".$driver."' was not found. Aborting.");
-				return FALSE;
+				throw new \UnexpectedValueException("Session: Configured driver '".$driver."' was not found. Aborting.");
 			}
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From 1d19520c7bc40280050b59e05a212ecedd9edd53 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 13 Mar 2015 11:25:29 +0200
Subject: [ci skip] Remove NS usage in CI_Session

It was accidental
---
 system/libraries/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 54d31ee1a..bb457c659 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -227,7 +227,7 @@ class CI_Session {
 
 			if ( ! class_exists('CI_'.$class, FALSE) && ! class_exists($class, FALSE))
 			{
-				throw new \UnexpectedValueException("Session: Configured driver '".$driver."' was not found. Aborting.");
+				throw new UnexpectedValueException("Session: Configured driver '".$driver."' was not found. Aborting.");
 			}
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From fd3105716f5cdede79b9b471561413c161db250c Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 30 Mar 2015 17:19:26 +0300
Subject: Fix #3717

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index bb457c659..0549fef66 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -869,7 +869,7 @@ class CI_Session {
 	public function set_tempdata($data, $value = NULL, $ttl = 300)
 	{
 		$this->set_userdata($data, $value);
-		$this->mark_as_temp($data, $ttl);
+		$this->mark_as_temp(is_array($data) ? array_keys($data) : $data, $ttl);
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 55bc50578b9f1aa3fd71cb427848b21748655690 Mon Sep 17 00:00:00 2001
From: Calvin Tam <calvintam236@gmail.com>
Date: Fri, 24 Jul 2015 02:27:24 -0700
Subject: Fixed typos

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 0549fef66..05a470d86 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -795,7 +795,7 @@ class CI_Session {
 	/**
 	 * Set flashdata
 	 *
-	 * Legacy CI_Session compatibiliy method
+	 * Legacy CI_Session compatibility method
 	 *
 	 * @param	mixed	$data	Session data key or an associative array
 	 * @param	mixed	$value	Value to store
-- 
cgit v1.2.3-24-g4f1b


From 125ef4751080a2118cb203357d77687699e3eb25 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 11 Jan 2016 12:33:00 +0200
Subject: [ci skip] Bump year to 2016

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 05a470d86..28c93434d 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2015, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2016, British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	http://codeigniter.com
  * @since	Version 2.0.0
-- 
cgit v1.2.3-24-g4f1b


From bd202c91b0e9cf0a8c93bcaa71df9574f5909346 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 11 Jan 2016 12:50:18 +0200
Subject: [ci skip] Update codeigniter.com links to https

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 28c93434d..1e81ec53f 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -31,7 +31,7 @@
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
- * @link	http://codeigniter.com
+ * @link	https://codeigniter.com
  * @since	Version 2.0.0
  * @filesource
  */
@@ -44,7 +44,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * @subpackage	Libraries
  * @category	Sessions
  * @author		Andrey Andreev
- * @link		http://codeigniter.com/user_guide/libraries/sessions.html
+ * @link		https://codeigniter.com/user_guide/libraries/sessions.html
  */
 class CI_Session {
 
-- 
cgit v1.2.3-24-g4f1b


From 1924e879b165fb119847a49a7a5eab2f28295fa2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 11 Jan 2016 12:55:34 +0200
Subject: [ci skip] Update ellislab.com links to https too

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1e81ec53f..b93c00c15 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -28,7 +28,7 @@
  *
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
  * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
-- 
cgit v1.2.3-24-g4f1b


From 738b9e30404a56a8e2e8053f024550232b72ea09 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 24 Feb 2016 12:14:10 +0200
Subject: Merge pull request #4480 from versalle88/develop

Changed class_exists() calls to ignore __autoload()
---
 system/libraries/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index b93c00c15..77c56ae70 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -231,7 +231,7 @@ class CI_Session {
 			}
 		}
 
-		if ( ! class_exists($prefix.$class) && file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$prefix.$class.'.php'))
+		if ( ! class_exists($prefix.$class, FALSE) && file_exists($file_path = APPPATH.'libraries/Session/drivers/'.$prefix.$class.'.php'))
 		{
 			require_once($file_path);
 			if (class_exists($prefix.$class, FALSE))
-- 
cgit v1.2.3-24-g4f1b


From 2c10f60586faf59b9380608c5a9bf01ff2522483 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 15 Mar 2016 14:39:02 +0200
Subject: Add __isset() to CI_Session

---
 system/libraries/Session/Session.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 77c56ae70..c9d2e8adc 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -583,6 +583,24 @@ class CI_Session {
 
 	// ------------------------------------------------------------------------
 
+	/**
+	 * __isset()
+	 *
+	 * @param	string	$key	'session_id' or a session data key
+	 * @return	bool
+	 */
+	public function __isset($key)
+	{
+		if ($key === 'session_id')
+		{
+			return (session_status() === PHP_SESSION_ACTIVE);
+		}
+
+		return isset($_SESSION[$key]);
+	}
+
+	// ------------------------------------------------------------------------
+
 	/**
 	 * __set()
 	 *
-- 
cgit v1.2.3-24-g4f1b


From 85dfc2a6f76ca95e803535c25877e2aa1c05c38b Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 1 Apr 2016 22:54:15 +0300
Subject: [ci skip] Add some 'debug' log messages to CI_Session

---
 system/libraries/Session/Session.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index c9d2e8adc..1bdc6e5cc 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -91,6 +91,7 @@ class CI_Session {
 		// Note: BC workaround
 		elseif (config_item('sess_use_database'))
 		{
+			log_message('debug', 'Session: "sess_driver" is empty; using BC fallback to "sess_use_database".');
 			$this->_driver = 'database';
 		}
 
-- 
cgit v1.2.3-24-g4f1b


From e13fa9fdb3f2e311bd7331e49b26889f24bc81cb Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 20 May 2016 17:30:07 +0300
Subject: Merge pull request #4638 from kasimtan/phpdoc_fixes

[ci skip] Fixed PHPDoc parameter name and type discrepancies
---
 system/libraries/Session/Session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 1bdc6e5cc..3b391a8ef 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -730,7 +730,7 @@ class CI_Session {
 	 *
 	 * Legacy CI_Session compatibility method
 	 *
-	 * @param	mixed	$data	Session data key(s)
+	 * @param	mixed	$key	Session data key(s)
 	 * @return	void
 	 */
 	public function unset_userdata($key)
-- 
cgit v1.2.3-24-g4f1b


From 6c6ee1a1e73b3f8a93ca031107bec35e56272a0a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Sat, 22 Oct 2016 16:33:06 +0300
Subject: Close #4830, #3649

---
 system/libraries/Session/Session.php | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 3b391a8ef..5aac12f36 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -57,6 +57,7 @@ class CI_Session {
 
 	protected $_driver = 'files';
 	protected $_config;
+	protected $_sid_regexp;
 
 	// ------------------------------------------------------------------------
 
@@ -99,6 +100,7 @@ class CI_Session {
 
 		// Configuration ...
 		$this->_configure($params);
+		$this->_config['_sid_regexp'] = $this->_sid_regexp;
 
 		$class = new $class($this->_config);
 		if ($class instanceof SessionHandlerInterface)
@@ -131,7 +133,7 @@ class CI_Session {
 		if (isset($_COOKIE[$this->_config['cookie_name']])
 			&& (
 				! is_string($_COOKIE[$this->_config['cookie_name']])
-				OR ! preg_match('/^[0-9a-f]{40}$/', $_COOKIE[$this->_config['cookie_name']])
+				OR ! preg_match('#\A'.$this->_sid_regexp.'\z#', $_COOKIE[$this->_config['cookie_name']])
 			)
 		)
 		{
@@ -315,8 +317,36 @@ class CI_Session {
 		ini_set('session.use_strict_mode', 1);
 		ini_set('session.use_cookies', 1);
 		ini_set('session.use_only_cookies', 1);
-		ini_set('session.hash_function', 1);
-		ini_set('session.hash_bits_per_character', 4);
+
+		if (PHP_VERSION_ID < 70100)
+		{
+			if ((int) ini_get('session.hash_function') === 0)
+			{
+				ini_set('session.hash_function', 1);
+				ini_set('session.hash_bits_per_character', $bits_per_character = 4);
+			}
+			else
+			{
+				$bits_per_character = (int) ini_get('session.hash_bits_per_character');
+			}
+		}
+		elseif ((int) ini_get('session.sid_length') < 40 && ($bits_per_character = (int) ini_get('session.sid_bits_per_character')) === 4)
+		{
+			ini_set('session.sid_length', 40);
+		}
+
+		switch ($bits_per_character)
+		{
+			case 4:
+				$this->_sid_regexp = '[0-9a-f]{40,}';
+				break;
+			case 5:
+				$this->_sid_regexp = '[0-9a-v]{40,}';
+				break;
+			case 6:
+				$this->_sid_regexp = '[0-9a-zA-Z,-]{40,}';
+				break;
+		}
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 2f760877c313871e5066b93b0b1aa76428c09fb6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 27 Oct 2016 16:39:12 +0300
Subject: Fix #4874

---
 system/libraries/Session/Session.php | 63 ++++++++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 9 deletions(-)

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 5aac12f36..ea7853108 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -318,35 +318,80 @@ class CI_Session {
 		ini_set('session.use_cookies', 1);
 		ini_set('session.use_only_cookies', 1);
 
+		$this->_configure_sid_length();
+	}
+
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Configure session ID length
+	 *
+	 * To make life easier, we used to force SHA-1 and 4 bits per
+	 * character on everyone. And of course, someone was unhappy.
+	 *
+	 * Then PHP 7.1 broke backwards-compatibility because ext/session
+	 * is such a mess that nobody wants to touch it with a pole stick,
+	 * and the one guy who does, nobody has the energy to argue with.
+	 *
+	 * So we were forced to make changes, and OF COURSE something was
+	 * going to break and now we have this pile of shit. -- Narf
+	 *
+	 * @return	void
+	 */
+	protected function _configure_sid_length()
+	{
 		if (PHP_VERSION_ID < 70100)
 		{
-			if ((int) ini_get('session.hash_function') === 0)
+			$hash_function = ini_get('session.hash_function');
+			if (ctype_digit($hash_function))
+			{
+				if ($hash_function !== '1')
+				{
+					ini_set('session.hash_function', 1);
+					$bits = 160;
+				}
+			}
+			elseif ( ! in_array($hash_function, hash_algos(), TRUE))
 			{
 				ini_set('session.hash_function', 1);
-				ini_set('session.hash_bits_per_character', $bits_per_character = 4);
+				$bits = 160;
 			}
-			else
+			elseif (($bits = strlen(hash($hash_function, 'dummy', false)) * 4) < 160)
 			{
-				$bits_per_character = (int) ini_get('session.hash_bits_per_character');
+				ini_set('session.hash_function', 1);
+				$bits = 160;
 			}
+
+			$bits_per_character = (int) ini_get('session.hash_bits_per_character');
+			$sid_length         = $bits * $bits_per_character;
 		}
-		elseif ((int) ini_get('session.sid_length') < 40 && ($bits_per_character = (int) ini_get('session.sid_bits_per_character')) === 4)
+		else
 		{
-			ini_set('session.sid_length', 40);
+			$bits_per_character = (int) ini_get('session.sid_bits_per_character');
+			$sid_length         = (int) ini_get('session.sid_length');
+			if (($bits = $sid_length * $bits_per_character) < 160)
+			{
+				// Add as many more characters as necessary to reach at least 160 bits
+				$sid_length += (int) ceil((160 % $bits) / $bits_per_character);
+				ini_set('session.sid_length', $sid_length);
+			}
 		}
 
+		// Yes, 4,5,6 are the only known possible values as of 2016-10-27
 		switch ($bits_per_character)
 		{
 			case 4:
-				$this->_sid_regexp = '[0-9a-f]{40,}';
+				$this->_sid_regexp = '[0-9a-f]';
 				break;
 			case 5:
-				$this->_sid_regexp = '[0-9a-v]{40,}';
+				$this->_sid_regexp = '[0-9a-v]';
 				break;
 			case 6:
-				$this->_sid_regexp = '[0-9a-zA-Z,-]{40,}';
+				$this->_sid_regexp = '[0-9a-zA-Z,-]';
 				break;
 		}
+
+		$this->_sid_regexp .= '{'.$sid_length.'}';
 	}
 
 	// ------------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From dbc025b6c2c9b0b085bb79dc126bc58fb2a8c2a8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 27 Oct 2016 17:37:25 +0300
Subject: [ci skip] Another attempt at #4874

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index ea7853108..01989d2d7 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -348,8 +348,9 @@ class CI_Session {
 				if ($hash_function !== '1')
 				{
 					ini_set('session.hash_function', 1);
-					$bits = 160;
 				}
+
+				$bits = 160;
 			}
 			elseif ( ! in_array($hash_function, hash_algos(), TRUE))
 			{
@@ -363,7 +364,7 @@ class CI_Session {
 			}
 
 			$bits_per_character = (int) ini_get('session.hash_bits_per_character');
-			$sid_length         = $bits * $bits_per_character;
+			$sid_length         = (int) ceil($bits / $bits_per_character);
 		}
 		else
 		{
-- 
cgit v1.2.3-24-g4f1b


From da60e9bc66ec90970fbd2dfd08b0a6e66b9f5f5f Mon Sep 17 00:00:00 2001
From: Master Yoda <jim_parry@bcit.ca>
Date: Sat, 31 Dec 2016 08:46:18 -0800
Subject: Update copyright data to 2017

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

(limited to 'system/libraries/Session/Session.php')

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
index 01989d2d7..eb433de64 100644
--- a/system/libraries/Session/Session.php
+++ b/system/libraries/Session/Session.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2016, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2016, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 2.0.0
-- 
cgit v1.2.3-24-g4f1b