Move ProfileFieldRepository::migrateFromLegacyProfile() & delete old repository

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 6c692b21fd24fcca4f122e9b3149f8384a63cd73..081b7f2a3748ed29fa8c45a1473abaf533d76495 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -488,10 +488,7 @@ class DFRN
                        XML::addElement($doc, $author, "poco:note", $profile["about"]);
                        XML::addElement($doc, $author, "poco:preferredUsername", $profile["nickname"]);
 
-                       $savetz = date_default_timezone_get();
-                       date_default_timezone_set($profile["timezone"]);
-                       XML::addElement($doc, $author, "poco:utcOffset", date("P"));
-                       date_default_timezone_set($savetz);
+                       XML::addElement($doc, $author, "poco:utcOffset", DateTimeFormat::timezoneNow($profile["timezone"], "P"));
 
                        if (trim($profile["homepage"]) != "") {
                                $urls = $doc->createElement("poco:urls");
@@ -1333,7 +1330,58 @@ class DFRN
                $cid = Contact::getIdForURL($url);
                $note = $xpath->evaluate('string(dfrn:note[1]/text())', $suggestion);
 
-               return FContact::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note);
+               return self::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note);
+       }
+
+       /**
+        * Suggest a given contact to a given user from a given contact
+        *
+        * @param integer $uid
+        * @param integer $cid
+        * @param integer $from_cid
+        * @return bool   Was the adding successful?
+        */
+       private static function addSuggestion(int $uid, int $cid, int $from_cid, string $note = '')
+       {
+               $owner = User::getOwnerDataById($uid);
+               $contact = Contact::getById($cid);
+               $from_contact = Contact::getById($from_cid);
+
+               if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($contact['url']), 'uid' => $uid])) {
+                       return false;
+               }
+
+               // Quit if we already have an introduction for this person
+               if (DBA::exists('intro', ['uid' => $uid, 'suggest-cid' => $cid])) {
+                       return false;
+               }
+
+               $suggest = [];
+               $suggest['uid'] = $uid;
+               $suggest['cid'] = $from_cid;
+               $suggest['url'] = $contact['url'];
+               $suggest['name'] = $contact['name'];
+               $suggest['photo'] = $contact['photo'];
+               $suggest['request'] = $contact['request'];
+               $suggest['title'] = '';
+               $suggest['body'] = $note;
+
+               $hash = Strings::getRandomHex();
+               $fields = ['uid' => $suggest['uid'], 'suggest-cid' => $cid, 'contact-id' => $suggest['cid'],
+                       'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
+               DBA::insert('intro', $fields);
+
+               notification([
+                       'type'  => Notification\Type::SUGGEST,
+                       'otype' => Notification\ObjectType::INTRO,
+                       'verb'  => Activity::REQ_FRIEND,
+                       'uid'   => $owner['uid'],
+                       'cid'   => $from_contact['uid'],
+                       'item'  => $suggest,
+                       'link'  => DI::baseUrl().'/notifications/intros',
+               ]);
+
+               return true;
        }
 
        /**