Merge pull request #3690 from annando/diaspora-like

[friendica.git] / include / NotificationsManager.php

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index 37d93b750c27b733c15902ca4648093b418f3181..802d541d36547e8f139dd1851044840542be2002 100644 (file)
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -4,10 +4,14 @@
  * @brief Methods for read and write notifications from/to database
  *  or for formatting notifications
  */
+
+use Friendica\Core\System;
+
 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
@@ -223,7 +227,7 @@ class NotificationsManager {
                                switch ($ident) {
                                        case 'system':
                                                $default_item_label = 'notify';
-                                               $default_item_link = $this->a->get_baseurl(true).'/notify/view/'. $it['id'];
+                                               $default_item_link = System::baseUrl(true).'/notify/view/'. $it['id'];
                                                $default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['url'];
                                                $default_item_text = strip_tags(bbcode($it['msg']));
@@ -233,7 +237,7 @@ class NotificationsManager {
 
                                        case 'home':
                                                $default_item_label = 'comment';
-                                               $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
+                                               $default_item_link = System::baseUrl(true).'/display/'.$it['pguid'];
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['author-link'];
                                                $default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']);
@@ -243,7 +247,7 @@ class NotificationsManager {
 
                                        default:
                                                $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
-                                               $default_item_link = $this->a->get_baseurl(true).'/display/'.$it['pguid'];
+                                               $default_item_link = System::baseUrl(true).'/display/'.$it['pguid'];
                                                $default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
                                                $default_item_url = $it['author-link'];
                                                $default_item_text = (($it['id'] == $it['parent'])
@@ -259,7 +263,7 @@ class NotificationsManager {
                                        case ACTIVITY_LIKE:
                                                $notif = array(
                                                        'label' => 'like',
-                                                       'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+                                                       'link' => System::baseUrl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
@@ -272,7 +276,7 @@ class NotificationsManager {
                                        case ACTIVITY_DISLIKE:
                                                $notif = array(
                                                        'label' => 'dislike',
-                                                       'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+                                                       'link' => System::baseUrl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
@@ -285,7 +289,7 @@ class NotificationsManager {
                                        case ACTIVITY_ATTEND:
                                                $notif = array(
                                                        'label' => 'attend',
-                                                       'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+                                                       'link' => System::baseUrl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
@@ -298,7 +302,7 @@ class NotificationsManager {
                                        case ACTIVITY_ATTENDNO:
                                                $notif = array(
                                                        'label' => 'attendno',
-                                                       'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+                                                       'link' => System::baseUrl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
                                                        'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
@@ -311,7 +315,7 @@ class NotificationsManager {
                                        case ACTIVITY_ATTENDMAYBE:
                                                $notif = array(
                                                        'label' => 'attendmaybe',
-                                                       'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+                                                       'link' => System::baseUrl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
@@ -328,7 +332,7 @@ class NotificationsManager {
 
                                                $notif = array(
                                                        'label' => 'friend',
-                                                       'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
+                                                       'link' => System::baseUrl(true).'/display/'.$it['pguid'],
                                                        'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
                                                        'url' => $it['author-link'],
                                                        'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
@@ -506,11 +510,11 @@ class NotificationsManager {
         * @return string The additional sql query
         */
        private function _personal_sql_extra() {
-               $myurl = $this->a->get_baseurl(true) . '/profile/'. $this->a->user['nickname'];
+               $myurl = System::baseUrl(true) . '/profile/'. $this->a->user['nickname'];
                $myurl = substr($myurl,strpos($myurl,'://')+3);
                $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
                $diasp_url = str_replace('/profile/','/u/',$myurl);
-               $sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ",
+               $sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ",
                        dbesc($myurl . '$'),
                        dbesc($myurl . '\\]'),
                        dbesc($diasp_url . '\\]')
@@ -827,11 +831,11 @@ class NotificationsManager {
        }
 
        /**
-        * @brief Check for missing contact data and try to fetch the data from 
+        * @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) {
@@ -844,17 +848,17 @@ class NotificationsManager {
                        $arr['gaddr'] = $arr['addr'];
                }
 
-               // If the network and addr is still not available try to probe
-               // the contact url to fetch the missing data
+               // If the network and addr is still not available
+               // get the missing data data from other sources
                if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
-                       $ret = probe_url($arr["url"]);
-               }
+                       $ret = get_contact_details_by_url($arr['url']);
 
-               if ($arr['gnetwork'] == "") {
-                       $arr['gnetwork'] = $ret['network'];
-               }
-               if ($arr['gaddr'] == "") {
-                       $arr['gaddr'] = $ret['addr'];
+                       if ($arr['gnetwork'] == "" && $ret['network'] != "") {
+                               $arr['gnetwork'] = $ret['network'];
+                       }
+                       if ($arr['gaddr'] == "" && $ret['addr'] != "") {
+                               $arr['gaddr'] = $ret['addr'];
+                       }
                }
 
                return $arr;