Merge pull request #5332 from annando/fix-lock

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 8d2045221fd52c2af39af2e12ebcecb061e5b444..631ddd2f0d0cec0f915ac4227c887787f1065f69 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;
@@ -710,7 +710,7 @@ class Profile
                        '$classtoday' => $classtoday,
                        '$count' => count($r),
                        '$event_reminders' => L10n::t('Event Reminders'),
-                       '$event_title' => L10n::t('Events this week:'),
+                       '$event_title' => L10n::t('Upcoming events the next 7 days:'),
                        '$events' => $r,
                ]);
        }
@@ -1020,7 +1020,7 @@ class Profile
 
                                $contact = dba::selectFirst('contact',['id', 'url'], ['id' => $cid]);
 
-                               if (DBM::is_result($contact) && remote_user() && remote_user() === $contact['id']) {
+                               if (DBM::is_result($contact) && remote_user() && remote_user() == $contact['id']) {
                                        // The visitor is already authenticated.
                                        return;
                                }
@@ -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;
@@ -1081,6 +1081,7 @@ class Profile
                $_SESSION['visitor_id'] = $visitor['id'];
                $_SESSION['visitor_handle'] = $visitor['addr'];
                $_SESSION['visitor_home'] = $visitor['url'];
+               $_SESSION['my_url'] = $visitor['url'];
 
                $arr = [
                        'visitor' => $visitor,