Fixing double encoding here as well

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

diff --git a/src/Model/User.php b/src/Model/User.php
index d162b27b6acb59c9434950ad312f2d1b691ae419..a6a9fc95253efb6d64abd2eb4a30bf08ca1788dd 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -98,6 +98,19 @@ class User
                if (!DBA::isResult($r)) {
                        return false;
                }
+
+               if (empty($r['nickname'])) {
+                       return false;
+               }
+
+               // Check if the returned data is valid, otherwise fix it. See issue #6122
+               $url = System::baseUrl() . '/profile/' . $r['nickname'];
+               $addr = $r['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+
+               if (($addr != $r['addr']) || ($r['url'] != $url) || ($r['nurl'] != Strings::normaliseLink($r['url']))) {
+                       Contact::updateSelfFromUserID($uid);
+               }
+
                return $r;
        }
 
@@ -412,12 +425,12 @@ class User
                $password   = !empty($data['password'])   ? trim($data['password'])           : '';
                $password1  = !empty($data['password1'])  ? trim($data['password1'])          : '';
                $confirm    = !empty($data['confirm'])    ? trim($data['confirm'])            : '';
-               $blocked    = !empty($data['blocked'])    ? intval($data['blocked'])          : 0;
-               $verified   = !empty($data['verified'])   ? intval($data['verified'])         : 0;
+               $blocked    = !empty($data['blocked']);
+               $verified   = !empty($data['verified']);
                $language   = !empty($data['language'])   ? Strings::escapeTags(trim($data['language']))   : 'en';
 
-               $publish = !empty($data['profile_publish_reg']) && intval($data['profile_publish_reg']) ? 1 : 0;
-               $netpublish = strlen(Config::get('system', 'directory')) ? $publish : 0;
+               $publish = !empty($data['profile_publish_reg']);
+               $netpublish = $publish && Config::get('system', 'directory');
 
                if ($password1 != $confirm) {
                        throw new Exception(L10n::t('Passwords do not match. Password unchanged.'));
@@ -799,7 +812,7 @@ class User
                DBA::insert('userd', ['username' => $user['nickname']]);
 
                // The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php)
-               DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc(DateTimeFormat::utcNow() . ' + 7 day')], ['uid' => $uid]);
+               DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
                Worker::add(PRIORITY_HIGH, 'Notifier', 'removeme', $uid);
 
                // Send an update to the directory