Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix formatting in NotificationsManager and Model\Contact

Browse source
This commit is contained in:
Hypolite Petovan 2018-01-11 03:37:11 -05:00
parent 5fc4927764
commit ed2ac8dc03
2 changed files with 203 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
src/Core/NotificationsManager.php
View file

@ -1,11 +1,14 @@
<?php <?php
/** /**
* @file src/Core/NotificationsManager.php * @file src/Core/NotificationsManager.php
* @brief Methods for read and write notifications from/to database * @brief Methods for read and write notifications from/to database
* or for formatting notifications * or for formatting notifications
*/ */
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
@ -20,18 +23,8 @@ require_once 'include/bbcode.php';
* @brief Methods for read and write notifications from/to database * @brief Methods for read and write notifications from/to database
* or for formatting notifications * or for formatting notifications
*/ */
class NotificationsManager class NotificationsManager extends BaseObject
{ {
private $a;
/**
* Constructor
*/
public function __construct()
{
$this->a = get_app();
}
/** /**
* @brief set some extra note properties * @brief set some extra note properties
* *
@ -59,7 +52,6 @@ class NotificationsManager
return $rets; return $rets;
} }
/** /**
* @brief Get all notifications for local_user() * @brief Get all notifications for local_user()
* *
@ -77,19 +69,19 @@ class NotificationsManager
foreach ($filter as $column => $value) { foreach ($filter as $column => $value) {
$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value)); $filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
} }
if (count($filter_str)>0) { if (count($filter_str) > 0) {
$filter_sql = "AND ".implode(" AND ", $filter_str); $filter_sql = "AND " . implode(" AND ", $filter_str);
} }
$aOrder = explode(" ", $order); $aOrder = explode(" ", $order);
$asOrder = array(); $asOrder = array();
foreach ($aOrder as $o) { foreach ($aOrder as $o) {
$dir = "asc"; $dir = "asc";
if ($o[0]==="-") { if ($o[0] === "-") {
$dir = "desc"; $dir = "desc";
$o = substr($o, 1); $o = substr($o, 1);
} }
if ($o[0]==="+") { if ($o[0] === "+") {
$dir = "asc"; $dir = "asc";
$o = substr($o, 1); $o = substr($o, 1);
} }
@ -98,7 +90,7 @@ class NotificationsManager
$order_sql = implode(", ", $asOrder); $order_sql = implode(", ", $asOrder);
if ($limit != "") { if ($limit != "") {
$limit = " LIMIT ".$limit; $limit = " LIMIT " . $limit;
} }
$r = q( $r = q(
"SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit", "SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
@ -175,36 +167,36 @@ class NotificationsManager
$tabs = array( $tabs = array(
array( array(
'label' => t('System'), 'label' => t('System'),
'url'=>'notifications/system', 'url' => 'notifications/system',
'sel'=> (($this->a->argv[1] == 'system') ? 'active' : ''), 'sel' => ((self::getApp()->argv[1] == 'system') ? 'active' : ''),
'id' => 'system-tab', 'id' => 'system-tab',
'accesskey' => 'y', 'accesskey' => 'y',
), ),
array( array(
'label' => t('Network'), 'label' => t('Network'),
'url'=>'notifications/network', 'url' => 'notifications/network',
'sel'=> (($this->a->argv[1] == 'network') ? 'active' : ''), 'sel' => ((self::getApp()->argv[1] == 'network') ? 'active' : ''),
'id' => 'network-tab', 'id' => 'network-tab',
'accesskey' => 'w', 'accesskey' => 'w',
), ),
array( array(
'label' => t('Personal'), 'label' => t('Personal'),
'url'=>'notifications/personal', 'url' => 'notifications/personal',
'sel'=> (($this->a->argv[1] == 'personal') ? 'active' : ''), 'sel' => ((self::getApp()->argv[1] == 'personal') ? 'active' : ''),
'id' => 'personal-tab', 'id' => 'personal-tab',
'accesskey' => 'r', 'accesskey' => 'r',
), ),
array( array(
'label' => t('Home'), 'label' => t('Home'),
'url' => 'notifications/home', 'url' => 'notifications/home',
'sel'=> (($this->a->argv[1] == 'home') ? 'active' : ''), 'sel' => ((self::getApp()->argv[1] == 'home') ? 'active' : ''),
'id' => 'home-tab', 'id' => 'home-tab',
'accesskey' => 'h', 'accesskey' => 'h',
), ),
array( array(
'label' => t('Introductions'), 'label' => t('Introductions'),
'url' => 'notifications/intros', 'url' => 'notifications/intros',
'sel'=> (($this->a->argv[1] == 'intros') ? 'active' : ''), 'sel' => ((self::getApp()->argv[1] == 'intros') ? 'active' : ''),
'id' => 'intro-tab', 'id' => 'intro-tab',
'accesskey' => 'i', 'accesskey' => 'i',
), ),
@ -246,7 +238,7 @@ class NotificationsManager
switch ($ident) { switch ($ident) {
case 'system': case 'system':
$default_item_label = 'notify'; $default_item_label = 'notify';
$default_item_link = System::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_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['url']; $default_item_url = $it['url'];
$default_item_text = strip_tags(bbcode($it['msg'])); $default_item_text = strip_tags(bbcode($it['msg']));
@ -256,7 +248,7 @@ class NotificationsManager
case 'home': case 'home':
$default_item_label = 'comment'; $default_item_label = 'comment';
$default_item_link = System::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_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['author-link']; $default_item_url = $it['author-link'];
$default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']); $default_item_text = sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']);
@ -266,7 +258,7 @@ class NotificationsManager
default: default:
$default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment'); $default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
$default_item_link = System::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_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['author-link']; $default_item_url = $it['author-link'];
$default_item_text = (($it['id'] == $it['parent']) $default_item_text = (($it['id'] == $it['parent'])
@ -281,7 +273,7 @@ class NotificationsManager
case ACTIVITY_LIKE: case ACTIVITY_LIKE:
$notif = array( $notif = array(
'label' => 'like', 'label' => 'like',
'link' => System::baseUrl(true).'/display/'.$it['pguid'], 'link' => System::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'], 'url' => $it['author-link'],
'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']), 'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
@ -294,7 +286,7 @@ class NotificationsManager
case ACTIVITY_DISLIKE: case ACTIVITY_DISLIKE:
$notif = array( $notif = array(
'label' => 'dislike', 'label' => 'dislike',
'link' => System::baseUrl(true).'/display/'.$it['pguid'], 'link' => System::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'], 'url' => $it['author-link'],
'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']), 'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
@ -307,7 +299,7 @@ class NotificationsManager
case ACTIVITY_ATTEND: case ACTIVITY_ATTEND:
$notif = array( $notif = array(
'label' => 'attend', 'label' => 'attend',
'link' => System::baseUrl(true).'/display/'.$it['pguid'], 'link' => System::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'], 'url' => $it['author-link'],
'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']), 'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
@ -320,7 +312,7 @@ class NotificationsManager
case ACTIVITY_ATTENDNO: case ACTIVITY_ATTENDNO:
$notif = array( $notif = array(
'label' => 'attendno', 'label' => 'attendno',
'link' => System::baseUrl(true).'/display/'.$it['pguid'], 'link' => System::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'], 'url' => $it['author-link'],
'text' => sprintf(t("%s is not attending %s's event"), $it['author-name'], $it['pname']), 'text' => sprintf(t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
@ -333,7 +325,7 @@ class NotificationsManager
case ACTIVITY_ATTENDMAYBE: case ACTIVITY_ATTENDMAYBE:
$notif = array( $notif = array(
'label' => 'attendmaybe', 'label' => 'attendmaybe',
'link' => System::baseUrl(true).'/display/'.$it['pguid'], 'link' => System::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'], 'url' => $it['author-link'],
'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']), 'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
@ -344,13 +336,13 @@ class NotificationsManager
break; break;
case ACTIVITY_FRIEND: case ACTIVITY_FRIEND:
$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; $xmlhead = "<" . "?xml version='1.0' encoding='UTF-8' ?" . ">";
$obj = parse_xml_string($xmlhead.$it['object']); $obj = parse_xml_string($xmlhead . $it['object']);
$it['fname'] = $obj->title; $it['fname'] = $obj->title;
$notif = array( $notif = array(
'label' => 'friend', 'label' => 'friend',
'link' => System::baseUrl(true).'/display/'.$it['pguid'], 'link' => System::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'], 'url' => $it['author-link'],
'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']), 'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
@ -403,7 +395,6 @@ class NotificationsManager
$sql_seen", $sql_seen",
intval(local_user()) intval(local_user())
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
return $r[0]['total']; return $r[0]['total'];
} }
@ -435,7 +426,6 @@ class NotificationsManager
$sql_seen = " AND `item`.`unseen` = 1 "; $sql_seen = " AND `item`.`unseen` = 1 ";
} }
$r = q( $r = q(
"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`, "SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
@ -449,16 +439,15 @@ class NotificationsManager
intval($start), intval($start),
intval($limit) intval($limit)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident); $notifs = $this->formatNotifs($r, $ident);
} }
$arr = array ( $arr = [
'notifications' => $notifs, 'notifications' => $notifs,
'ident' => $ident, 'ident' => $ident,
'total' => $total, 'total' => $total,
); ];
return $arr; return $arr;
} }
@ -482,7 +471,6 @@ class NotificationsManager
"SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen", "SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
intval(local_user()) intval(local_user())
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
return $r[0]['total']; return $r[0]['total'];
} }
@ -521,30 +509,29 @@ class NotificationsManager
intval($start), intval($start),
intval($limit) intval($limit)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident); $notifs = $this->formatNotifs($r, $ident);
} }
$arr = array ( $arr = [
'notifications' => $notifs, 'notifications' => $notifs,
'ident' => $ident, 'ident' => $ident,
'total' => $total, 'total' => $total,
); ];
return $arr; return $arr;
} }
/** /**
* @brief Addional SQL query string for the personal notifications * @brief Additional SQL query string for the personal notifications
* *
* @return string The additional sql query * @return string The additional SQL query
*/ */
private function personalSqlExtra() private function personalSqlExtra()
{ {
$myurl = System::baseUrl(true) . '/profile/'. $this->a->user['nickname']; $myurl = System::baseUrl(true) . '/profile/' . self::getApp()->user['nickname'];
$myurl = substr($myurl, strpos($myurl, '://') + 3); $myurl = substr($myurl, strpos($myurl, '://') + 3);
$myurl = str_replace(array('www.','.'), array('','\\.'), $myurl); $myurl = str_replace(array('www.', '.'), array('', '\\.'), $myurl);
$diasp_url = str_replace('/profile/', '/u/', $myurl); $diasp_url = str_replace('/profile/', '/u/', $myurl);
$sql_extra = sprintf( $sql_extra = sprintf(
" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ", " AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ",
@ -581,7 +568,6 @@ class NotificationsManager
AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ", AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ",
intval(local_user()) intval(local_user())
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
return $r[0]['total']; return $r[0]['total'];
} }
@ -628,12 +614,11 @@ class NotificationsManager
intval($start), intval($start),
intval($limit) intval($limit)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident); $notifs = $this->formatNotifs($r, $ident);
} }
$arr = array ( $arr = array(
'notifications' => $notifs, 'notifications' => $notifs,
'ident' => $ident, 'ident' => $ident,
'total' => $total, 'total' => $total,
@ -664,7 +649,6 @@ class NotificationsManager
$sql_seen", $sql_seen",
intval(local_user()) intval(local_user())
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
return $r[0]['total']; return $r[0]['total'];
} }
@ -709,16 +693,15 @@ class NotificationsManager
intval($start), intval($start),
intval($limit) intval($limit)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$notifs = $this->formatNotifs($r, $ident); $notifs = $this->formatNotifs($r, $ident);
} }
$arr = array ( $arr = [
'notifications' => $notifs, 'notifications' => $notifs,
'ident' => $ident, 'ident' => $ident,
'total' => $total, 'total' => $total,
); ];
return $arr; return $arr;
} }
@ -793,16 +776,15 @@ class NotificationsManager
intval($start), intval($start),
intval($limit) intval($limit)
); );
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$notifs = $this->formatIntros($r); $notifs = $this->formatIntros($r);
} }
$arr = array ( $arr = [
'ident' => $ident, 'ident' => $ident,
'total' => $total, 'total' => $total,
'notifications' => $notifs, 'notifications' => $notifs,
); ];
return $arr; return $arr;
} }
@ -820,10 +802,9 @@ class NotificationsManager
foreach ($intros as $it) { foreach ($intros as $it) {
// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests. // 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. // We have to distinguish between these two because they use different data.
// Contact suggestions // 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 : '')); $return_addr = bin2hex(self::getApp()->user['nickname'] . '@' . self::getApp()->get_hostname() . ((self::getApp()->path) ? '/' . self::getApp()->path : ''));
$intro = array( $intro = array(
'label' => 'friend_suggestion', 'label' => 'friend_suggestion',
@ -839,7 +820,6 @@ class NotificationsManager
'knowyou' => $knowyou, 'knowyou' => $knowyou,
'note' => $it['note'], 'note' => $it['note'],
'request' => $it['frequest'] . '?addr=' . $return_addr, 'request' => $it['frequest'] . '?addr=' . $return_addr,
); );
// Normal connection requests // Normal connection requests

134
src/Model/Contact.php
View file

@ -89,7 +89,6 @@ class Contact extends BaseObject
return $return; return $return;
} }
/** /**
* Creates the self-contact for the provided user id * Creates the self-contact for the provided user id
* *
@ -432,19 +431,27 @@ class Contact extends BaseObject
// Fetch contact data from the contact table for the given user // Fetch contact data from the contact table for the given user
$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, $r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self` `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
FROM `contact` WHERE `addr` = '%s' AND `uid` = %d", dbesc($addr), intval($uid)); FROM `contact` WHERE `addr` = '%s' AND `uid` = %d",
dbesc($addr),
intval($uid)
);
// Fetch the data from the contact table with "uid=0" (which is filled automatically) // Fetch the data from the contact table with "uid=0" (which is filled automatically)
if (!DBM::is_result($r)) if (!DBM::is_result($r)) {
$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`, $r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self` `keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
FROM `contact` WHERE `addr` = '%s' AND `uid` = 0", dbesc($addr)); FROM `contact` WHERE `addr` = '%s' AND `uid` = 0",
dbesc($addr)
);
}
// Fetch the data from the gcontact table // Fetch the data from the gcontact table
if (!DBM::is_result($r)) if (!DBM::is_result($r)) {
$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`, $r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
FROM `gcontact` WHERE `addr` = '%s'", dbesc($addr)); FROM `gcontact` WHERE `addr` = '%s'",
dbesc($addr)
);
}
if (!DBM::is_result($r)) { if (!DBM::is_result($r)) {
$data = Probe::uri($addr); $data = Probe::uri($addr);
@ -540,19 +547,18 @@ class Contact extends BaseObject
* Menu array: * Menu array:
* "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ] * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
*/ */
$menu = array( $menu = [
'status' => array(t("View Status"), $status_link, true), 'status' => [t("View Status") , $status_link , true],
'profile' => array(t("View Profile"), $profile_link, true), 'profile' => [t("View Profile") , $profile_link , true],
'photos' => array(t("View Photos"), $photos_link, true), 'photos' => [t("View Photos") , $photos_link , true],
'network' => array(t("Network Posts"), $posts_link, false), 'network' => [t("Network Posts"), $posts_link , false],
'edit' => array(t("View Contact"), $contact_url, false), 'edit' => [t("View Contact") , $contact_url , false],
'drop' => array(t("Drop Contact"), $contact_drop_link, false), 'drop' => [t("Drop Contact") , $contact_drop_link, false],
'pm' => array(t("Send PM"), $pm_url, false), 'pm' => [t("Send PM") , $pm_url , false],
'poke' => array(t("Poke"), $poke_link, false), 'poke' => [t("Poke") , $poke_link , false],
); ];
$args = ['contact' => $contact, 'menu' => &$menu];
$args = array('contact' => $contact, 'menu' => &$menu);
call_hooks('contact_photo_menu', $args); call_hooks('contact_photo_menu', $args);
@ -593,7 +599,9 @@ class Contact extends BaseObject
SELECT DISTINCT(`contact-id`) SELECT DISTINCT(`contact-id`)
FROM `group_member` FROM `group_member`
WHERE `uid` = %d WHERE `uid` = %d
)", intval($uid), intval($uid) )",
intval($uid),
intval($uid)
); );
return $r; return $r;
@ -612,13 +620,18 @@ class Contact extends BaseObject
INNER JOIN `group` ON `group`.`id` = `group_member`.`gid` INNER JOIN `group` ON `group`.`id` = `group_member`.`gid`
WHERE `group`.`uid` = %d WHERE `group`.`uid` = %d
) )
LIMIT %d, %d", intval($uid), intval($uid), intval($start), intval($count) LIMIT %d, %d",
intval($uid),
intval($uid),
intval($start),
intval($count)
); );
return $r; return $r;
} }
/** /**
* @brief Fetch the contact id for a given url and user * @brief Fetch the contact id for a given URL and user
* *
* First lookup in the contact table to find a record matching either `url`, `nurl`, * First lookup in the contact table to find a record matching either `url`, `nurl`,
* `addr` or `alias`. * `addr` or `alias`.
@ -627,7 +640,7 @@ class Contact extends BaseObject
* If there's one, we check that it isn't time to update the picture else we * If there's one, we check that it isn't time to update the picture else we
* directly return the found contact id. * directly return the found contact id.
* *
* Second, we probe the provided $url wether it's http://server.tld/profile or * Second, we probe the provided $url whether it's http://server.tld/profile or
* nick@server.tld. We quit if we can't get any info back. * nick@server.tld. We quit if we can't get any info back.
* *
* Third, we create the contact record if it doesn't exist * Third, we create the contact record if it doesn't exist
@ -710,19 +723,36 @@ class Contact extends BaseObject
$url = $data["url"]; $url = $data["url"];
if (!$contact_id) { if (!$contact_id) {
dba::insert( dba::insert('contact', [
'contact', array('uid' => $uid, 'created' => datetime_convert(), 'url' => $data["url"], 'uid' => $uid,
'nurl' => normalise_link($data["url"]), 'addr' => $data["addr"], 'created' => datetime_convert(),
'alias' => $data["alias"], 'notify' => $data["notify"], 'poll' => $data["poll"], 'url' => $data["url"],
'name' => $data["name"], 'nick' => $data["nick"], 'photo' => $data["photo"], 'nurl' => normalise_link($data["url"]),
'keywords' => $data["keywords"], 'location' => $data["location"], 'about' => $data["about"], 'addr' => $data["addr"],
'network' => $data["network"], 'pubkey' => $data["pubkey"], 'alias' => $data["alias"],
'rel' => CONTACT_IS_SHARING, 'priority' => $data["priority"], 'notify' => $data["notify"],
'batch' => $data["batch"], 'request' => $data["request"], 'poll' => $data["poll"],
'confirm' => $data["confirm"], 'poco' => $data["poco"], 'name' => $data["name"],
'name-date' => datetime_convert(), 'uri-date' => datetime_convert(), 'nick' => $data["nick"],
'avatar-date' => datetime_convert(), 'writable' => 1, 'blocked' => 0, 'photo' => $data["photo"],
'readonly' => 0, 'pending' => 0) 'keywords' => $data["keywords"],
'location' => $data["location"],
'about' => $data["about"],
'network' => $data["network"],
'pubkey' => $data["pubkey"],
'rel' => CONTACT_IS_SHARING,
'priority' => $data["priority"],
'batch' => $data["batch"],
'request' => $data["request"],
'confirm' => $data["confirm"],
'poco' => $data["poco"],
'name-date' => datetime_convert(),
'uri-date' => datetime_convert(),
'avatar-date' => datetime_convert(),
'writable' => 1,
'blocked' => 0,
'readonly' => 0,
'pending' => 0]
); );
$s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]); $s = dba::select('contact', ['id'], ['nurl' => normalise_link($data["url"]), 'uid' => $uid], ['order' => ['id'], 'limit' => 2]);
@ -750,8 +780,8 @@ class Contact extends BaseObject
} }
if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") { if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
dba::delete('contact', array("`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`", dba::delete('contact', ["`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
normalise_link($data["url"]), $contact_id)); normalise_link($data["url"]), $contact_id]);
} }
} }
@ -859,7 +889,9 @@ class Contact extends BaseObject
// There are no posts with "uid = 0" with connector networks // There are no posts with "uid = 0" with connector networks
// This speeds up the query a lot // This speeds up the query a lot
$r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact` $r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact`
WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0", dbesc(normalise_link($contact_url))); WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
dbesc(normalise_link($contact_url))
);
if (!DBM::is_result($r)) { if (!DBM::is_result($r)) {
return ''; return '';
@ -881,7 +913,6 @@ class Contact extends BaseObject
intval($a->pager['start']), intval($a->pager['itemspage']) intval($a->pager['start']), intval($a->pager['itemspage'])
); );
$o = conversation($a, $r, 'contact-posts', false); $o = conversation($a, $r, 'contact-posts', false);
$o .= alt_pager($a, count($r)); $o .= alt_pager($a, count($r));
@ -918,6 +949,7 @@ class Contact extends BaseObject
if (isset($contact["contact-type"])) { if (isset($contact["contact-type"])) {
$type = $contact["contact-type"]; $type = $contact["contact-type"];
} }
if (isset($contact["account-type"])) { if (isset($contact["account-type"])) {
$type = $contact["account-type"]; $type = $contact["account-type"];
} }
@ -1052,8 +1084,7 @@ class Contact extends BaseObject
} }
dba::update( dba::update(
'contact', 'contact', [
[
'url' => $ret['url'], 'url' => $ret['url'],
'nurl' => normalise_link($ret['url']), 'nurl' => normalise_link($ret['url']),
'addr' => $ret['addr'], 'addr' => $ret['addr'],
@ -1077,7 +1108,7 @@ class Contact extends BaseObject
* Currently if the contact is DFRN, interactive needs to be true, to redirect to the * Currently if the contact is DFRN, interactive needs to be true, to redirect to the
* dfrn_request page. * dfrn_request page.
* *
* Otherwise this can be used to bulk add statusnet contacts, twitter contacts, etc. * Otherwise this can be used to bulk add StatusNet contacts, Twitter contacts, etc.
* *
* Returns an array * Returns an array
* $return['success'] boolean true if successful * $return['success'] boolean true if successful
@ -1204,7 +1235,9 @@ class Contact extends BaseObject
if (!DBM::is_result($r)) { if (!DBM::is_result($r)) {
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
intval($uid), dbesc(normalise_link($url)), dbesc($ret['network']) intval($uid),
dbesc(normalise_link($url)),
dbesc($ret['network'])
); );
} }
@ -1218,9 +1251,7 @@ class Contact extends BaseObject
$new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING); $new_relation = ((in_array($ret['network'], array(NETWORK_MAIL))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
// create contact record // create contact record
dba::insert( dba::insert('contact', [
'contact',
[
'uid' => $uid, 'uid' => $uid,
'created' => datetime_convert(), 'created' => datetime_convert(),
'url' => $ret['url'], 'url' => $ret['url'],
@ -1236,15 +1267,14 @@ class Contact extends BaseObject
'network' => $ret['network'], 'network' => $ret['network'],
'pubkey' => $ret['pubkey'], 'pubkey' => $ret['pubkey'],
'rel' => $new_relation, 'rel' => $new_relation,
'priority' => $ret['priority'], 'priority'=> $ret['priority'],
'writable' => $writeable, 'writable'=> $writeable,
'hidden' => $hidden, 'hidden' => $hidden,
'blocked' => 0, 'blocked' => 0,
'readonly' => 0, 'readonly'=> 0,
'pending' => 0, 'pending' => 0,
'subhub' => $subhub 'subhub' => $subhub
] ]);
);
} }
$contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]); $contact = dba::selectFirst('contact', [], ['url' => $ret['url'], 'network' => $ret['network'], 'uid' => $uid]);