port hubzillas OpenWebAuth - rename Verify class to OpenWebAuthToken

diff --git a/src/Model/OpenWebAuthToken.php b/src/Model/OpenWebAuthToken.php
new file mode 100644 (file)
index 0000000..f295fc3
--- /dev/null
+++ b/src/Model/OpenWebAuthToken.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @file src/Model/OpenWebAuthToken.php
+ */
+namespace Friendica\Model;
+
+use Friendica\Database\DBM;
+use Friendica\Util\DateTimeFormat;
+use dba;
+
+/**
+ * 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.
+        * @param string $token
+        * @param string $meta
+        * 
+        * @return boolean
+        */
+       public static function create($type, $uid, $token, $meta)
+       {
+               $fields = [
+                       "type" => $type,
+                       "uid" => $uid,
+                       "token" => $token,
+                       "meta" => $meta,
+                       "created" => DateTimeFormat::utcNow()
+               ];
+               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.
+        * @param string $token
+        * 
+        * @return string|boolean The meta enry or false if not found.
+        */
+       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"]]);
+
+                       return $entry["meta"];
+               }
+               return false;
+       }
+
+       /**
+        * Purge entries of a verify-type older than interval.
+        * 
+        * @param string $type     Verify type.
+        * @param string $interval SQL compatible time interval
+        */
+       public static function purge($type, $interval)
+       {
+               $condition = ["`type` = ? AND `created` < ?", $type, DateTimeFormat::utcNow() . " - INTERVAL " . $interval];
+               dba::delete("openwebauth_token", $condition);
+       }
+
+}

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 8d2045221fd52c2af39af2e12ebcecb061e5b444..0bb18e14632dc27db23d56cf4af75973079f687f 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -17,7 +17,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
-use Friendica\Model\Verify;
+use Friendica\Model\OpenWebAuthToken;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -1056,12 +1056,12 @@ class Profile
        {
                $a = get_app();
 
-               // Clean old verify entries.
-               Verify::purge('owt', '3 MINUTE');
+               // Clean old OpenWebAuthToken entries.
+               OpenWebAuthToken::purge('owt', '3 MINUTE');
 
                // Check if the token we got is the same one
                // we have stored in the database.
-               $visitor_handle = Verify::getMeta('owt', 0, $token);
+               $visitor_handle = OpenWebAuthToken::getMeta('owt', 0, $token);
 
                if($visitor_handle === false) {
                        return;

diff --git a/src/Model/Verify.php b/src/Model/Verify.php
deleted file mode 100644 (file)
index 18fbb2e..0000000
--- a/src/Model/Verify.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @file src/Model/Verify.php
- */
-namespace Friendica\Model;
-
-use Friendica\Database\DBM;
-use Friendica\Util\DateTimeFormat;
-use dba;
-
-/**
- * Methods to deal with entries of the 'openwebauth_token' table.
- */
-class Verify
-{
-       /**
-        * 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
-        */
-       public static function create($type, $uid, $token, $meta)
-       {
-               $fields = [
-                       "type" => $type,
-                       "uid" => $uid,
-                       "token" => $token,
-                       "meta" => $meta,
-                       "created" => DateTimeFormat::utcNow()
-               ];
-               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.
-        * @param string $token
-        * 
-        * @return string|boolean The meta enry or false if not found.
-        */
-       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"]]);
-
-                       return $entry["meta"];
-               }
-               return false;
-       }
-
-       /**
-        * Purge entries of a verify-type older than interval.
-        * 
-        * @param string $type     Verify type.
-        * @param string $interval SQL compatible time interval
-        */
-       public static function purge($type, $interval)
-       {
-               $condition = ["`type` = ? AND `created` < ?", $type, DateTimeFormat::utcNow() . " - INTERVAL " . $interval];
-               dba::delete("openwebauth_token", $condition);
-       }
-
-}

diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index 13594a3ea02b62baa52ec2ec5ffedfd9294afb36..c1948f3b648a0e4d2fcebb7f374f12920ec4bad3 100644 (file)
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -8,7 +8,7 @@ use Friendica\BaseModule;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
-use Friendica\Model\Verify;
+use Friendica\Model\OpenWebAuthToken;
 use Friendica\Util\HTTPSignature;
 
 use dba;
@@ -66,7 +66,7 @@ class Owa extends BaseModule
                                                                $token = random_string(32);
 
                                                                // Store the generated token in the databe.
-                                                               Verify::create('owt', 0, $token, $contact['addr']);
+                                                               OpenWebAuthToken::create('owt', 0, $token, $contact['addr']);
 
                                                                $result = '';
 

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 1ed0e1e8a7ddd21649b6ba51a63b24a522e5a246..a91b6b37e37c1cd230caa42bd66b88013700cee5 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @file src/Util/HTTPSig.php
+ * @file src/Util/HTTPSignature.php
  */
 namespace Friendica\Util;