Merge pull request #6222 from annando/long-uri

[friendica.git] / src / Core / Session / DatabaseSessionHandler.php

diff --git a/src/Core/Session/DatabaseSessionHandler.php b/src/Core/Session/DatabaseSessionHandler.php
index 82cb36aacb6d6e852f5be72db5d716b8b968879b..c4f23b1bfc6424dc3beba1947b0133768b9ea3f2 100644 (file)
--- a/src/Core/Session/DatabaseSessionHandler.php
+++ b/src/Core/Session/DatabaseSessionHandler.php
@@ -3,9 +3,9 @@
 namespace Friendica\Core\Session;
 
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
 use Friendica\Core\Session;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use SessionHandlerInterface;
 
 require_once 'boot.php';
@@ -15,7 +15,7 @@ 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 +26,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 '';
        }
@@ -67,10 +67,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 +83,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;
        }
 }