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