* @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
*/
private function _set_extra($notes) {
$rets = array();
- foreach ($notes as $n) {
+ foreach($notes as $n) {
$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
$n['timestamp'] = strtotime($local_time);
$n['date_rel'] = relative_date($n['date']);
public function getAll($filter = array(), $order="-date", $limit="") {
$filter_str = array();
$filter_sql = "";
- foreach ($filter as $column => $value) {
+ foreach($filter as $column => $value) {
$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
}
if (count($filter_str)>0) {
$aOrder = explode(" ", $order);
$asOrder = array();
- foreach ($aOrder as $o) {
+ foreach($aOrder as $o) {
$dir = "asc";
if ($o[0]==="-") {
$dir = "desc";
}
$order_sql = implode(", ", $asOrder);
- if ($limit!="")
+ if($limit!="")
$limit = " LIMIT ".$limit;
$r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
/**
* @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
}
/**
- * @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"
private function networkTotal($seen = 0) {
$sql_seen = "";
- if ($seen === 0)
+ if($seen === 0)
$sql_seen = " AND `item`.`unseen` = 1 ";
$r = q("SELECT COUNT(*) AS `total`
/**
* @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
$notifs = array();
$sql_seen = "";
- if ($seen === 0)
+ if($seen === 0)
$sql_seen = " AND `item`.`unseen` = 1 ";
}
/**
- * @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"
private function systemTotal($seen = 0) {
$sql_seen = "";
- if ($seen === 0)
+ if($seen === 0)
$sql_seen = " AND `seen` = 0 ";
$r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
/**
* @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
$notifs = array();
$sql_seen = "";
- if ($seen === 0)
+ if($seen === 0)
$sql_seen = " AND `seen` = 0 ";
$r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
/**
* @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"
$sql_seen = "";
$sql_extra = $this->_personal_sql_extra();
- if ($seen === 0)
+ if($seen === 0)
$sql_seen = " AND `item`.`unseen` = 1 ";
$r = q("SELECT COUNT(*) AS `total`
/**
* @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
$notifs = array();
$sql_seen = "";
- if ($seen === 0)
+ if($seen === 0)
$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),
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"
private function homeTotal($seen = 0) {
$sql_seen = "";
- if ($seen === 0)
+ if($seen === 0)
$sql_seen = " AND `item`.`unseen` = 1 ";
$r = q("SELECT COUNT(*) AS `total` FROM `item`
/**
* @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
$notifs = array();
$sql_seen = "";
- if ($seen === 0)
+ if($seen === 0)
$sql_seen = " AND `item`.`unseen` = 1 ";
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
}
/**
- * @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
private function introTotal($all = false) {
$sql_extra = "";
- if (!$all)
+ if(!$all)
$sql_extra = " AND `ignore` = 0 ";
$r = q("SELECT COUNT(*) AS `total` FROM `intro`
/**
* @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
$notifs = array();
$sql_extra = "";
- if (!$all)
+ if(!$all)
$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`
/**
* @brief Format the notification query in an usable array
- *
+ *
* @param array $intros The array from the db query
* @return array with the introductions
*/
private function formatIntros($intros) {
$knowyou = '';
- foreach ($intros as $it) {
+ foreach($intros as $it) {
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
// We have to distinguish between these two because they use different data.
// Contact suggestions
- if ($it['fid']) {
+ if($it['fid']) {
$return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : ''));
// 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) {
+ if($it['gnetwork'] === NETWORK_DIASPORA) {
$it['glocation'] = "";
$it['gabout'] = "";
$it['ggender'] = "";
'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;
+ }
}