Changeset 579 for trunk/lib

Timestamp:

Feb 27, 2017 2:21:45 PM (7 years ago)

Author:

anonymous

Message:

Check before retreiving cookie value.

File:

• trunk/lib/Prefs.inc.php (modified) (1 diff)

trunk/lib/Prefs.inc.php

@@ -328 +328 @@
             } else {
                 $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_DEBUG, __FILE__, __LINE__);
-                return null;
-            }
-            break;
+            }
+            return null;
 
         case 'cookie':
             $name = $this->_getCookieName($key);
-            if ($this->exists($key)) {
+            if ($this->exists($key) && '' != $_COOKIE[$name]) {
                 $val = json_decode($_COOKIE[$name], true);
                 $app->logMsg(sprintf('Found %s in cookie: %s', $key, getDump($val)), LOG_DEBUG, __FILE__, __LINE__);
                 return $val;
             } else {
-                $app->logMsg(sprintf('Key not found in cookie: %s', $key), LOG_DEBUG, __FILE__, __LINE__);
-                return null;
-            }
-            break;
+                $app->logMsg(sprintf('Did not find %s in cookie', $key), LOG_DEBUG, __FILE__, __LINE__);
+            }
+            return null;
         }
     }