Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index a866df91c5903b54b734ab03b64ab1374925df76..85d1bfe9adf0634ba313e9d02022f43ed1a8a9dd 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -22,6 +22,7 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\PortableContact;
 use Friendica\Protocol\Salmon;
+use Friendica\Util\BaseURL;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -1316,7 +1317,7 @@ class Contact extends BaseObject
                        return 0;
                }
 
-               if (!$contact_id && ($data["alias"] != '') && ($data["alias"] != $url) && !$in_loop) {
+               if (!$contact_id && !empty($data['alias']) && ($data['alias'] != $url) && !$in_loop) {
                        $contact_id = self::getIdForURL($data["alias"], $uid, true, $default, true);
                }
 
@@ -1406,7 +1407,7 @@ class Contact extends BaseObject
                }
 
                $updated = ['addr' => $data['addr'],
-                       'alias' => $data['alias'],
+                       'alias' => defaults($data, 'alias', ''),
                        'url' => $data['url'],
                        'nurl' => Strings::normaliseLink($data['url']),
                        'name' => $data['name'],
@@ -1444,7 +1445,7 @@ class Contact extends BaseObject
                        $updated['pubkey'] = $data['pubkey'];
                }
 
-               if (($data["addr"] != $contact["addr"]) || ($data["alias"] != $contact["alias"])) {
+               if (($data['addr'] != $contact['addr']) || (!empty($data['alias']) && ($data['alias'] != $contact['alias']))) {
                        $updated['uri-date'] = DateTimeFormat::utcNow();
                }
                if (($data["name"] != $contact["name"]) || ($data["nick"] != $contact["nick"])) {
@@ -2009,7 +2010,7 @@ class Contact extends BaseObject
        public static function updateSslPolicy(array $contact, $new_policy)
        {
                $ssl_changed = false;
-               if ((intval($new_policy) == SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
+               if ((intval($new_policy) == BaseURL::SSL_POLICY_SELFSIGN || $new_policy === 'self') && strstr($contact['url'], 'https:')) {
                        $ssl_changed = true;
                        $contact['url']     =   str_replace('https:', 'http:', $contact['url']);
                        $contact['request'] =   str_replace('https:', 'http:', $contact['request']);
@@ -2019,7 +2020,7 @@ class Contact extends BaseObject
                        $contact['poco']    =   str_replace('https:', 'http:', $contact['poco']);
                }
 
-               if ((intval($new_policy) == SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
+               if ((intval($new_policy) == BaseURL::SSL_POLICY_FULL || $new_policy === 'full') && strstr($contact['url'], 'http:')) {
                        $ssl_changed = true;
                        $contact['url']     =   str_replace('http:', 'https:', $contact['url']);
                        $contact['request'] =   str_replace('http:', 'https:', $contact['request']);