Merge pull request #198 from zhylninc/session_test

1. fix session_start() step to end
This commit is contained in:
ThinkPHP
2016-01-14 22:52:38 +08:00

View File

@@ -10,7 +10,9 @@
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace think; namespace think;
class Session { class Session
{
protected static $prefix = ''; protected static $prefix = '';
/** /**
@@ -19,8 +21,9 @@ class Session {
* @param string $prefix * @param string $prefix
* @return string|void * @return string|void
*/ */
public static function prefix($prefix = '') { public static function prefix($prefix = '')
if (empty ( $prefix ) && $prefix !== null) { {
if (empty($prefix) && $prefix !== null) {
return self::$prefix; return self::$prefix;
} else { } else {
self::$prefix = $prefix; self::$prefix = $prefix;
@@ -33,57 +36,62 @@ class Session {
* @param array $config * @param array $config
* @return void * @return void
*/ */
public static function init($config = []) { public static function init($config = [])
if (isset ( $config ['use_trans_sid'] )) { {
ini_set ( 'session.use_trans_sid', $config ['use_trans_sid'] ? 1 : 0 ); $isDoStart = false;
if (isset($config['use_trans_sid'])) {
ini_set('session.use_trans_sid', $config['use_trans_sid'] ? 1 : 0);
} }
// 启动session // 启动session
if (! empty ( $config ['auto_start'] ) && PHP_SESSION_ACTIVE != session_status ()) { if (! empty($config['auto_start']) && PHP_SESSION_ACTIVE != session_status()) {
ini_set ( 'session.auto_start', 0 ); ini_set('session.auto_start', 0);
session_start (); $isDoStart = true;
} }
if (isset ( $config ['prefix'] )) { if (isset($config['prefix'])) {
self::$prefix = $config ['prefix']; self::$prefix = $config['prefix'];
} }
if ($config ['var_session_id'] && isset ( $_REQUEST [$config ['var_session_id']] )) { if ($config['var_session_id'] && isset($_REQUEST[$config['var_session_id']])) {
session_id ( $_REQUEST [$config ['var_session_id']] ); session_id($_REQUEST[$config['var_session_id']]);
} elseif (isset ( $config ['id'] ) && ! empty ( $config ['id'] )) { } elseif (isset($config['id']) && ! empty($config['id'])) {
session_id ( $config ['id'] ); session_id($config['id']);
} }
if (isset ( $config ['name'] )) { if (isset($config['name'])) {
session_name ( $config ['name'] ); session_name($config['name']);
} }
if (isset ( $config ['path'] )) { if (isset($config['path'])) {
session_save_path ( $config ['path'] ); session_save_path($config['path']);
} }
if (isset ( $config ['domain'] )) { if (isset($config['domain'])) {
ini_set ( 'session.cookie_domain', $config ['domain'] ); ini_set('session.cookie_domain', $config['domain']);
} }
if (isset ( $config ['expire'] )) { if (isset($config['expire'])) {
ini_set ( 'session.gc_maxlifetime', $config ['expire'] ); ini_set('session.gc_maxlifetime', $config['expire']);
ini_set ( 'session.cookie_lifetime', $config ['expire'] ); ini_set('session.cookie_lifetime', $config['expire']);
} }
if (isset ( $config ['use_cookies'] )) { if (isset($config['use_cookies'])) {
ini_set ( 'session.use_cookies', $config ['use_cookies'] ? 1 : 0 ); ini_set('session.use_cookies', $config['use_cookies'] ? 1 : 0);
} }
if (isset ( $config ['cache_limiter'] )) { if (isset($config['cache_limiter'])) {
session_cache_limiter ( $config ['cache_limiter'] ); session_cache_limiter($config['cache_limiter']);
} }
if (isset ( $config ['cache_expire'] )) { if (isset($config['cache_expire'])) {
session_cache_expire ( $config ['cache_expire'] ); session_cache_expire($config['cache_expire']);
} }
if (! empty ( $config ['type'] )) { if (! empty($config['type'])) {
// 读取session驱动 // 读取session驱动
$class = (! empty ( $config ['namespace'] ) ? $config ['namespace'] : '\\think\\session\\driver\\') . ucwords ( $config ['type'] ); $class = (! empty($config['namespace']) ? $config['namespace'] : '\\think\\session\\driver\\') . ucwords($config['type']);
// 检查驱动类 // 检查驱动类
if (! class_exists ( $class ) || ! session_set_save_handler ( new $class () )) { if (! class_exists($class) || ! session_set_save_handler(new $class())) {
throw new \think\Exception ( 'error session handler', 11700 ); throw new \think\Exception('error session handler', 11700);
} }
} }
if ($isDoStart) {
session_start();
}
} }
/** /**
@@ -97,20 +105,21 @@ class Session {
* 作用域(前缀) * 作用域(前缀)
* @return void * @return void
*/ */
public static function set($name, $value = '', $prefix = '') { public static function set($name, $value = '', $prefix = '')
{
$prefix = $prefix ? $prefix : self::$prefix; $prefix = $prefix ? $prefix : self::$prefix;
if (strpos ( $name, '.' )) { if (strpos($name, '.')) {
// 二维数组赋值 // 二维数组赋值
list ( $name1, $name2 ) = explode ( '.', $name ); list ($name1, $name2) = explode('.', $name);
if ($prefix) { if ($prefix) {
$_SESSION [$prefix] [$name1] [$name2] = $value; $_SESSION[$prefix][$name1][$name2] = $value;
} else { } else {
$_SESSION [$name1] [$name2] = $value; $_SESSION[$name1][$name2] = $value;
} }
} elseif ($prefix) { } elseif ($prefix) {
$_SESSION [$prefix] [$name] = $value; $_SESSION[$prefix][$name] = $value;
} else { } else {
$_SESSION [$name] = $value; $_SESSION[$name] = $value;
} }
} }
@@ -123,25 +132,26 @@ class Session {
* 作用域(前缀) * 作用域(前缀)
* @return mixed * @return mixed
*/ */
public static function get($name = '', $prefix = '') { public static function get($name = '', $prefix = '')
{
$prefix = $prefix ? $prefix : self::$prefix; $prefix = $prefix ? $prefix : self::$prefix;
if ('' == $name) { if ('' == $name) {
// 获取全部的session // 获取全部的session
$value = $prefix ? $_SESSION [$prefix] : $_SESSION; $value = $prefix ? $_SESSION[$prefix] : $_SESSION;
} elseif ($prefix) { } elseif ($prefix) {
// 获取session // 获取session
if (strpos ( $name, '.' )) { if (strpos($name, '.')) {
list ( $name1, $name2 ) = explode ( '.', $name ); list ($name1, $name2) = explode('.', $name);
$value = isset ( $_SESSION [$prefix] [$name1] [$name2] ) ? $_SESSION [$prefix] [$name1] [$name2] : null; $value = isset($_SESSION[$prefix][$name1][$name2]) ? $_SESSION[$prefix][$name1][$name2] : null;
} else { } else {
$value = isset ( $_SESSION [$prefix] [$name] ) ? $_SESSION [$prefix] [$name] : null; $value = isset($_SESSION[$prefix][$name]) ? $_SESSION[$prefix][$name] : null;
} }
} else { } else {
if (strpos ( $name, '.' )) { if (strpos($name, '.')) {
list ( $name1, $name2 ) = explode ( '.', $name ); list ($name1, $name2) = explode('.', $name);
$value = isset ( $_SESSION [$name1] [$name2] ) ? $_SESSION [$name1] [$name2] : null; $value = isset($_SESSION[$name1][$name2]) ? $_SESSION[$name1][$name2] : null;
} else { } else {
$value = isset ( $_SESSION [$name] ) ? $_SESSION [$name] : null; $value = isset($_SESSION[$name]) ? $_SESSION[$name] : null;
} }
} }
return $value; return $value;
@@ -156,20 +166,21 @@ class Session {
* 作用域(前缀) * 作用域(前缀)
* @return void * @return void
*/ */
public static function delete($name, $prefix = '') { public static function delete($name, $prefix = '')
{
$prefix = $prefix ? $prefix : self::$prefix; $prefix = $prefix ? $prefix : self::$prefix;
if (strpos ( $name, '.' )) { if (strpos($name, '.')) {
list ( $name1, $name2 ) = explode ( '.', $name ); list ($name1, $name2) = explode('.', $name);
if ($prefix) { if ($prefix) {
unset ( $_SESSION [$prefix] [$name1] [$name2] ); unset($_SESSION[$prefix][$name1][$name2]);
} else { } else {
unset ( $_SESSION [$name1] [$name2] ); unset($_SESSION[$name1][$name2]);
} }
} else { } else {
if ($prefix) { if ($prefix) {
unset ( $_SESSION [$prefix] [$name] ); unset($_SESSION[$prefix][$name]);
} else { } else {
unset ( $_SESSION [$name] ); unset($_SESSION[$name]);
} }
} }
} }
@@ -181,12 +192,13 @@ class Session {
* 作用域(前缀) * 作用域(前缀)
* @return void * @return void
*/ */
public static function clear($prefix = '') { public static function clear($prefix = '')
{
$prefix = $prefix ? $prefix : self::$prefix; $prefix = $prefix ? $prefix : self::$prefix;
if ($prefix) { if ($prefix) {
unset ( $_SESSION [$prefix] ); unset($_SESSION[$prefix]);
} else { } else {
$_SESSION = [ ]; $_SESSION = [];
} }
} }
@@ -200,14 +212,15 @@ class Session {
* @return bool * @return bool
* @internal param mixed $value session值 * @internal param mixed $value session值
*/ */
public static function has($name, $prefix = '') { public static function has($name, $prefix = '')
{
$prefix = $prefix ? $prefix : self::$prefix; $prefix = $prefix ? $prefix : self::$prefix;
if (strpos ( $name, '.' )) { if (strpos($name, '.')) {
// 支持数组 // 支持数组
list ( $name1, $name2 ) = explode ( '.', $name ); list ($name1, $name2) = explode('.', $name);
return $prefix ? isset ( $_SESSION [$prefix] [$name1] [$name2] ) : isset ( $_SESSION [$name1] [$name2] ); return $prefix ? isset($_SESSION[$prefix][$name1][$name2]) : isset($_SESSION[$name1][$name2]);
} else { } else {
return $prefix ? isset ( $_SESSION [$prefix] [$name] ) : isset ( $_SESSION [$name] ); return $prefix ? isset($_SESSION[$prefix][$name]) : isset($_SESSION[$name]);
} }
} }
@@ -216,9 +229,10 @@ class Session {
* *
* @return void * @return void
*/ */
public static function pause() { public static function pause()
{
// 暂停session // 暂停session
session_write_close (); session_write_close();
} }
/** /**
@@ -226,8 +240,9 @@ class Session {
* *
* @return void * @return void
*/ */
public static function start() { public static function start()
session_start (); {
session_start();
} }
/** /**
@@ -235,10 +250,11 @@ class Session {
* *
* @return void * @return void
*/ */
public static function destroy() { public static function destroy()
$_SESSION = [ ]; {
session_unset (); $_SESSION = [];
session_destroy (); session_unset();
session_destroy();
} }
/** /**
@@ -246,7 +262,8 @@ class Session {
* *
* @return void * @return void
*/ */
private static function regenerate() { private static function regenerate()
session_regenerate_id (); {
session_regenerate_id();
} }
} }