Merge remote-tracking branch 'virtualtam/linkdb/remove-globals'

diff --combined application/LinkDB.php
index cf91ad481ddb84db88da8ed312b3c9ba0a7b3858,7e29ee8eefaf8e65d44eae2e741ed343f04b2874..ff82446f0d7a892c63d04d5231cdf0e74b12ccce
--- 1/application/LinkDB.php
--- 2/application/LinkDB.php
+++ b/application/LinkDB.php
@@@ -27,6 -27,15 +27,15 @@@
   */
  class LinkDB implements Iterator, Countable, ArrayAccess
  {
+     // Links are stored as a PHP serialized string
+     private $datastore;
+ 
+     // Datastore PHP prefix
+     protected static $phpPrefix = '<?php /* ';
+ 
+     // Datastore PHP suffix
+     protected static $phpSuffix = ' */ ?>';
+ 
      // List of links (associative array)
      //  - key:   link date (e.g. "20110823_124546"),
      //  - value: associative array (keys: title, description...)
@@@ -55,9 -64,9 +64,9 @@@
       *
       * @param $isLoggedIn is the user logged in?
       */
-     function __construct($isLoggedIn, $hidePublicLinks)
+     function __construct($datastore, $isLoggedIn, $hidePublicLinks)
      {
-         // FIXME: do not access $GLOBALS, pass the datastore instead
+         $this->datastore = $datastore;
          $this->loggedIn = $isLoggedIn;
          $this->hidePublicLinks = $hidePublicLinks;
          $this->checkDB();
@@@ -172,7 -181,7 +181,7 @@@
       */
      private function checkDB()
      {
-         if (file_exists($GLOBALS['config']['DATASTORE'])) {
+         if (file_exists($this->datastore)) {
              return;
          }
  
@@@ -201,9 -210,8 +210,8 @@@
          // Write database to disk
          // TODO: raise an exception if the file is not write-able
          file_put_contents(
-             // FIXME: do not use $GLOBALS
-             $GLOBALS['config']['DATASTORE'],
-             PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX
+             $this->datastore,
+             self::$phpPrefix.base64_encode(gzdeflate(serialize($this->links))).self::$phpSuffix
          );
      }
  
@@@ -222,13 -230,12 +230,12 @@@
          // Read data
          // Note that gzinflate is faster than gzuncompress.
          // See: http://www.php.net/manual/en/function.gzdeflate.php#96439
-         // FIXME: do not use $GLOBALS
          $this->links = array();
  
-         if (file_exists($GLOBALS['config']['DATASTORE'])) {
+         if (file_exists($this->datastore)) {
              $this->links = unserialize(gzinflate(base64_decode(
-                 substr(file_get_contents($GLOBALS['config']['DATASTORE']),
-                        strlen(PHPPREFIX), -strlen(PHPSUFFIX)))));
+                 substr(file_get_contents($this->datastore),
+                        strlen(self::$phpPrefix), -strlen(self::$phpSuffix)))));
          }
  
          // If user is not logged in, filter private links.
@@@ -266,8 -273,8 +273,8 @@@
              die('You are not authorized to change the database.');
          }
          file_put_contents(
-             $GLOBALS['config']['DATASTORE'],
-             PHPPREFIX.base64_encode(gzdeflate(serialize($this->links))).PHPSUFFIX
+             $this->datastore,
+             self::$phpPrefix.base64_encode(gzdeflate(serialize($this->links))).self::$phpSuffix
          );
          invalidateCaches();
      }
@@@ -303,7 -310,7 +310,7 @@@
          // FIXME: accept double-quotes to search for a string "as is"?
          $filtered = array();
          $search = mb_convert_case($searchterms, MB_CASE_LOWER, 'UTF-8');
 -        $keys = ['title', 'description', 'url', 'tags'];
 +        $keys = array('title', 'description', 'url', 'tags');
  
          foreach ($this->links as $link) {
              $found = false;