From c382f9f3d7237eb8b2e0b6d3633acb46269e92e3 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 26 Aug 2017 07:52:49 +0000 Subject: [PATCH] Some more --- include/NotificationsManager.php | 22 ++++++++++++---------- mod/wallmessage.php | 5 +++-- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/NotificationsManager.php b/include/NotificationsManager.php index 57c315c9d7..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,7 +510,7 @@ 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); diff --git a/mod/wallmessage.php b/mod/wallmessage.php index 72897c0657..fe3b9a82a6 100644 --- a/mod/wallmessage.php +++ b/mod/wallmessage.php @@ -1,6 +1,7 @@ page['htmlhead'] .= replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(true), + '$baseurl' => System::baseUrl(true), '$nickname' => $user['nickname'], '$linkurl' => t('Please enter a link URL:') )); $tpl = get_markup_template('wallmsg-end.tpl'); $a->page['end'] .= replace_macros($tpl, array( - '$baseurl' => $a->get_baseurl(true), + '$baseurl' => System::baseUrl(true), '$nickname' => $user['nickname'], '$linkurl' => t('Please enter a link URL:') ));