* @brief Methods for read and write notifications from/to database
* or for formatting notifications
*/
-require_once('include/html2plain.php');
-require_once("include/datetime.php");
-require_once("include/bbcode.php");
+
+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
*
* @param array $notes array of note arrays from db
* @return array Copy of input array with added properties
- *
+ *
* Set some extra properties to note array from db:
* - timestamp as int in default TZ
* - date_rel : relative date string
intval(local_user())
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
return $this->_set_extra($r);
return false;
intval($id),
intval(local_user())
);
- if(dbm::is_result($r)) {
+ if (dbm::is_result($r)) {
return $this->_set_extra($r)[0];
}
return null;
/**
* @brief List of pages for the Notifications TabBar
- *
- * @param app $a The
+ *
* @return array with with notifications TabBar data
*/
public function getTabs() {
/**
* @brief Format the notification query in an usable array
- *
+ *
* @param array $notifs The array from the db query
* @param string $ident The notifications identifier (e.g. network)
* @return array
* string 'label' => The type of the notification
* string 'link' => URL to the source
* string 'image' => The avatar image
+ * string 'url' => The profile url of the contact
* string 'text' => The notification text
- * string 'when' => Relative date of the notification
+ * string 'when' => The date of the notification
+ * string 'ago' => T relative date of the notification
* bool 'seen' => Is the notification marked as "seen"
*/
private function formatNotifs($notifs, $ident = "") {
$default_item_label = 'notify';
$default_item_link = $this->a->get_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']));
- $default_item_when = relative_date($it['date']);
+ $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['date'], 'r');
+ $default_item_ago = relative_date($it['date']);
break;
case 'home':
$default_item_label = 'comment';
$default_item_link = $this->a->get_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_item_when = relative_date($it['created']);
+ $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+ $default_item_ago = relative_date($it['created']);
break;
default:
$default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
$default_item_link = $this->a->get_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'])
? sprintf(t("%s created a new post"), $it['author-name'])
: sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']));
- $default_item_when = relative_date($it['created']);
+ $default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
+ $default_item_ago = relative_date($it['created']);
}
$notif = array(
'label' => 'like',
'link' => $this->a->get_baseurl(true).'/display/'.$it['pguid'],
- '$image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
+ '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']),
- 'when' => relative_date($it['created']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
'seen' => $it['seen']
);
break;
'label' => 'dislike',
'link' => $this->a->get_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']),
- 'when' => relative_date($it['created']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
'seen' => $it['seen']
);
break;
'label' => 'attend',
'link' => $this->a->get_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']),
- 'when' => relative_date($it['created']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
'seen' => $it['seen']
);
break;
'label' => 'attendno',
'link' => $this->a->get_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']),
- 'when' => relative_date($it['created']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
'seen' => $it['seen']
);
break;
'label' => 'attendmaybe',
'link' => $this->a->get_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']),
- 'when' => relative_date($it['created']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
'seen' => $it['seen']
);
break;
'label' => 'friend',
'link' => $this->a->get_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']),
- 'when' => relative_date($it['created']),
+ 'when' => $default_item_when,
+ 'ago' => $default_item_ago,
'seen' => $it['seen']
);
break;
'label' => $default_item_label,
'link' => $default_item_link,
'image' => $default_item_image,
+ 'url' => $default_item_url,
'text' => $default_item_text,
'when' => $default_item_when,
+ 'ago' => $default_item_ago,
'seen' => $it['seen']
);
}
}
/**
- * @brief Total number of network notifications
+ * @brief Total number of network notifications
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
intval(local_user())
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
return $r[0]['total'];
return 0;
/**
* @brief Get network notifications
- *
+ *
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
* @param int $start Start the query at this point
* @param int $limit Maximum number of query results
- *
+ *
* @return array with
* string 'ident' => Notification identifier
* int 'total' => Total number of available network notifications
intval($limit)
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
$notifs = $this->formatNotifs($r, $ident);
$arr = array (
}
/**
- * @brief Total number of system notifications
+ * @brief Total number of system notifications
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
intval(local_user())
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
return $r[0]['total'];
return 0;
/**
* @brief Get system notifications
- *
+ *
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
* @param int $start Start the query at this point
* @param int $limit Maximum number of query results
- *
+ *
* @return array with
* string 'ident' => Notification identifier
* int 'total' => Total number of available system notifications
if($seen === 0)
$sql_seen = " AND `seen` = 0 ";
- $r = q("SELECT `id`, `photo`, `msg`, `date`, `seen` FROM `notify`
+ $r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
intval(local_user()),
intval($start),
intval($limit)
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
$notifs = $this->formatNotifs($r, $ident);
$arr = array (
/**
* @brief Addional SQL query string for the personal notifications
- *
+ *
* @return string The additional sql query
*/
private function _personal_sql_extra() {
$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 Total number of personal notifications
+ * @brief Total number of personal notifications
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
intval(local_user())
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
return $r[0]['total'];
return 0;
/**
* @brief Get personal notifications
- *
+ *
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
* @param int $start Start the query at this point
* @param int $limit Maximum number of query results
- *
+ *
* @return array with
* string 'ident' => Notification identifier
* int 'total' => Total number of available personal notifications
$sql_seen = " AND `item`.`unseen` = 1 ";
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
- `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+ `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
WHERE `item`.`visible` = 1
$sql_extra
$sql_seen
- AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
+ AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
ORDER BY `item`.`created` DESC LIMIT %d, %d " ,
intval(local_user()),
intval($start),
intval($limit)
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
$notifs = $this->formatNotifs($r, $ident);
-
+
$arr = array (
'notifications' => $notifs,
'ident' => $ident,
}
/**
- * @brief Total number of home notifications
+ * @brief Total number of home notifications
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
intval(local_user())
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
return $r[0]['total'];
return 0;
/**
* @brief Get home notifications
- *
+ *
* @param int|string $seen
* If 0 only include notifications into the query
* which aren't marked as "seen"
* @param int $start Start the query at this point
* @param int $limit Maximum number of query results
- *
+ *
* @return array with
* string 'ident' => Notification identifier
* int 'total' => Total number of available home notifications
$sql_seen = " AND `item`.`unseen` = 1 ";
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
- `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
- `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`, `pitem`.`guid` as `pguid`
- FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
+ `pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
+ FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
WHERE `item`.`visible` = 1 AND
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
$sql_seen
intval($limit)
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
$notifs = $this->formatNotifs($r, $ident);
$arr = array (
}
/**
- * @brief Total number of introductions
+ * @brief Total number of introductions
* @param bool $all
* If false only include introductions into the query
* which aren't marked as ignored
intval($_SESSION['uid'])
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
return $r[0]['total'];
return 0;
/**
* @brief Get introductions
- *
+ *
* @param bool $all
* If false only include introductions into the query
* which aren't marked as ignored
* @param int $start Start the query at this point
* @param int $limit Maximum number of query results
- *
+ *
* @return array with
* string 'ident' => Notification identifier
* int 'total' => Total number of available introductions
$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`
intval($limit)
);
- if(dbm::is_result($r))
+ if (dbm::is_result($r))
$notifs = $this->formatIntros($r);
$arr = array (
/**
* @brief Format the notification query in an usable array
- *
+ *
* @param array $intros The array from the db query
* @return array with the introductions
*/
// 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) {
'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'],
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;
+ }
}
projects / friendica.git / blobdiff