silverstripe / silverstripe-hybridsessions

code/HybridSessionStore.php

Braces +37 added lines, -14 removed lines

@@ -32,8 +32,7 @@ 
 
 		register_shutdown_function('session_write_close');
 	}
-}
-else {
+} else {
 	function register_sessionhandler($handler) {
 		session_set_save_handler($handler, true);
 	}
@@ -122,7 +121,9 @@ 
 		// Needs to be after decrypt so it always runs, to avoid timing attack
 		$gen_hash = hash_hmac('sha256', $enc, $this->saltedKey);
 
-		if ($gen_hash == $hash) return $cleartext;
+		if ($gen_hash == $hash) {
+			return $cleartext;
+		}
 		return false;
 	}
 }
@@ -233,7 +234,9 @@ 
 		// This is intended to force a failover to the database store if the
 		// modified session cannot be emitted.
 		$this->currentCookieData = Cookie::get($this->cookie);
-		if ($this->currentCookieData) Cookie::set($this->cookie, '');
+		if ($this->currentCookieData) {
+			Cookie::set($this->cookie, '');
+		}
 	}
 
 	public function close() {
@@ -247,7 +250,9 @@ 
 	 */
 	protected function getCrypto($session_id) {
 		$key = $this->getKey();
-		if(!$key) return null;
+		if(!$key) {
+			return null;
+		}
 		if (!$this->crypto || $this->crypto->salt != $session_id) {
 			$this->crypto = new HybridSessionStore_Crypto($key, $session_id);
 		}
@@ -258,7 +263,9 @@ 
 		// Check ability to safely decrypt content
 		if(!$this->currentCookieData
 			|| !($crypto = $this->getCrypto($session_id))
-		) return;
+		) {
+			return;
+		}
 
 		// Decrypt and invalidate old data
 		$cookieData = $crypto->decrypt($this->currentCookieData);
@@ -269,7 +276,9 @@ 
 			$expiry = (int)substr($cookieData, 0, 10);
 			$data = substr($cookieData, 10);
 
-			if ($expiry > $this->getNow()) return $data;
+			if ($expiry > $this->getNow()) {
+				return $data;
+			}
 		}
 	}
 
@@ -287,7 +296,9 @@ 
 		if(!$this->canWrite()
 			|| (strlen($session_data) > Config::inst()->get(__CLASS__, 'max_length'))
 			|| !($crypto = $this->getCrypto($session_id))
-		) return false;
+		) {
+			return false;
+		}
 
 		// Prepare content for write
 		$params = session_get_cookie_params();
@@ -335,7 +346,9 @@ 
 	 */
 	protected function isDatabaseReady() {
 		// Such as during setup of testsession prior to DB connection.
-		if(!DB::isActive()) return false;
+		if(!DB::isActive()) {
+			return false;
+		}
 
 		// If we have a DB of the wrong type then complain
 		if (!(DB::getConn() instanceof MySQLDatabase)) {
@@ -353,7 +366,9 @@ 
 	}
 
 	public function read($session_id) {
-		if(!$this->isDatabaseReady()) return null;
+		if(!$this->isDatabaseReady()) {
+			return null;
+		}
 
 		$result = DB::query(sprintf(
 			'SELECT "Data" FROM "HybridSessionDataObject"
@@ -369,7 +384,9 @@ 
 	}
 
 	public function write($session_id, $session_data) {
-		if(!$this->isDatabaseReady()) return false;
+		if(!$this->isDatabaseReady()) {
+			return false;
+		}
 
 		$expiry = $this->getNow() + $this->getLifetime();
 		DB::query($str = sprintf(
@@ -389,7 +406,9 @@ 
 	}
 
 	public function gc($maxlifetime) {
-		if(!$this->isDatabaseReady()) return;
+		if(!$this->isDatabaseReady()) {
+			return;
+		}
 		DB::query(sprintf(
 			'DELETE FROM "HybridSessionDataObject" WHERE "Expiry" < %u',
 			$this->getNow()
@@ -454,7 +473,9 @@ 
 
 	public function read($session_id) {
 		foreach ($this->handlers as $handler) {
-			if ($data = $handler->read($session_id)) return $data;
+			if ($data = $handler->read($session_id)) {
+				return $data;
+			}
 		}
 
 		return '';
@@ -462,7 +483,9 @@ 
 
 	public function write($session_id, $session_data) {
 		foreach ($this->handlers as $handler) {
-			if ($handler->write($session_id, $session_data)) return;
+			if ($handler->write($session_id, $session_data)) {
+				return;
+			}
 		}
 	}