gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle validity at single place

Browse Source
This commit is contained in:
Michal Čihař 2012-05-11 14:40:39 +02:00
parent 1ce390b346
commit fdb2b41f25
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/Config.class.php
View File

@ -1599,9 +1599,6 @@ class PMA_Config
function setCookie($cookie, $value, $default = null, $validity = null,
$httponly = true
) {
if ($validity == null) {
$validity = 2592000;
}
if (strlen($value) && null !== $default && $value === $default) {
// default value is used
if (isset($_COOKIE[$cookie])) {
@ -1619,7 +1616,9 @@ class PMA_Config
if (! isset($_COOKIE[$cookie]) || $_COOKIE[$cookie] !== $value) {
// set cookie with new value
/* Calculate cookie validity */
if ($validity == 0) {
if ($validity == null) {
$validity = time() + 2592000;
} elseif ($validity == 0) {
$validity = 0;
} else {
$validity = time() + $validity;