Changeset 480

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

Files:

• bin/file_importer.php (deleted)
• docs/examples/_config.inc.php (modified) (1 diff)
• lib/App.inc.php (modified) (1 diff)
• lib/Cache.inc.php (modified) (3 diffs)
• lib/Google_API.inc.php (deleted)
• lib/MCVE.inc.php (deleted)
• lib/Prefs.inc.php (modified) (2 diffs)
• tests/PrefsTest.php (modified) (3 diffs)

trunk/docs/examples/_config.inc.php

@@ -123 +123 @@
 // Load preferences for the user.
 require_once 'codebase/lib/Prefs.inc.php';
-$prefs = new Prefs('permanent');
-$prefs->setParam(array(
-    'persistent' => $auth->isLoggedIn(),
+$prefs = new Prefs('permanent', array(
+    'storagetype' => ($auth->isLoggedIn() ? 'database' : 'session'),
     'user_id' => $auth->get('user_id'),
 ));
 $prefs->setDefaults(array(
+    // ...
 ));
 $prefs->load();
+// Load preferences for temporary usage.
+require_once 'codebase/lib/Prefs.inc.php';
+$c_prefs = new Prefs('config');
+$c_prefs->setParam(array(
+    'storagetype' => 'cookie',
+));
 // Temporary prefs.
-$tmp_prefs = new Prefs('temporary');
-$tmp_prefs->setDefaults(array(
+$c_prefs = new Prefs('settings');
+$c_prefs->setDefaults(array(
 ));
 

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));
         }
 

trunk/tests/PrefsTest.php

@@ -7 +7 @@
  * For details visit the project site: <http://trac.strangecode.com/codebase/>
  * Copyright 2001-2012 Strangecode, LLC
- * 
+ *
  * This file is part of The Strangecode Codebase.
  *
@@ -14 +14 @@
  * Free Software Foundation, either version 3 of the License, or (at your option)
  * any later version.
- * 
+ *
  * The Strangecode Codebase is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * The Strangecode Codebase. If not, see <http://www.gnu.org/licenses/>.
@@ -47 +47 @@
         require dirname(__FILE__) . '/_config.inc.php';
         require_once '../lib/Prefs.inc.php';
-        $this->Prefs =& new Prefs(PARAM);
+        $prefs = new Prefs('test', array(
+            'storagetype' => 'session',
+        ));
     }