Changeset 480 for trunk/lib

Timestamp:

May 4, 2014 12:29:05 AM (10 years ago)

Author:

anonymous

Message:

Removed some legacy files. Improved use of array_key_exists.

Location:

trunk/lib

Files:

• App.inc.php (modified) (1 diff)
• Cache.inc.php (modified) (3 diffs)
• Google_API.inc.php (deleted)
• MCVE.inc.php (deleted)
• Prefs.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -807 +807 @@
                 unset($this->_carry_queries[$k]);
             }
-            if ($unset && array_key_exists($k, $_REQUEST)) {
+            if ($unset && (isset($_REQUEST) && array_key_exists($k, $_REQUEST))) {
                 unset($_REQUEST[$k], $_GET[$k], $_POST[$k], $_COOKIE[$k]);
             }

trunk/lib/Cache.inc.php

@@ -211 +211 @@
         }
 
-        if (array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
+        if (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
             $app->logMsg(sprintf('Retreiving %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
             // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
@@ -240 +240 @@
         }
 
-        return array_key_exists($key, $_SESSION['_cache'][$this->_ns]);
+        return (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns]));
     }
 
@@ -251 +251 @@
     public function delete($key)
     {
-        if (array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
+        if (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
             unset($_SESSION['_cache'][$this->_ns][$key]);
             return true;

trunk/lib/Prefs.inc.php

@@ -275 +275 @@
             // - or the new value is different than the default
             // - or there is a previously existing saved key.
-            if (!array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])
+            if (!(isset($_SESSION['_prefs'][$this->_ns]['defaults']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults']))
             || $_SESSION['_prefs'][$this->_ns]['defaults'][$key] != $val
-            || array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved'])) {
+            || (isset($_SESSION['_prefs'][$this->_ns]['saved']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved']))) {
                 $_SESSION['_prefs'][$this->_ns]['saved'][$key] = $val;
                 $app->logMsg(sprintf('Setting session preference %s => %s', $key, getDump($val, true)), LOG_DEBUG, __FILE__, __LINE__);
@@ -348 +348 @@
         case 'session':
         case 'database':
-            return array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved']);
+            return (isset($_SESSION['_prefs'][$this->_ns]['saved']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved']));
 
         case 'cookie':
             $name = $this->_getCookieName($key);
-            return array_key_exists($name, $_COOKIE);
+            return (isset($_COOKIE) && array_key_exists($name, $_COOKIE));
         }