SimpleMachines / SMF2.1

Sources/CacheAPI-sqlite.php

Spacing +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
    * @var string The path to the current $cachedir directory.
    */
   private $cachedir		= null;
-  private $cacheDB		= null;
+  private $cacheDB = null;
   private $cacheTime	= null;
 
 	public function __construct()
@@ -36,7 +36,7 @@ 
 		// Set our default cachedir.
 		$this->setCachedir();
 
-		$database = $this->cachedir.'/'.'SQLite3Cache.db3';
+		$database = $this->cachedir . '/' . 'SQLite3Cache.db3';
 
 		$this->cacheDB = new SQLite3($database);
 		$this->cacheDB->busyTimeout(1000);
@@ -44,7 +44,7 @@ 
 			$this->cacheDB->exec('CREATE TABLE cache (key text unique, value blob, ttl int);');
 			$this->cacheDB->exec('CREATE INDEX ttls ON cache(ttl);');
 		}
-		$this->cacheTime	= time();
+		$this->cacheTime = time();
 
 	}
 
@@ -66,12 +66,12 @@ 
 	 */
 	public function getData($key, $ttl = null)
 	{
-		$ttl		= time();
-		$query	= 'SELECT value FROM cache WHERE key = \''.$this->cacheDB->escapeString($key).'\' AND ttl >= '.$ttl.' LIMIT 1';
+		$ttl = time();
+		$query = 'SELECT value FROM cache WHERE key = \'' . $this->cacheDB->escapeString($key) . '\' AND ttl >= ' . $ttl . ' LIMIT 1';
 		$result	= $this->cacheDB->query($query);
 
 		$value		= null;
-		while($res = $result->fetchArray(SQLITE3_ASSOC)) { 
+		while ($res = $result->fetchArray(SQLITE3_ASSOC)) { 
 			$value = $res['value'];
 		}
 
@@ -84,9 +84,9 @@ 
 	public function putData($key, $value, $ttl = null)
 	{
 
-		$ttl		= $this->cacheTime + $ttl;
-		$query	= 'REPLACE INTO cache VALUES (\''.$this->cacheDB->escapeString($key).'\', \''.$this->cacheDB->escapeString($value).'\', '.$this->cacheDB->escapeString($ttl).');';
-		$result	= $this->cacheDB->exec($query);
+		$ttl = $this->cacheTime + $ttl;
+		$query = 'REPLACE INTO cache VALUES (\'' . $this->cacheDB->escapeString($key) . '\', \'' . $this->cacheDB->escapeString($value) . '\', ' . $this->cacheDB->escapeString($ttl) . ');';
+		$result = $this->cacheDB->exec($query);
 
 		return $result;
 	}
@@ -97,8 +97,8 @@ 
 	public function cleanCache($type = '')
 	{
 
-		$query	= 'DELETE FROM cache;';
-		$result	= $this->cacheDB->exec($query);
+		$query = 'DELETE FROM cache;';
+		$result = $this->cacheDB->exec($query);
 
 		return $result;
 

Indentation +9 added lines, -9 removed lines

@@ -38,8 +38,8 @@ 
 	}
 
 	/**
-		* {@inheritDoc}
-		*/
+	 * {@inheritDoc}
+	 */
 	public function connect() 
 	{
 
@@ -115,7 +115,7 @@ 
    */
   public function cacheSettings(array &$config_vars)
   {
-    global $context, $txt;
+	global $context, $txt;
 
 		$config_vars[] = $txt['cache_sqlite_settings'];
 		$config_vars[] = array('cachedir_sqlite', $txt['cachedir_sqlite'], 'file', 'text', 36, 'cache_sqlite_cachedir');
@@ -139,13 +139,13 @@ 
    */
   public function setCachedir($dir = null)
   {
-    global $cachedir_sqlite;
+	global $cachedir_sqlite;
 
-    // If its invalid, use SMF's.
-    if (is_null($dir) || !is_writable($dir))
-      $this->cachedir = $cachedir_sqlite;
-    else
-      $this->cachedir = $dir;
+	// If its invalid, use SMF's.
+	if (is_null($dir) || !is_writable($dir))
+	  $this->cachedir = $cachedir_sqlite;
+	else
+	  $this->cachedir = $dir;
   }
 
 }

Braces +13 added lines, -9 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * SQLite Cache API class
@@ -61,8 +62,9 @@ 
 	{
 		$supported = class_exists("SQLite3") && is_writable($this->cachedir);
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 
 		return parent::isSupported() && $supported;
 	}
@@ -120,8 +122,9 @@ 
 		$config_vars[] = $txt['cache_sqlite_settings'];
 		$config_vars[] = array('cachedir_sqlite', $txt['cachedir_sqlite'], 'file', 'text', 36, 'cache_sqlite_cachedir');
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
@@ -142,10 +145,11 @@ 
     global $cachedir_sqlite;
 
     // If its invalid, use SMF's.
-    if (is_null($dir) || !is_writable($dir))
-      $this->cachedir = $cachedir_sqlite;
-    else
-      $this->cachedir = $dir;
+    if (is_null($dir) || !is_writable($dir)) {
+          $this->cachedir = $cachedir_sqlite;
+    } else {
+          $this->cachedir = $dir;
+    }
   }
 
 }