X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FNotificationsManager.php;h=802d541d36547e8f139dd1851044840542be2002;hb=9f2196aa1aa0dc112e3fc238832828d4e22fe137;hp=96af0b76c20a9476aac3f43fd929759b404cd438;hpb=a726056c5f630c53111e4dce8d23c19740a7aa7a;p=friendica.git

diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php
index 96af0b76c2..802d541d36 100644
--- a/include/NotificationsManager.php
+++ b/include/NotificationsManager.php
@@ -5,6 +5,8 @@
  *  or for formatting notifications
  */
 
+use Friendica\Core\System;
+
 require_once 'include/html2plain.php';
 require_once 'include/probe.php';
 require_once 'include/datetime.php';
@@ -225,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']));
@@ -235,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']);
@@ -245,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'])
@@ -261,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']),
@@ -274,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']),
@@ -287,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']),
@@ -300,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']),
@@ -313,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']),
@@ -330,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']),
@@ -508,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 . '\\]')
@@ -829,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) {
@@ -850,13 +852,13 @@ class NotificationsManager {
 		// get the missing data data from other sources
 		if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
 			$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;