X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FSession%2FDatabaseSessionHandler.php;h=9bb1180ec1956aa6d1d8d2127c52e1464f41aeba;hb=64847e7cc8ca8f157cae4994c71b93df28624d6f;hp=f69531a8882ebb954f0e3324ae331b1dc70e7f49;hpb=c845415a99ebc348103815a7b2c55b15c75cdd24;p=friendica.git

diff --git a/src/Core/Session/DatabaseSessionHandler.php b/src/Core/Session/DatabaseSessionHandler.php
index f69531a888..9bb1180ec1 100644
--- a/src/Core/Session/DatabaseSessionHandler.php
+++ b/src/Core/Session/DatabaseSessionHandler.php
@@ -3,19 +3,15 @@
 namespace Friendica\Core\Session;
 
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
 use Friendica\Core\Session;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use SessionHandlerInterface;
-use dba;
-
-require_once 'boot.php';
-require_once 'include/dba.php';
-require_once 'include/text.php';
 
 /**
  * SessionHandler using database
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterface
 {
@@ -26,16 +22,16 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 
 	public function read($session_id)
 	{
-		if (!x($session_id)) {
+		if (empty($session_id)) {
 			return '';
 		}
 
-		$session = dba::selectFirst('session', ['data'], ['sid' => $session_id]);
-		if (DBM::is_result($session)) {
+		$session = DBA::selectFirst('session', ['data'], ['sid' => $session_id]);
+		if (DBA::isResult($session)) {
 			Session::$exists = true;
 			return $session['data'];
 		}
-		logger("no data for session $session_id", LOGGER_TRACE);
+		Logger::log("no data for session $session_id", Logger::TRACE);
 
 		return '';
 	}
@@ -50,6 +46,7 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 	 * @param  string $session_id   Session ID with format: [a-z0-9]{26}
 	 * @param  string $session_data Serialized session data
 	 * @return boolean Returns false if parameters are missing, true otherwise
+	 * @throws \Exception
 	 */
 	public function write($session_id, $session_data)
 	{
@@ -67,10 +64,10 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 		if (Session::$exists) {
 			$fields = ['data' => $session_data, 'expire' => $expire];
 			$condition = ["`sid` = ? AND (`data` != ? OR `expire` != ?)", $session_id, $session_data, $expire];
-			dba::update('session', $fields, $condition);
+			DBA::update('session', $fields, $condition);
 		} else {
 			$fields = ['sid' => $session_id, 'expire' => $default_expire, 'data' => $session_data];
-			dba::insert('session', $fields);
+			DBA::insert('session', $fields);
 		}
 
 		return true;
@@ -83,13 +80,13 @@ class DatabaseSessionHandler extends BaseObject implements SessionHandlerInterfa
 
 	public function destroy($id)
 	{
-		dba::delete('session', ['sid' => $id]);
+		DBA::delete('session', ['sid' => $id]);
 		return true;
 	}
 
 	public function gc($maxlifetime)
 	{
-		dba::delete('session', ["`expire` < ?", time()]);
+		DBA::delete('session', ["`expire` < ?", time()]);
 		return true;
 	}
 }