bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #4178 from MrPetovan/task/fix-scrutinizer-issues

Browse source 
[Scrutinizer] Fix issues in mod/contacts
This commit is contained in:
Michael Vogel 2018-01-06 14:51:40 +01:00 committed by GitHub
commit 76933a106c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 304 additions and 324 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/dba.php
View file

@ -1303,7 +1303,7 @@ function dbesc($str) {
* dba::delete, dba::update, dba::p, dba::e * dba::delete, dba::update, dba::p, dba::e
* *
* @param $args Query parameters (1 to N parameters of different types) * @param $args Query parameters (1 to N parameters of different types)
* @return array Query array * @return array|bool Query array
*/ */
function q($sql) { function q($sql) {
$args = func_get_args(); $args = func_get_args();

324
mod/contacts.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* @file mod/contacts.php * @file mod/contacts.php
*/ */
@ -12,29 +13,16 @@ use Friendica\Model\Group;
use Friendica\Network\Probe; use Friendica\Network\Probe;
require_once 'include/contact_selectors.php'; require_once 'include/contact_selectors.php';
require_once 'mod/proxy.php'; require_once 'include/contact_widgets.php';
require_once 'include/follow.php'; require_once 'include/follow.php';
require_once 'mod/proxy.php';
function contacts_init(App $a) { function contacts_init(App $a)
{
if (!local_user()) { if (!local_user()) {
return; return;
} }
$contact_id = 0;
if((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
$contact_id = intval($a->argv[1]);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
intval(local_user()),
intval($contact_id)
);
if (! DBM::is_result($r)) {
$contact_id = 0;
}
}
require_once 'include/contact_widgets.php';
$nets = defaults($_GET, 'nets', ''); $nets = defaults($_GET, 'nets', '');
if ($nets == "all") { if ($nets == "all") {
$nets = ""; $nets = "";
@ -44,8 +32,14 @@ function contacts_init(App $a) {
$a->page['aside'] = ''; $a->page['aside'] = '';
} }
if ($contact_id) { $contact = [];
$a->data['contact'] = $r[0]; if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) {
$contact_id = intval($a->argv[1]);
$contact = dba::select('contact', [], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]);
}
if (DBM::is_result($contact)) {
$a->data['contact'] = $contact;
if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) { if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) {
$networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']); $networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']);
@ -101,13 +95,14 @@ function contacts_init(App $a) {
'$baseurl' => System::baseUrl(true), '$baseurl' => System::baseUrl(true),
'$base' => $base '$base' => $base
)); ));
} }
function contacts_batch_actions(App $a) { function contacts_batch_actions(App $a)
{
$contacts_id = $_POST['contact_batch']; $contacts_id = $_POST['contact_batch'];
if (!is_array($contacts_id)) return; if (!is_array($contacts_id)) {
return;
}
$orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0", $orig_records = q("SELECT * FROM `contact` WHERE `id` IN (%s) AND `uid` = %d AND `self` = 0",
implode(",", $contacts_id), implode(",", $contacts_id),
@ -123,15 +118,21 @@ function contacts_batch_actions(App $a) {
} }
if (x($_POST, 'contacts_batch_block')) { if (x($_POST, 'contacts_batch_block')) {
$r = _contact_block($contact_id, $orig_record); $r = _contact_block($contact_id, $orig_record);
if ($r) $count_actions++; if ($r) {
$count_actions++;
}
} }
if (x($_POST, 'contacts_batch_ignore')) { if (x($_POST, 'contacts_batch_ignore')) {
$r = _contact_ignore($contact_id, $orig_record); $r = _contact_ignore($contact_id, $orig_record);
if ($r) $count_actions++; if ($r) {
$count_actions++;
}
} }
if (x($_POST, 'contacts_batch_archive')) { if (x($_POST, 'contacts_batch_archive')) {
$r = _contact_archive($contact_id, $orig_record); $r = _contact_archive($contact_id, $orig_record);
if ($r) $count_actions++; if ($r) {
$count_actions++;
}
} }
if (x($_POST, 'contacts_batch_drop')) { if (x($_POST, 'contacts_batch_drop')) {
_contact_drop($orig_record); _contact_drop($orig_record);
@ -139,21 +140,18 @@ function contacts_batch_actions(App $a) {
} }
} }
if ($count_actions > 0) { if ($count_actions > 0) {
info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) ); info(tt("%d contact edited.", "%d contacts edited.", $count_actions));
} }
if (x($_SESSION, 'return_url')) { if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']); goaway('' . $_SESSION['return_url']);
} } else {
else {
goaway('contacts'); goaway('contacts');
} }
} }
function contacts_post(App $a)
function contacts_post(App $a) { {
if (!local_user()) { if (!local_user()) {
return; return;
} }
@ -172,8 +170,7 @@ function contacts_post(App $a) {
intval($contact_id), intval($contact_id),
intval(local_user()) intval(local_user())
); );
if (!DBM::is_result($orig_record)) {
if (! count($orig_record)) {
notice(t('Could not access contact record.') . EOL); notice(t('Could not access contact record.') . EOL);
goaway('contacts'); goaway('contacts');
return; // NOTREACHED return; // NOTREACHED
@ -202,8 +199,9 @@ function contacts_post(App $a) {
$ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist'])); $ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist']));
$priority = intval($_POST['poll']); $priority = intval($_POST['poll']);
if($priority > 5 || $priority < 0) if ($priority > 5 || $priority < 0) {
$priority = 0; $priority = 0;
}
$info = escape_tags(trim($_POST['info'])); $info = escape_tags(trim($_POST['info']));
@ -220,59 +218,57 @@ function contacts_post(App $a) {
intval($contact_id), intval($contact_id),
intval(local_user()) intval(local_user())
); );
if($r) if (DBM::is_result($r)) {
info(t('Contact updated.') . EOL); info(t('Contact updated.') . EOL);
else } else {
notice(t('Failed to update contact record.') . EOL); notice(t('Failed to update contact record.') . EOL);
$r = q("select * from contact where id = %d and uid = %d limit 1",
intval($contact_id),
intval(local_user())
);
if($r && DBM::is_result($r))
$a->data['contact'] = $r[0];
return;
} }
$contact = dba::select('contact', [], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]);
if (DBM::is_result($contact)) {
$a->data['contact'] = $contact;
}
return;
}
/* contact actions */ /* contact actions */
function _contact_update($contact_id) {
$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
if (!$r)
return;
$uid = $r[0]["uid"]; function _contact_update($contact_id)
{
if ($uid != local_user()) $contact = dba::select('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]);
if (!DBM::is_result($contact)) {
return; return;
}
$uid = $contact["uid"];
if ($r[0]["network"] == NETWORK_OSTATUS) { if ($r[0]["network"] == NETWORK_OSTATUS) {
$result = new_contact($uid, $r[0]["url"], false, $r[0]["network"]); $result = new_contact($uid, $contact["url"], false, $contact["network"]);
if ($result['success']) if ($result['success']) {
$r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id));
intval($contact_id)); }
} else } else {
// pull feed and consume it, which should subscribe to the hub. // pull feed and consume it, which should subscribe to the hub.
Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force"); Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
} }
}
function _contact_update_profile($contact_id) { function _contact_update_profile($contact_id)
$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id)); {
if (!$r) $contact = dba::select('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]);
if (!DBM::is_result($contact)) {
return; return;
}
$uid = $r[0]["uid"]; $uid = $contact["uid"];
if ($uid != local_user()) $data = Probe::uri($contact["url"], "", 0, false);
return;
$data = Probe::uri($r[0]["url"], "", 0, false);
// "Feed" or "Unknown" is mostly a sign of communication problems // "Feed" or "Unknown" is mostly a sign of communication problems
if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) && ($data["network"] != $r[0]["network"])) if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) && ($data["network"] != $contact["network"])) {
return; return;
}
$updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm", $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
"poco", "network", "alias"); "poco", "network", "alias");
@ -281,30 +277,36 @@ function _contact_update_profile($contact_id) {
if ($data["network"] == NETWORK_OSTATUS) { if ($data["network"] == NETWORK_OSTATUS) {
$result = new_contact($uid, $data["url"], false); $result = new_contact($uid, $data["url"], false);
if ($result['success']) if ($result['success']) {
$update["subhub"] = true; $update["subhub"] = true;
} }
}
foreach($updatefields AS $field) foreach ($updatefields AS $field) {
if (isset($data[$field]) && ($data[$field] != "")) if (isset($data[$field]) && ($data[$field] != "")) {
$update[$field] = $data[$field]; $update[$field] = $data[$field];
}
}
$update["nurl"] = normalise_link($data["url"]); $update["nurl"] = normalise_link($data["url"]);
$query = ""; $query = "";
if (isset($data["priority"]) && ($data["priority"] != 0)) if (isset($data["priority"]) && ($data["priority"] != 0)) {
$query = "`priority` = " . intval($data["priority"]); $query = "`priority` = " . intval($data["priority"]);
}
foreach ($update AS $key => $value) { foreach ($update AS $key => $value) {
if ($query != "") if ($query != "") {
$query .= ", "; $query .= ", ";
}
$query .= "`" . $key . "` = '" . dbesc($value) . "'"; $query .= "`" . $key . "` = '" . dbesc($value) . "'";
} }
if ($query == "") if ($query == "") {
return; return;
}
$r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d", $r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d",
intval($contact_id), intval($contact_id),
@ -318,26 +320,30 @@ function _contact_update_profile($contact_id) {
GContact::updateFromProbe($data["url"]); GContact::updateFromProbe($data["url"]);
} }
function _contact_block($contact_id, $orig_record) { function _contact_block($contact_id, $orig_record)
{
$blocked = (($orig_record['blocked']) ? 0 : 1); $blocked = (($orig_record['blocked']) ? 0 : 1);
$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d", $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d",
intval($blocked), intval($blocked),
intval($contact_id), intval($contact_id),
intval(local_user()) intval(local_user())
); );
return $r; return DBM::is_result($r);
} }
function _contact_ignore($contact_id, $orig_record) {
function _contact_ignore($contact_id, $orig_record)
{
$readonly = (($orig_record['readonly']) ? 0 : 1); $readonly = (($orig_record['readonly']) ? 0 : 1);
$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d", $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d",
intval($readonly), intval($readonly),
intval($contact_id), intval($contact_id),
intval(local_user()) intval(local_user())
); );
return $r; return DBM::is_result($r);
} }
function _contact_archive($contact_id, $orig_record) {
function _contact_archive($contact_id, $orig_record)
{
$archived = (($orig_record['archive']) ? 0 : 1); $archived = (($orig_record['archive']) ? 0 : 1);
$r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d", $r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d",
intval($archived), intval($archived),
@ -347,7 +353,7 @@ function _contact_archive($contact_id, $orig_record) {
if ($archived) { if ($archived) {
q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user())); q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user()));
} }
return $r; return DBM::is_result($r);
} }
function _contact_drop($orig_record) function _contact_drop($orig_record)
@ -366,33 +372,27 @@ function _contact_drop($orig_record)
Contact::remove($orig_record['id']); Contact::remove($orig_record['id']);
} }
function contacts_content(App $a)
function contacts_content(App $a) { {
$sort_type = 0; $sort_type = 0;
$o = ''; $o = '';
nav_set_selected('contacts'); nav_set_selected('contacts');
if (!local_user()) { if (!local_user()) {
notice(t('Permission denied.') . EOL); notice(t('Permission denied.') . EOL);
return; return;
} }
if ($a->argc == 3) { if ($a->argc == 3) {
$contact_id = intval($a->argv[1]); $contact_id = intval($a->argv[1]);
if(! $contact_id) if (!$contact_id) {
return; return;
}
$cmd = $a->argv[2]; $cmd = $a->argv[2];
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1", $orig_record = dba::select('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'self' => false], ['limit' => 1]);
intval($contact_id), if (!DBM::is_result($orig_record)) {
intval(local_user())
);
if(! count($orig_record)) {
notice(t('Could not access contact record.') . EOL); notice(t('Could not access contact record.') . EOL);
goaway('contacts'); goaway('contacts');
return; // NOTREACHED return; // NOTREACHED
@ -411,9 +411,9 @@ function contacts_content(App $a) {
} }
if ($cmd === 'block') { if ($cmd === 'block') {
$r = _contact_block($contact_id, $orig_record[0]); $r = _contact_block($contact_id, $orig_record);
if ($r) { if ($r) {
$blocked = (($orig_record[0]['blocked']) ? 0 : 1); $blocked = (($orig_record['blocked']) ? 0 : 1);
info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL); info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL);
} }
@ -422,9 +422,9 @@ function contacts_content(App $a) {
} }
if ($cmd === 'ignore') { if ($cmd === 'ignore') {
$r = _contact_ignore($contact_id, $orig_record[0]); $r = _contact_ignore($contact_id, $orig_record);
if ($r) { if ($r) {
$readonly = (($orig_record[0]['readonly']) ? 0 : 1); $readonly = (($orig_record['readonly']) ? 0 : 1);
info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL); info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL);
} }
@ -432,11 +432,10 @@ function contacts_content(App $a) {
return; // NOTREACHED return; // NOTREACHED
} }
if ($cmd === 'archive') { if ($cmd === 'archive') {
$r = _contact_archive($contact_id, $orig_record[0]); $r = _contact_archive($contact_id, $orig_record);
if ($r) { if ($r) {
$archived = (($orig_record[0]['archive']) ? 0 : 1); $archived = (($orig_record['archive']) ? 0 : 1);
info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL); info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL);
} }
@ -445,9 +444,8 @@ function contacts_content(App $a) {
} }
if ($cmd === 'drop') { if ($cmd === 'drop') {
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if($_REQUEST['confirm']) { if (x($_REQUEST, 'confirm')) {
// <form> can't take arguments in its "action" parameter // <form> can't take arguments in its "action" parameter
// so add any arguments as hidden inputs // so add any arguments as hidden inputs
$query = explode_querystring($a->query_string); $query = explode_querystring($a->query_string);
@ -463,7 +461,7 @@ function contacts_content(App $a) {
return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array( return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
'$header' => t('Drop contact'), '$header' => t('Drop contact'),
'$contact' => _contact_detail_for_template($orig_record[0]), '$contact' => _contact_detail_for_template($orig_record),
'$method' => 'get', '$method' => 'get',
'$message' => t('Do you really want to delete this contact?'), '$message' => t('Do you really want to delete this contact?'),
'$extra_inputs' => $inputs, '$extra_inputs' => $inputs,
@ -474,21 +472,19 @@ function contacts_content(App $a) {
)); ));
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if ($_REQUEST['canceled']) { if (x($_REQUEST, 'canceled')) {
if (x($_SESSION, 'return_url')) { if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']); goaway('' . $_SESSION['return_url']);
} } else {
else {
goaway('contacts'); goaway('contacts');
} }
} }
_contact_drop($orig_record[0]); _contact_drop($orig_record);
info(t('Contact has been removed.') . EOL); info(t('Contact has been removed.') . EOL);
if (x($_SESSION, 'return_url')) { if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']); goaway('' . $_SESSION['return_url']);
} } else {
else {
goaway('contacts'); goaway('contacts');
} }
return; // NOTREACHED return; // NOTREACHED
@ -498,12 +494,9 @@ function contacts_content(App $a) {
} }
} }
$_SESSION['return_url'] = $a->query_string; $_SESSION['return_url'] = $a->query_string;
if ((x($a->data, 'contact')) && (is_array($a->data['contact']))) { if ((x($a->data, 'contact')) && (is_array($a->data['contact']))) {
$contact_id = $a->data['contact']['id']; $contact_id = $a->data['contact']['id'];
$contact = $a->data['contact']; $contact = $a->data['contact'];
@ -516,6 +509,8 @@ function contacts_content(App $a) {
require_once 'include/contact_selectors.php'; require_once 'include/contact_selectors.php';
$dir_icon = '';
$relation_text = '';
switch ($contact['rel']) { switch ($contact['rel']) {
case CONTACT_IS_FRIEND: case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif'; $dir_icon = 'images/lrarrow.gif';
@ -525,7 +520,6 @@ function contacts_content(App $a) {
$dir_icon = 'images/larrow.gif'; $dir_icon = 'images/larrow.gif';
$relation_text = t('You are sharing with %s'); $relation_text = t('You are sharing with %s');
break; break;
case CONTACT_IS_SHARING; case CONTACT_IS_SHARING;
$dir_icon = 'images/rarrow.gif'; $dir_icon = 'images/rarrow.gif';
$relation_text = t('%s is sharing with you'); $relation_text = t('%s is sharing with you');
@ -534,25 +528,23 @@ function contacts_content(App $a) {
break; break;
} }
if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) if (!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))) {
$relation_text = ""; $relation_text = "";
}
$relation_text = sprintf($relation_text, htmlentities($contact['name'])); $relation_text = sprintf($relation_text, htmlentities($contact['name']));
if (($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) { if (($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
$url = "redir/{$contact['id']}"; $url = "redir/{$contact['id']}";
$sparkle = ' class="sparkle" '; $sparkle = ' class="sparkle" ';
} } else {
else {
$url = $contact['url']; $url = $contact['url'];
$sparkle = ''; $sparkle = '';
} }
$insecure = t('Private communications are not available for this contact.'); $insecure = t('Private communications are not available for this contact.');
$last_update = (($contact['last-update'] <= NULL_DATE) $last_update = (($contact['last-update'] <= NULL_DATE) ? t('Never') : datetime_convert('UTC', date_default_timezone_get(), $contact['last-update'], 'D, j M Y, g:i A'));
? t('Never')
: datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
if ($contact['last-update'] > NULL_DATE) { if ($contact['last-update'] > NULL_DATE) {
$last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29")); $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
@ -561,15 +553,7 @@ function contacts_content(App $a) {
$poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL)); $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL));
$nettype = sprintf( t('Network type: %s'),network_to_name($contact['network'], $contact["url"])); $nettype = t('Network type: %s', network_to_name($contact['network'], $contact["url"]));
//$common = GlobalContact::countCommonFriends(local_user(),$contact['id']);
//$common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : '');
$polling = (($contact['network'] === NETWORK_MAIL | $contact['network'] === NETWORK_FEED) ? 'polling' : '');
//$x = GlobalContact::countAllFriends(local_user(), $contact['id']);
//$all_friends = (($x) ? t('View all contacts') : '');
// tabs // tabs
$tab_str = contacts_tab($a, $contact_id, 2); $tab_str = contacts_tab($a, $contact_id, 2);
@ -578,14 +562,17 @@ function contacts_content(App $a) {
$fetch_further_information = null; $fetch_further_information = null;
if ($contact['network'] == NETWORK_FEED) { if ($contact['network'] == NETWORK_FEED) {
$fetch_further_information = array('fetch_further_information', $fetch_further_information = array(
'fetch_further_information',
t('Fetch further information for feeds'), t('Fetch further information for feeds'),
$contact['fetch_further_information'], $contact['fetch_further_information'],
t("Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."), t("Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."),
array('0' => t('Disabled'), array('0' => t('Disabled'),
'1' => t('Fetch information'), '1' => t('Fetch information'),
'3' => t('Fetch keywords'), '3' => t('Fetch keywords'),
'2' => t('Fetch information and keywords'))); '2' => t('Fetch information and keywords')
)
);
} }
$poll_interval = null; $poll_interval = null;
@ -615,25 +602,23 @@ function contacts_content(App $a) {
$tpl = get_markup_template("contact_edit.tpl"); $tpl = get_markup_template("contact_edit.tpl");
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
//'$header' => t('Contact Editor'),
'$header' => t("Contact"), '$header' => t("Contact"),
'$tab_str' => $tab_str, '$tab_str' => $tab_str,
'$submit' => t('Submit'), '$submit' => t('Submit'),
'$lbl_vis1' => t('Profile Visibility'), '$lbl_vis1' => t('Profile Visibility'),
'$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $contact['name']), '$lbl_vis2' => t('Please choose the profile you would like to display to %s when viewing your profile securely.', $contact['name']),
'$lbl_info1' => t('Contact Information / Notes'), '$lbl_info1' => t('Contact Information / Notes'),
'$lbl_info2' => t('Their personal note'), '$lbl_info2' => t('Their personal note'),
'$reason' => trim(notags($contact['reason'])), '$reason' => trim(notags($contact['reason'])),
'$infedit' => t('Edit contact notes'), '$infedit' => t('Edit contact notes'),
'$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'], '$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
'$relation_text' => $relation_text, '$relation_text' => $relation_text,
'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']), '$visit' => t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
'$blockunblock' => t('Block/Unblock contact'), '$blockunblock' => t('Block/Unblock contact'),
'$ignorecont' => t('Ignore contact'), '$ignorecont' => t('Ignore contact'),
'$lblcrepair' => t("Repair URL settings"), '$lblcrepair' => t("Repair URL settings"),
'$lblrecent' => t('View conversations'), '$lblrecent' => t('View conversations'),
'$lblsuggest' => $lblsuggest, '$lblsuggest' => $lblsuggest,
//'$delete' => t('Delete contact'),
'$nettype' => $nettype, '$nettype' => $nettype,
'$poll_interval' => $poll_interval, '$poll_interval' => $poll_interval,
'$poll_enabled' => $poll_enabled, '$poll_enabled' => $poll_enabled,
@ -681,7 +666,6 @@ function contacts_content(App $a) {
'$contact_status' => t("Status"), '$contact_status' => t("Status"),
'$contact_settings_label' => t('Contact Settings'), '$contact_settings_label' => t('Contact Settings'),
'$contact_profile_label' => t("Profile"), '$contact_profile_label' => t("Profile"),
)); ));
$arr = array('contact' => $contact, 'output' => $o); $arr = array('contact' => $contact, 'output' => $o);
@ -689,7 +673,6 @@ function contacts_content(App $a) {
call_hooks('contact_edit', $arr); call_hooks('contact_edit', $arr);
return $arr['output']; return $arr['output'];
} }
$blocked = false; $blocked = false;
@ -745,7 +728,6 @@ function contacts_content(App $a) {
'id' => 'showunblocked-tab', 'id' => 'showunblocked-tab',
'accesskey' => 'o', 'accesskey' => 'o',
), ),
array( array(
'label' => t('Blocked'), 'label' => t('Blocked'),
'url' => 'contacts/blocked', 'url' => 'contacts/blocked',
@ -754,7 +736,6 @@ function contacts_content(App $a) {
'id' => 'showblocked-tab', 'id' => 'showblocked-tab',
'accesskey' => 'b', 'accesskey' => 'b',
), ),
array( array(
'label' => t('Ignored'), 'label' => t('Ignored'),
'url' => 'contacts/ignored', 'url' => 'contacts/ignored',
@ -763,7 +744,6 @@ function contacts_content(App $a) {
'id' => 'showignored-tab', 'id' => 'showignored-tab',
'accesskey' => 'i', 'accesskey' => 'i',
), ),
array( array(
'label' => t('Archived'), 'label' => t('Archived'),
'url' => 'contacts/archived', 'url' => 'contacts/archived',
@ -772,7 +752,6 @@ function contacts_content(App $a) {
'id' => 'showarchived-tab', 'id' => 'showarchived-tab',
'accesskey' => 'y', 'accesskey' => 'y',
), ),
array( array(
'label' => t('Hidden'), 'label' => t('Hidden'),
'url' => 'contacts/hidden', 'url' => 'contacts/hidden',
@ -781,20 +760,21 @@ function contacts_content(App $a) {
'id' => 'showhidden-tab', 'id' => 'showhidden-tab',
'accesskey' => 'h', 'accesskey' => 'h',
), ),
); );
$tab_tpl = get_markup_template('common_tabs.tpl'); $tab_tpl = get_markup_template('common_tabs.tpl');
$t = replace_macros($tab_tpl, array('$tabs' => $tabs)); $t = replace_macros($tab_tpl, array('$tabs' => $tabs));
$total = 0;
$searching = false; $searching = false;
$search_hdr = null; $search_hdr = null;
$search_txt = '';
if ($search) { if ($search) {
$searching = true;
$search_hdr = $search; $search_hdr = $search;
$search_txt = dbesc(protect_sprintf(preg_quote($search))); $search_txt = dbesc(protect_sprintf(preg_quote($search)));
$searching = true; $sql_extra .= " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt' OR nick REGEXP '$search_txt') ";
} }
$sql_extra .= (($searching) ? " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt' OR nick REGEXP '$search_txt') " : "");
if ($nets) { if ($nets) {
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets)); $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
@ -813,14 +793,13 @@ function contacts_content(App $a) {
$sql_extra3 = unavailable_networks(); $sql_extra3 = unavailable_networks();
$contacts = array();
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ", $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
intval($_SESSION['uid']), intval($_SESSION['uid']),
intval($a->pager['start']), intval($a->pager['start']),
intval($a->pager['itemspage']) intval($a->pager['itemspage'])
); );
$contacts = array();
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
foreach ($r as $rr) { foreach ($r as $rr) {
$contacts[] = _contact_detail_for_template($rr); $contacts[] = _contact_detail_for_template($rr);
@ -864,9 +843,10 @@ function contacts_content(App $a) {
* @param int $contact_id The ID of the contact * @param int $contact_id The ID of the contact
* @param int $active_tab 1 if tab should be marked as active * @param int $active_tab 1 if tab should be marked as active
* *
* @return array with with contact TabBar data * @return string
*/ */
function contacts_tab($a, $contact_id, $active_tab) { function contacts_tab($a, $contact_id, $active_tab)
{
// tabs // tabs
$tabs = array( $tabs = array(
array( array(
@ -889,30 +869,34 @@ function contacts_tab($a, $contact_id, $active_tab) {
// Show this tab only if there is visible friend list // Show this tab only if there is visible friend list
$x = GContact::countAllFriends(local_user(), $contact_id); $x = GContact::countAllFriends(local_user(), $contact_id);
if ($x) if ($x) {
$tabs[] = array('label' => t('Contacts'), $tabs[] = array('label' => t('Contacts'),
'url' => "allfriends/" . $contact_id, 'url' => "allfriends/" . $contact_id,
'sel' => (($active_tab == 3) ? 'active' : ''), 'sel' => (($active_tab == 3) ? 'active' : ''),
'title' => t('View all contacts'), 'title' => t('View all contacts'),
'id' => 'allfriends-tab', 'id' => 'allfriends-tab',
'accesskey' => 't'); 'accesskey' => 't');
}
// Show this tab only if there is visible common friend list // Show this tab only if there is visible common friend list
$common = GContact::countCommonFriends(local_user(), $contact_id); $common = GContact::countCommonFriends(local_user(), $contact_id);
if ($common) if ($common) {
$tabs[] = array('label' => t('Common Friends'), $tabs[] = array('label' => t('Common Friends'),
'url' => "common/loc/" . local_user() . "/" . $contact_id, 'url' => "common/loc/" . local_user() . "/" . $contact_id,
'sel' => (($active_tab == 4) ? 'active' : ''), 'sel' => (($active_tab == 4) ? 'active' : ''),
'title' => t('View all common friends'), 'title' => t('View all common friends'),
'id' => 'common-loc-tab', 'id' => 'common-loc-tab',
'accesskey' => 'd'); 'accesskey' => 'd'
);
}
$tabs[] = array('label' => t('Advanced'), $tabs[] = array('label' => t('Advanced'),
'url' => 'crepair/' . $contact_id, 'url' => 'crepair/' . $contact_id,
'sel' => (($active_tab == 5) ? 'active' : ''), 'sel' => (($active_tab == 5) ? 'active' : ''),
'title' => t('Advanced Contact Settings'), 'title' => t('Advanced Contact Settings'),
'id' => 'advanced-tab', 'id' => 'advanced-tab',
'accesskey' => 'r'); 'accesskey' => 'r'
);
$tab_tpl = get_markup_template('common_tabs.tpl'); $tab_tpl = get_markup_template('common_tabs.tpl');
$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs)); $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
@ -920,26 +904,24 @@ function contacts_tab($a, $contact_id, $active_tab) {
return $tab_str; return $tab_str;
} }
function contact_posts($a, $contact_id) { function contact_posts($a, $contact_id)
{
$o = contacts_tab($a, $contact_id, 1);
$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id)); $contact = dba::select('contact', ['url'], ['id' => $contact_id], ['limit' => 1]);
if ($r) { if (DBM::is_result($contact)) {
$contact = $r[0];
$a->page['aside'] = ""; $a->page['aside'] = "";
profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"])); profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
}
$tab_str = contacts_tab($a, $contact_id, 1);
$o = $tab_str;
$o .= Contact::getPostsFromUrl($contact["url"]); $o .= Contact::getPostsFromUrl($contact["url"]);
}
return $o; return $o;
} }
function _contact_detail_for_template($rr){ function _contact_detail_for_template($rr)
{
$dir_icon = '';
$alt_text = '';
switch ($rr['rel']) { switch ($rr['rel']) {
case CONTACT_IS_FRIEND: case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif'; $dir_icon = 'images/lrarrow.gif';
@ -959,14 +941,13 @@ function _contact_detail_for_template($rr){
if (($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) { if (($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
$url = "redir/{$rr['id']}"; $url = "redir/{$rr['id']}";
$sparkle = ' class="sparkle" '; $sparkle = ' class="sparkle" ';
} } else {
else {
$url = $rr['url']; $url = $rr['url'];
$sparkle = ''; $sparkle = '';
} }
return array( return array(
'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']), 'img_hover' => t('Visit %s\'s profile [%s]', $rr['name'], $rr['url']),
'edit_hover' => t('Edit contact'), 'edit_hover' => t('Edit contact'),
'photo_menu' => Contact::photoMenu($rr), 'photo_menu' => Contact::photoMenu($rr),
'id' => $rr['id'], 'id' => $rr['id'],
@ -981,7 +962,6 @@ function _contact_detail_for_template($rr){
'url' => $url, 'url' => $url,
'network' => network_to_name($rr['network'], $rr['url']), 'network' => network_to_name($rr['network'], $rr['url']),
); );
} }
/** /**
@ -992,10 +972,10 @@ function _contact_detail_for_template($rr){
* @param array $contact Data about the Contact * @param array $contact Data about the Contact
* @return array with contact related actions * @return array with contact related actions
*/ */
function contact_actions($contact) { function contact_actions($contact)
{
$poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL)); $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL));
$contact_action = array(); $contact_actions = array();
// Provide friend suggestion only for Friendica contacts // Provide friend suggestion only for Friendica contacts
if ($contact['network'] === NETWORK_DFRN) { if ($contact['network'] === NETWORK_DFRN) {