mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 07:32:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Cookie类的clear方法

Browse Source
This commit is contained in:
thinkphp
2016-02-29 21:00:43 +08:00
parent a229f10a31
commit c447e900a7
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Cookie.php
View File

@@ -76,7 +76,6 @@ class Cookie
} elseif (is_string($option)) { } elseif (is_string($option)) {
parse_str($option, $option); parse_str($option, $option);
} }
$config = array_merge(self::$config, array_change_key_case($option)); $config = array_merge(self::$config, array_change_key_case($option));
} else { } else {
$config = self::$config; $config = self::$config;
@@ -88,7 +87,7 @@ class Cookie
$value = 'think:' . json_encode($value); $value = 'think:' . json_encode($value);
} }
$expire = !empty($config['expire']) ? time() + intval($config['expire']) : 0; $expire = !empty($config['expire']) ? time() + intval($config['expire']) : 0;
if (self::$config['setcookie']) { if ($config['setcookie']) {
setcookie($name, $value, $expire, $config['path'], $config['domain'], $config['secure'], $config['httponly']); setcookie($name, $value, $expire, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
} }
$_COOKIE[$name] = $value; $_COOKIE[$name] = $value;
@@ -128,7 +127,7 @@ class Cookie
$config = self::$config; $config = self::$config;
$prefix = !is_null($prefix) ? $prefix : $config['prefix']; $prefix = !is_null($prefix) ? $prefix : $config['prefix'];
$name = $prefix . $name; $name = $prefix . $name;
if (self::$config['setcookie']) { if ($config['setcookie']) {
setcookie($name, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']); setcookie($name, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
} }
// 删除指定cookie // 删除指定cookie
@@ -154,14 +153,12 @@ class Cookie
// 如果前缀为空字符串将不作处理直接返回 // 如果前缀为空字符串将不作处理直接返回
foreach ($_COOKIE as $key => $val) { foreach ($_COOKIE as $key => $val) {
if (0 === strpos($key, $prefix)) { if (0 === strpos($key, $prefix)) {
if (self::$config['setcookie']) { if ($config['setcookie']) {
setcookie($key, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']); setcookie($key, '', time() - 3600, $config['path'], $config['domain'], $config['secure'], $config['httponly']);
} }
unset($_COOKIE[$key]); unset($_COOKIE[$key]);
} }
} }
} else {
unset($_COOKIE);
} }
return; return;
} }