Merge pull request #3522 from annando/1706-lock

[friendica.git] / include / NotificationsManager.php

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index add19a177c3cfcab0cec8e78f2598cb768a53c03..ad0ede6dbe4a970728ea4da98c581f948fa0f8ee 100644 (file)
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -4,9 +4,12 @@
  * @brief Methods for read and write notifications from/to database
  *  or for formatting notifications
  */
+
 require_once 'include/html2plain.php';
+require_once 'include/probe.php';
 require_once 'include/datetime.php';
 require_once 'include/bbcode.php';
+require_once 'include/Contact.php';
 
 /**
  * @brief Methods for read and write notifications from/to database
@@ -719,10 +722,12 @@ class NotificationsManager {
                        $sql_extra = " AND `ignore` = 0 ";
 
                /// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact
-               $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*, `fcontact`.`name` AS `fname`,`fcontact`.`url` AS `furl`,`fcontact`.`photo` AS `fphoto`,`fcontact`.`request` AS `frequest`,
+               $r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
+                               `fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`,
+                               `fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
                                `gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
                                `gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
-                               `gcontact`.`network` AS `gnetwork`
+                               `gcontact`.`network` AS `gnetwork`, `gcontact`.`addr` AS `gaddr`
                        FROM `intro`
                                LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
                                LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
@@ -785,11 +790,7 @@ class NotificationsManager {
                        // Normal connection requests
                        } else {
 
-                               // Probe the contact url to get missing data
-                               $ret = probe_url($it["url"]);
-
-                               if ($it['gnetwork'] == "")
-                                       $it['gnetwork'] = $ret["network"];
+                               $it = $this->getMissingIntroData($it);
 
                                // Don't show these data until you are connected. Diaspora is doing the same.
                                if($it['gnetwork'] === NETWORK_DIASPORA) {
@@ -814,7 +815,7 @@ class NotificationsManager {
                                        'post_newfriend' => (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0),
                                        'url' => $it['url'],
                                        'zrl' => zrl($it['url']),
-                                       'addr' => $ret['addr'],
+                                       'addr' => $it['gaddr'],
                                        'network' => $it['gnetwork'],
                                        'knowyou' => $it['knowyou'],
                                        'note' => $it['note'],
@@ -826,4 +827,38 @@ class NotificationsManager {
 
                return $arr;
        }
+
+       /**
+        * @brief Check for missing contact data and try to fetch the data from 
+        *     from other sources
+        * 
+        * @param array $arr The input array with the intro data
+        * 
+        * @return array The array with the intro data
+        */
+       private function getMissingIntroData($arr) {
+               // If the network and the addr isn't available from the gcontact
+               // table entry, take the one of the contact table entry
+               if ($arr['gnetwork'] == "") {
+                       $arr['gnetwork'] = $arr['network'];
+               }
+               if ($arr['gaddr'] == "") {
+                       $arr['gaddr'] = $arr['addr'];
+               }
+
+               // If the network and addr is still not available
+               // get the missing data data from other sources
+               if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
+                       $ret = get_contact_details_by_url($arr['url']);
+
+                       if ($arr['gnetwork'] == "" && $ret['network'] != "") {
+                               $arr['gnetwork'] = $ret['network'];
+                       }
+                       if ($arr['gaddr'] == "" && $ret['addr'] != "") {
+                               $arr['gaddr'] = $ret['addr'];
+                       }
+               }
+
+               return $arr;
+       }
 }