bugfixing ini-loading

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 745bbacaddfa828b15dd16c12e6896db76360979..cf90406e24a029d5afbc2cd83eceebfce9d95922 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -35,12 +35,6 @@ class Contact extends BaseObject
         * @deprecated since version 2019.03
         * @see User::PAGE_FLAGS_NORMAL
         */
-       const PAGE_NORMAL    = 0;
-       const PAGE_SOAPBOX   = 1;
-       const PAGE_COMMUNITY = 2;
-       const PAGE_FREELOVE  = 3;
-       const PAGE_BLOG      = 4;
-       const PAGE_PRVGROUP  = 5;
        const PAGE_NORMAL    = User::PAGE_FLAGS_NORMAL;
        /**
         * @deprecated since version 2019.03
@@ -72,29 +66,32 @@ class Contact extends BaseObject
         */
 
        /**
-        * @name account types
+        * Account types
         *
-        * ACCOUNT_TYPE_PERSON - the account belongs to a person
+        * TYPE_UNKNOWN - the account has been imported from gcontact where this is the default type value
+        *
+        * TYPE_PERSON - the account belongs to a person
         *      Associated page types: PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE
         *
-        * ACCOUNT_TYPE_ORGANISATION - the account belongs to an organisation
+        * TYPE_ORGANISATION - the account belongs to an organisation
         *      Associated page type: PAGE_SOAPBOX
         *
-        * ACCOUNT_TYPE_NEWS - the account is a news reflector
+        * TYPE_NEWS - the account is a news reflector
         *      Associated page type: PAGE_SOAPBOX
         *
-        * ACCOUNT_TYPE_COMMUNITY - the account is community forum
+        * TYPE_COMMUNITY - the account is community forum
         *      Associated page types: PAGE_COMMUNITY, PAGE_PRVGROUP
         *
-        * ACCOUNT_TYPE_RELAY - the account is a relay
+        * TYPE_RELAY - the account is a relay
         *      This will only be assigned to contacts, not to user accounts
         * @{
         */
-       const ACCOUNT_TYPE_PERSON =       0;
-       const ACCOUNT_TYPE_ORGANISATION = 1;
-       const ACCOUNT_TYPE_NEWS =         2;
-       const ACCOUNT_TYPE_COMMUNITY =    3;
-       const ACCOUNT_TYPE_RELAY =        4;
+       const TYPE_UNKNOWN =     -1;
+       const TYPE_PERSON =       User::ACCOUNT_TYPE_PERSON;
+       const TYPE_ORGANISATION = User::ACCOUNT_TYPE_ORGANISATION;
+       const TYPE_NEWS =         User::ACCOUNT_TYPE_NEWS;
+       const TYPE_COMMUNITY =    User::ACCOUNT_TYPE_COMMUNITY;
+       const TYPE_RELAY =        User::ACCOUNT_TYPE_RELAY;
        /**
         * @}
         */
@@ -665,7 +662,7 @@ class Contact extends BaseObject
        {
                if (!isset($contact['url']) && !empty($contact['id'])) {
                        $fields = ['id', 'url', 'archive', 'self', 'term-date'];
-                       $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+                       $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
                        if (!DBA::isResult($contact)) {
                                return;
                        }
@@ -728,7 +725,7 @@ class Contact extends BaseObject
 
                if (!isset($contact['url']) && !empty($contact['id'])) {
                        $fields = ['id', 'url', 'batch'];
-                       $contact = DBA::selectFirst('contact', [], ['id' => $contact['id']]);
+                       $contact = DBA::selectFirst('contact', $fields, ['id' => $contact['id']]);
                        if (!DBA::isResult($contact)) {
                                return;
                        }
@@ -740,7 +737,7 @@ class Contact extends BaseObject
                DBA::update('contact', $fields, ['nurl' => Strings::normaliseLink($contact['url'])]);
 
                if (!empty($contact['batch'])) {
-                       $condition = ['batch' => $contact['batch'], 'contact-type' => self::ACCOUNT_TYPE_RELAY];
+                       $condition = ['batch' => $contact['batch'], 'contact-type' => self::TYPE_RELAY];
                        DBA::update('contact', $fields, $condition);
                }
        }
@@ -1202,9 +1199,10 @@ class Contact extends BaseObject
                                $contact = DBA::selectFirst('contact', $fields, ['addr' => $url]);
                        }
 
+                       // The link could be provided as http although we stored it as https
+                       $ssl_url = str_replace('http://', 'https://', $url);
+
                        if (!DBA::isResult($contact)) {
-                               // The link could be provided as http although we stored it as https
-                               $ssl_url = str_replace('http://', 'https://', $url);
                                $condition = ['alias' => [$url, Strings::normaliseLink($url), $ssl_url]];
                                $contact = DBA::selectFirst('contact', $fields, $condition);
                        }
@@ -1423,7 +1421,7 @@ class Contact extends BaseObject
        {
                $a = self::getApp();
 
-               $cid = Self::getIdForURL($contact_url);
+               $cid = self::getIdForURL($contact_url);
 
                $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
                if (!DBA::isResult($contact)) {
@@ -1436,7 +1434,7 @@ class Contact extends BaseObject
                        $sql = "`item`.`uid` = ?";
                }
 
-               $contact_field = ($contact["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+               $contact_field = ($contact["contact-type"] == self::TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
                if ($thread_mode) {
                        $condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql,
@@ -1492,9 +1490,9 @@ class Contact extends BaseObject
                        || (isset($contact['prv']) && intval($contact['prv']))
                        || (isset($contact['community']) && intval($contact['community']))
                ) {
-                       $type = self::ACCOUNT_TYPE_COMMUNITY;
+                       $type = self::TYPE_COMMUNITY;
                } else {
-                       $type = self::ACCOUNT_TYPE_PERSON;
+                       $type = self::TYPE_PERSON;
                }
 
                // The "contact-type" (contact table) and "account-type" (user table) are more general then the chaos from above.
@@ -1507,15 +1505,15 @@ class Contact extends BaseObject
                }
 
                switch ($type) {
-                       case self::ACCOUNT_TYPE_ORGANISATION:
+                       case self::TYPE_ORGANISATION:
                                $account_type = L10n::t("Organisation");
                                break;
 
-                       case self::ACCOUNT_TYPE_NEWS:
+                       case self::TYPE_NEWS:
                                $account_type = L10n::t('News');
                                break;
 
-                       case self::ACCOUNT_TYPE_COMMUNITY:
+                       case self::TYPE_COMMUNITY:
                                $account_type = L10n::t("Forum");
                                break;
 
@@ -1755,7 +1753,7 @@ class Contact extends BaseObject
                        }
                } elseif (Config::get('system', 'dfrn_only') && ($ret['network'] != Protocol::DFRN)) {
                        $result['message'] = L10n::t('This site is not configured to allow communications with other networks.') . EOL;
-                       $result['message'] != L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
+                       $result['message'] .= L10n::t('No compatible communication protocols or feeds were discovered.') . EOL;
                        return $result;
                }