* or for formatting notifications
*/
+use Friendica\Core\System;
+
require_once 'include/html2plain.php';
require_once 'include/probe.php';
require_once 'include/datetime.php';
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']));
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']);
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'])
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']),
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']),
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']),
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']),
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']),
$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']),
* @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 . '\\]')
}
/**
- * @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) {
// 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;