OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed redundant lib2/cookie.inc.php, changed all uses to new Cookie service. Except lib1 - should be phased out anyway.

Browse Source
This commit is contained in:
Markus Birth
2014-01-19 02:48:49 +01:00
parent 0a727eecfa
commit 9954387e90
6 changed files with 59 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
htdocs/lib/OpencachingDE/Util/Cookie.php
View File

@ -90,42 +90,52 @@ class Cookie
}
}
function set($name, $value, $default=null)
private function setSession($name, $value, $default = null)
{
if (!isset($_SESSION[$name]) || $_SESSION[$name] != $value) {
if ($value == $default) {
if (isset($_SESSION[$name])) {
unset($_SESSION[$name]);
$this->changed = true;
}
} else {
$this->initSession();
$_SESSION[$name] = $value;
$this->changed = true;
}
}
}
private function setCookie($name, $value, $default = null)
{
// Store cookie value in internal array. OcSmarty will call this->header()
// to actually set the cookie.
if (!isset($this->values[$name]) || $this->values[$name] != $value) {
if ($value == $default) {
if (isset($this->values[$name])) {
unset($this->values[$name]);
$this->changed = true;
}
} else {
$this->values[$name] = $value;
$this->changed = true;
}
}
}
public function set($name, $value, $default = null)
{
global $opt;
if ($opt['session']['mode'] == SAVE_SESSION) {
if (!isset($_SESSION[$name]) || $_SESSION[$name] != $value) {
if ($value == $default) {
if (isset($_SESSION[$name])) {
unset($_SESSION[$name]);
$this->changed = true;
}
} else {
$this->initSession();
$_SESSION[$name] = $value;
$this->changed = true;
}
}
$this->setSession($name, $value, $default);
} else {
// Store cookie value in internal array. OcSmarty will call this->header()
// to actually set the cookie.
if (!isset($this->values[$name]) || $this->values[$name] != $value) {
if ($value == $default) {
if (isset($this->values[$name])) {
unset($this->values[$name]);
$this->changed = true;
}
} else {
$this->values[$name] = $value;
$this->changed = true;
}
}
$this->setCookie($name, $value, $default);
}
}
function get($name, $default='')
public function get($name, $default = '')
{
global $opt;
@ -147,7 +157,7 @@ class Cookie
}
}
function un_set($name)
public function un_set($name)
{
global $opt;