Merge branch '2019.03-RC'

[friendica.git] / src / Model / OpenWebAuthToken.php

diff --git a/src/Model/OpenWebAuthToken.php b/src/Model/OpenWebAuthToken.php
index f295fc370308889e4bf7cf1423d8adf6e121a62d..7b30d2eb054ac73477f86ecd10087b3c19303b99 100644 (file)
--- a/src/Model/OpenWebAuthToken.php
+++ b/src/Model/OpenWebAuthToken.php
@@ -5,24 +5,24 @@
  */
 namespace Friendica\Model;
 
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
-use dba;
 
 /**
- * Methods to deal with entries of the 'openwebauth_token' table.
+ * Methods to deal with entries of the 'openwebauth-token' table.
  */
 class OpenWebAuthToken
 {
        /**
-        * Create an entry in the 'openwebauth_token' table.
-        * 
-        * @param string $type   Verify type.
-        * @param int    $uid    The user ID.
+        * Create an entry in the 'openwebauth-token' table.
+        *
+        * @param string $type Verify type.
+        * @param int    $uid  The user ID.
         * @param string $token
         * @param string $meta
-        * 
+        *
         * @return boolean
+        * @throws \Exception
         */
        public static function create($type, $uid, $token, $meta)
        {
@@ -33,25 +33,26 @@ class OpenWebAuthToken
                        "meta" => $meta,
                        "created" => DateTimeFormat::utcNow()
                ];
-               return dba::insert("openwebauth_token", $fields);
+               return DBA::insert("openwebauth-token", $fields);
        }
 
        /**
-        * Get the "meta" field of an entry in the openwebauth_token table.
-        * 
-        * @param string $type   Verify type.
-        * @param int    $uid    The user ID.
+        * Get the "meta" field of an entry in the openwebauth-token table.
+        *
+        * @param string $type Verify type.
+        * @param int    $uid  The user ID.
         * @param string $token
-        * 
+        *
         * @return string|boolean The meta enry or false if not found.
+        * @throws \Exception
         */
        public static function getMeta($type, $uid, $token)
        {
                $condition = ["type" => $type, "uid" => $uid, "token" => $token];
 
-               $entry = dba::selectFirst("openwebauth_token", ["id", "meta"], $condition);
-               if (DBM::is_result($entry)) {
-                       dba::delete("openwebauth_token", ["id" => $entry["id"]]);
+               $entry = DBA::selectFirst("openwebauth-token", ["id", "meta"], $condition);
+               if (DBA::isResult($entry)) {
+                       DBA::delete("openwebauth-token", ["id" => $entry["id"]]);
 
                        return $entry["meta"];
                }
@@ -60,14 +61,15 @@ class OpenWebAuthToken
 
        /**
         * Purge entries of a verify-type older than interval.
-        * 
+        *
         * @param string $type     Verify type.
         * @param string $interval SQL compatible time interval
+        * @throws \Exception
         */
        public static function purge($type, $interval)
        {
                $condition = ["`type` = ? AND `created` < ?", $type, DateTimeFormat::utcNow() . " - INTERVAL " . $interval];
-               dba::delete("openwebauth_token", $condition);
+               DBA::delete("openwebauth-token", $condition);
        }
 
 }