mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Fix issues in mod/contacts

Browse source 
- Fix formatting
- Use DBM::is_result()
- Use dba::select
- Simplify sprintf(t[t]()) structures
- Remove commented out code
- Remove unused variables
- Update documentation type hints
This commit is contained in:
Hypolite Petovan 2018-01-05 21:05:18 -05:00
commit 6444f97c98
2 changed files with 304 additions and 324 deletions
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
*
* @param $args Query parameters (1 to N parameters of different types)
* @return array Query array
* @return array|bool Query array
*/
function q($sql) {
$args = func_get_args();

488
mod/contacts.php
View file

@ -1,4 +1,5 @@
<?php
/**
* @file mod/contacts.php
*/
@ -12,52 +13,45 @@ use Friendica\Model\Group;
use Friendica\Network\Probe;
require_once 'include/contact_selectors.php';
require_once 'mod/proxy.php';
require_once 'include/contact_widgets.php';
require_once 'include/follow.php';
require_once 'mod/proxy.php';
function contacts_init(App $a) {
if (! local_user()) {
function contacts_init(App $a)
{
if (!local_user()) {
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', '');
if ($nets == "all") {
$nets = "";
}
if (! x($a->page,'aside')) {
if (!x($a->page, 'aside')) {
$a->page['aside'] = '';
}
if ($contact_id) {
$a->data['contact'] = $r[0];
$contact = [];
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)) {
$networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
$networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']);
} else {
$networkname = '';
}
/// @TODO Add nice spaces
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array(
'$name' => htmlentities($a->data['contact']['name']),
'$photo' => $a->data['contact']['photo'],
'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
'$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/" . $a->data['contact']['id'] : $a->data['contact']['url'],
'$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
'$network_name' => $networkname,
'$network' => t('Network:'),
@ -79,9 +73,9 @@ function contacts_init(App $a) {
$findpeople_widget = findpeople_widget();
}
$groups_widget = Group::sidebarWidget('contacts','group','full',0,$contact_id);
$groups_widget = Group::sidebarWidget('contacts', 'group', 'full', 0, $contact_id);
$a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
$a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"), array(
'$vcard_widget' => $vcard_widget,
'$findpeople_widget' => $findpeople_widget,
'$follow_widget' => $follow_widget,
@ -91,31 +85,32 @@ function contacts_init(App $a) {
$base = System::baseUrl();
$tpl = get_markup_template("contacts-head.tpl");
$a->page['htmlhead'] .= replace_macros($tpl,array(
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$baseurl' => System::baseUrl(true),
'$base' => $base
));
$tpl = get_markup_template("contacts-end.tpl");
$a->page['end'] .= replace_macros($tpl,array(
$a->page['end'] .= replace_macros($tpl, array(
'$baseurl' => System::baseUrl(true),
'$base' => $base
));
}
function contacts_batch_actions(App $a) {
function contacts_batch_actions(App $a)
{
$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",
implode(",", $contacts_id),
intval(local_user())
);
$count_actions=0;
foreach($orig_records as $orig_record) {
$count_actions = 0;
foreach ($orig_records as $orig_record) {
$contact_id = $orig_record['id'];
if (x($_POST, 'contacts_batch_update')) {
_contact_update($contact_id);
@ -123,48 +118,51 @@ function contacts_batch_actions(App $a) {
}
if (x($_POST, 'contacts_batch_block')) {
$r = _contact_block($contact_id, $orig_record);
if ($r) $count_actions++;
if ($r) {
$count_actions++;
}
}
if (x($_POST, 'contacts_batch_ignore')) {
$r = _contact_ignore($contact_id, $orig_record);
if ($r) $count_actions++;
if ($r) {
$count_actions++;
}
}
if (x($_POST, 'contacts_batch_archive')) {
$r = _contact_archive($contact_id, $orig_record);
if ($r) $count_actions++;
if ($r) {
$count_actions++;
}
}
if (x($_POST, 'contacts_batch_drop')) {
_contact_drop($orig_record);
$count_actions++;
}
}
if ($count_actions>0) {
info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
if ($count_actions > 0) {
info(tt("%d contact edited.", "%d contacts edited.", $count_actions));
}
if (x($_SESSION,'return_url')) {
if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']);
}
else {
} else {
goaway('contacts');
}
}
function contacts_post(App $a) {
if (! local_user()) {
function contacts_post(App $a)
{
if (!local_user()) {
return;
}
if ($a->argv[1]==="batch") {
if ($a->argv[1] === "batch") {
contacts_batch_actions($a);
return;
}
$contact_id = intval($a->argv[1]);
if (! $contact_id) {
if (!$contact_id) {
return;
}
@ -172,9 +170,8 @@ function contacts_post(App $a) {
intval($contact_id),
intval(local_user())
);
if (! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
if (!DBM::is_result($orig_record)) {
notice(t('Could not access contact record.') . EOL);
goaway('contacts');
return; // NOTREACHED
}
@ -187,8 +184,8 @@ function contacts_post(App $a) {
intval($profile_id),
intval(local_user())
);
if (! DBM::is_result($r)) {
notice( t('Could not locate selected profile.') . EOL);
if (!DBM::is_result($r)) {
notice(t('Could not locate selected profile.') . EOL);
return;
}
}
@ -202,8 +199,9 @@ function contacts_post(App $a) {
$ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist']));
$priority = intval($_POST['poll']);
if($priority > 5 || $priority < 0)
if ($priority > 5 || $priority < 0) {
$priority = 0;
}
$info = escape_tags(trim($_POST['info']));
@ -220,59 +218,57 @@ function contacts_post(App $a) {
intval($contact_id),
intval(local_user())
);
if($r)
info( t('Contact updated.') . EOL);
else
notice( t('Failed to update contact record.') . EOL);
if (DBM::is_result($r)) {
info(t('Contact updated.') . EOL);
} else {
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];
$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)
function _contact_update($contact_id)
{
$contact = dba::select('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]);
if (!DBM::is_result($contact)) {
return;
}
$uid = $r[0]["uid"];
if ($uid != local_user())
return;
$uid = $contact["uid"];
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'])
$r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d",
intval($contact_id));
} else
if ($result['success']) {
q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d", intval($contact_id));
}
} else {
// pull feed and consume it, which should subscribe to the hub.
Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
}
}
function _contact_update_profile($contact_id) {
$r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
if (!$r)
function _contact_update_profile($contact_id)
{
$contact = dba::select('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]);
if (!DBM::is_result($contact)) {
return;
}
$uid = $r[0]["uid"];
$uid = $contact["uid"];
if ($uid != local_user())
return;
$data = Probe::uri($r[0]["url"], "", 0, false);
$data = Probe::uri($contact["url"], "", 0, false);
// "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;
}
$updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
"poco", "network", "alias");
@ -281,30 +277,36 @@ function _contact_update_profile($contact_id) {
if ($data["network"] == NETWORK_OSTATUS) {
$result = new_contact($uid, $data["url"], false);
if ($result['success'])
if ($result['success']) {
$update["subhub"] = true;
}
}
foreach($updatefields AS $field)
if (isset($data[$field]) && ($data[$field] != ""))
foreach ($updatefields AS $field) {
if (isset($data[$field]) && ($data[$field] != "")) {
$update[$field] = $data[$field];
}
}
$update["nurl"] = normalise_link($data["url"]);
$query = "";
if (isset($data["priority"]) && ($data["priority"] != 0))
$query = "`priority` = ".intval($data["priority"]);
foreach($update AS $key => $value) {
if ($query != "")
$query .= ", ";
$query .= "`".$key."` = '".dbesc($value)."'";
if (isset($data["priority"]) && ($data["priority"] != 0)) {
$query = "`priority` = " . intval($data["priority"]);
}
if ($query == "")
foreach ($update AS $key => $value) {
if ($query != "") {
$query .= ", ";
}
$query .= "`" . $key . "` = '" . dbesc($value) . "'";
}
if ($query == "") {
return;
}
$r = q("UPDATE `contact` SET $query WHERE `id` = %d AND `uid` = %d",
intval($contact_id),
@ -318,26 +320,30 @@ function _contact_update_profile($contact_id) {
GContact::updateFromProbe($data["url"]);
}
function _contact_block($contact_id, $orig_record) {
function _contact_block($contact_id, $orig_record)
{
$blocked = (($orig_record['blocked']) ? 0 : 1);
$r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d",
intval($blocked),
intval($contact_id),
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);
$r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d",
intval($readonly),
intval($contact_id),
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);
$r = q("UPDATE `contact` SET `archive` = %d WHERE `id` = %d AND `uid` = %d",
intval($archived),
@ -347,7 +353,7 @@ function _contact_archive($contact_id, $orig_record) {
if ($archived) {
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)
@ -366,94 +372,86 @@ function _contact_drop($orig_record)
Contact::remove($orig_record['id']);
}
function contacts_content(App $a) {
function contacts_content(App $a)
{
$sort_type = 0;
$o = '';
nav_set_selected('contacts');
if (! local_user()) {
notice( t('Permission denied.') . EOL);
if (!local_user()) {
notice(t('Permission denied.') . EOL);
return;
}
if($a->argc == 3) {
if ($a->argc == 3) {
$contact_id = intval($a->argv[1]);
if(! $contact_id)
if (!$contact_id) {
return;
}
$cmd = $a->argv[2];
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
intval($contact_id),
intval(local_user())
);
if(! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
$orig_record = dba::select('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'self' => false], ['limit' => 1]);
if (!DBM::is_result($orig_record)) {
notice(t('Could not access contact record.') . EOL);
goaway('contacts');
return; // NOTREACHED
}
if($cmd === 'update') {
if ($cmd === 'update') {
_contact_update($contact_id);
goaway('contacts/' . $contact_id);
// NOTREACHED
}
if($cmd === 'updateprofile') {
if ($cmd === 'updateprofile') {
_contact_update_profile($contact_id);
goaway('crepair/' . $contact_id);
// NOTREACHED
}
if($cmd === 'block') {
$r = _contact_block($contact_id, $orig_record[0]);
if ($cmd === 'block') {
$r = _contact_block($contact_id, $orig_record);
if ($r) {
$blocked = (($orig_record[0]['blocked']) ? 0 : 1);
info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
$blocked = (($orig_record['blocked']) ? 0 : 1);
info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL);
}
goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
if($cmd === 'ignore') {
$r = _contact_ignore($contact_id, $orig_record[0]);
if ($cmd === 'ignore') {
$r = _contact_ignore($contact_id, $orig_record);
if ($r) {
$readonly = (($orig_record[0]['readonly']) ? 0 : 1);
info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
$readonly = (($orig_record['readonly']) ? 0 : 1);
info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL);
}
goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
if($cmd === 'archive') {
$r = _contact_archive($contact_id, $orig_record[0]);
if ($cmd === 'archive') {
$r = _contact_archive($contact_id, $orig_record);
if ($r) {
$archived = (($orig_record[0]['archive']) ? 0 : 1);
info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
$archived = (($orig_record['archive']) ? 0 : 1);
info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL);
}
goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
if($cmd === 'drop') {
if ($cmd === 'drop') {
// 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
// so add any arguments as hidden inputs
$query = explode_querystring($a->query_string);
$inputs = array();
foreach($query['args'] as $arg) {
if(strpos($arg, 'confirm=') === false) {
foreach ($query['args'] as $arg) {
if (strpos($arg, 'confirm=') === false) {
$arg_parts = explode('=', $arg);
$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
}
@ -463,7 +461,7 @@ function contacts_content(App $a) {
return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
'$header' => t('Drop contact'),
'$contact' => _contact_detail_for_template($orig_record[0]),
'$contact' => _contact_detail_for_template($orig_record),
'$method' => 'get',
'$message' => t('Do you really want to delete this contact?'),
'$extra_inputs' => $inputs,
@ -474,21 +472,19 @@ function contacts_content(App $a) {
));
}
// Now check how the user responded to the confirmation query
if ($_REQUEST['canceled']) {
if (x($_SESSION,'return_url')) {
if (x($_REQUEST, 'canceled')) {
if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']);
}
else {
} else {
goaway('contacts');
}
}
_contact_drop($orig_record[0]);
info( t('Contact has been removed.') . EOL );
if (x($_SESSION,'return_url')) {
_contact_drop($orig_record);
info(t('Contact has been removed.') . EOL);
if (x($_SESSION, 'return_url')) {
goaway('' . $_SESSION['return_url']);
}
else {
} else {
goaway('contacts');
}
return; // NOTREACHED
@ -498,12 +494,9 @@ function contacts_content(App $a) {
}
}
$_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 = $a->data['contact'];
@ -516,7 +509,9 @@ function contacts_content(App $a) {
require_once 'include/contact_selectors.php';
switch($contact['rel']) {
$dir_icon = '';
$relation_text = '';
switch ($contact['rel']) {
case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif';
$relation_text = t('You are mutual friends with %s');
@ -525,7 +520,6 @@ function contacts_content(App $a) {
$dir_icon = 'images/larrow.gif';
$relation_text = t('You are sharing with %s');
break;
case CONTACT_IS_SHARING;
$dir_icon = 'images/rarrow.gif';
$relation_text = t('%s is sharing with you');
@ -534,25 +528,23 @@ function contacts_content(App $a) {
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 = 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']}";
$sparkle = ' class="sparkle" ';
}
else {
} else {
$url = $contact['url'];
$sparkle = '';
}
$insecure = t('Private communications are not available for this contact.');
$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'));
$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'));
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"));
@ -561,51 +553,46 @@ function contacts_content(App $a) {
$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"]));
//$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') : '');
$nettype = t('Network type: %s', network_to_name($contact['network'], $contact["url"]));
// tabs
$tab_str = contacts_tab($a, $contact_id, 2);
$lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
$lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < datetime_convert('', '', 'now')) ? t('Communications lost with this contact!') : '');
$fetch_further_information = null;
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'),
$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."),
array('0' => t('Disabled'),
'1' => t('Fetch information'),
'3' => t('Fetch keywords'),
'2' => t('Fetch information and keywords')));
'2' => t('Fetch information and keywords')
)
);
}
$poll_interval = null;
if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL))) {
$poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled));
$poll_interval = contact_poll_interval($contact['priority'], (!$poll_enabled));
}
$profile_select = null;
if ($contact['network'] == NETWORK_DFRN) {
$profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
$profile_select = contact_profile_assign($contact['profile-id'], (($contact['network'] !== NETWORK_DFRN) ? true : false));
}
$follow = '';
$follow_text = '';
if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS))) {
if ($contact['rel'] == CONTACT_IS_FOLLOWER) {
$follow = System::baseUrl(true)."/follow?url=".urlencode($contact["url"]);
$follow = System::baseUrl(true) . "/follow?url=" . urlencode($contact["url"]);
$follow_text = t("Connect/Follow");
} elseif ($contact['rel'] == CONTACT_IS_FRIEND) {
$follow = System::baseUrl(true)."/unfollow?url=".urlencode($contact["url"]);
$follow = System::baseUrl(true) . "/unfollow?url=" . urlencode($contact["url"]);
$follow_text = t("Disconnect/Unfollow");
}
}
@ -615,25 +602,23 @@ function contacts_content(App $a) {
$tpl = get_markup_template("contact_edit.tpl");
$o .= replace_macros($tpl, array(
//'$header' => t('Contact Editor'),
'$header' => t("Contact"),
'$tab_str' => $tab_str,
'$submit' => t('Submit'),
'$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_info2' => t('Their personal note'),
'$reason' => trim(notags($contact['reason'])),
'$infedit' => t('Edit contact notes'),
'$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
'$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'),
'$ignorecont' => t('Ignore contact'),
'$lblcrepair' => t("Repair URL settings"),
'$lblrecent' => t('View conversations'),
'$lblsuggest' => $lblsuggest,
//'$delete' => t('Delete contact'),
'$nettype' => $nettype,
'$poll_interval' => $poll_interval,
'$poll_enabled' => $poll_enabled,
@ -681,15 +666,13 @@ function contacts_content(App $a) {
'$contact_status' => t("Status"),
'$contact_settings_label' => t('Contact Settings'),
'$contact_profile_label' => t("Profile"),
));
$arr = array('contact' => $contact,'output' => $o);
$arr = array('contact' => $contact, 'output' => $o);
call_hooks('contact_edit', $arr);
return $arr['output'];
}
$blocked = false;
@ -698,19 +681,19 @@ function contacts_content(App $a) {
$archived = false;
$all = false;
if(($a->argc == 2) && ($a->argv[1] === 'all')) {
if (($a->argc == 2) && ($a->argv[1] === 'all')) {
$sql_extra = '';
$all = true;
} elseif(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
} elseif (($a->argc == 2) && ($a->argv[1] === 'blocked')) {
$sql_extra = " AND `blocked` = 1 ";
$blocked = true;
} elseif(($a->argc == 2) && ($a->argv[1] === 'hidden')) {
} elseif (($a->argc == 2) && ($a->argv[1] === 'hidden')) {
$sql_extra = " AND `hidden` = 1 ";
$hidden = true;
} elseif(($a->argc == 2) && ($a->argv[1] === 'ignored')) {
} elseif (($a->argc == 2) && ($a->argv[1] === 'ignored')) {
$sql_extra = " AND `readonly` = 1 ";
$ignored = true;
} elseif(($a->argc == 2) && ($a->argv[1] === 'archived')) {
} elseif (($a->argc == 2) && ($a->argv[1] === 'archived')) {
$sql_extra = " AND `archive` = 1 ";
$archived = true;
} else {
@ -718,7 +701,7 @@ function contacts_content(App $a) {
}
$search = x($_GET, 'search') ? notags(trim($_GET['search'])) : '';
$nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : '';
$nets = x($_GET, 'nets' ) ? notags(trim($_GET['nets'])) : '';
$tabs = array(
array(
@ -740,12 +723,11 @@ function contacts_content(App $a) {
array(
'label' => t('Unblocked'),
'url' => 'contacts',
'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
'sel' => ((!$all) && (!$blocked) && (!$hidden) && (!$search) && (!$nets) && (!$ignored) && (!$archived)) ? 'active' : '',
'title' => t('Only show unblocked contacts'),
'id' => 'showunblocked-tab',
'accesskey' => 'o',
),
array(
'label' => t('Blocked'),
'url' => 'contacts/blocked',
@ -754,7 +736,6 @@ function contacts_content(App $a) {
'id' => 'showblocked-tab',
'accesskey' => 'b',
),
array(
'label' => t('Ignored'),
'url' => 'contacts/ignored',
@ -763,7 +744,6 @@ function contacts_content(App $a) {
'id' => 'showignored-tab',
'accesskey' => 'i',
),
array(
'label' => t('Archived'),
'url' => 'contacts/archived',
@ -772,7 +752,6 @@ function contacts_content(App $a) {
'id' => 'showarchived-tab',
'accesskey' => 'y',
),
array(
'label' => t('Hidden'),
'url' => 'contacts/hidden',
@ -781,26 +760,27 @@ function contacts_content(App $a) {
'id' => 'showhidden-tab',
'accesskey' => 'h',
),
);
$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;
$search_hdr = null;
$search_txt = '';
if ($search) {
$searching = true;
$search_hdr = $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) {
$sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets));
}
$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
$sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
@ -813,14 +793,13 @@ function contacts_content(App $a) {
$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 ",
intval($_SESSION['uid']),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
$contacts = array();
if (DBM::is_result($r)) {
foreach ($r as $rr) {
$contacts[] = _contact_detail_for_template($rr);
@ -843,9 +822,9 @@ function contacts_content(App $a) {
'multiselect' => 1,
'$batch_actions' => array(
'contacts_batch_update' => t('Update'),
'contacts_batch_block' => t('Block')."/".t("Unblock"),
"contacts_batch_ignore" => t('Ignore')."/".t("Unignore"),
"contacts_batch_archive" => t('Archive')."/".t("Unarchive"),
'contacts_batch_block' => t('Block') . "/" . t("Unblock"),
"contacts_batch_ignore" => t('Ignore') . "/" . t("Unignore"),
"contacts_batch_archive" => t('Archive') . "/" . t("Unarchive"),
"contacts_batch_drop" => t('Delete'),
),
'$h_batch_actions' => t('Batch Actions'),
@ -864,23 +843,24 @@ function contacts_content(App $a) {
* @param int $contact_id The ID of the contact
* @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 = array(
array(
'label'=>t('Status'),
'url' => "contacts/".$contact_id."/posts",
'sel' => (($active_tab == 1)?'active':''),
'label' => t('Status'),
'url' => "contacts/" . $contact_id . "/posts",
'sel' => (($active_tab == 1) ? 'active' : ''),
'title' => t('Status Messages and Posts'),
'id' => 'status-tab',
'accesskey' => 'm',
),
array(
'label'=>t('Profile'),
'url' => "contacts/".$contact_id,
'sel' => (($active_tab == 2)?'active':''),
'label' => t('Profile'),
'url' => "contacts/" . $contact_id,
'sel' => (($active_tab == 2) ? 'active' : ''),
'title' => t('Profile Details'),
'id' => 'profile-tab',
'accesskey' => 'o',
@ -889,30 +869,34 @@ function contacts_tab($a, $contact_id, $active_tab) {
// Show this tab only if there is visible friend list
$x = GContact::countAllFriends(local_user(), $contact_id);
if ($x)
$tabs[] = array('label'=>t('Contacts'),
'url' => "allfriends/".$contact_id,
'sel' => (($active_tab == 3)?'active':''),
if ($x) {
$tabs[] = array('label' => t('Contacts'),
'url' => "allfriends/" . $contact_id,
'sel' => (($active_tab == 3) ? 'active' : ''),
'title' => t('View all contacts'),
'id' => 'allfriends-tab',
'accesskey' => 't');
}
// Show this tab only if there is visible common friend list
$common = GContact::countCommonFriends(local_user(), $contact_id);
if ($common)
$tabs[] = array('label'=>t('Common Friends'),
'url' => "common/loc/".local_user()."/".$contact_id,
'sel' => (($active_tab == 4)?'active':''),
if ($common) {
$tabs[] = array('label' => t('Common Friends'),
'url' => "common/loc/" . local_user() . "/" . $contact_id,
'sel' => (($active_tab == 4) ? 'active' : ''),
'title' => t('View all common friends'),
'id' => 'common-loc-tab',
'accesskey' => 'd');
'accesskey' => 'd'
);
}
$tabs[] = array('label' => t('Advanced'),
'url' => 'crepair/' . $contact_id,
'sel' => (($active_tab == 5)?'active':''),
'sel' => (($active_tab == 5) ? 'active' : ''),
'title' => t('Advanced Contact Settings'),
'id' => 'advanced-tab',
'accesskey' => 'r');
'accesskey' => 'r'
);
$tab_tpl = get_markup_template('common_tabs.tpl');
$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
@ -920,27 +904,25 @@ function contacts_tab($a, $contact_id, $active_tab) {
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));
if ($r) {
$contact = $r[0];
$contact = dba::select('contact', ['url'], ['id' => $contact_id], ['limit' => 1]);
if (DBM::is_result($contact)) {
$a->page['aside'] = "";
profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
}
$tab_str = contacts_tab($a, $contact_id, 1);
$o = $tab_str;
$o .= Contact::getPostsFromUrl($contact["url"]);
}
return $o;
}
function _contact_detail_for_template($rr){
switch($rr['rel']) {
function _contact_detail_for_template($rr)
{
$dir_icon = '';
$alt_text = '';
switch ($rr['rel']) {
case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif';
$alt_text = t('Mutual Friendship');
@ -956,17 +938,16 @@ function _contact_detail_for_template($rr){
default:
break;
}
if(($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
if (($rr['network'] === NETWORK_DFRN) && ($rr['rel'])) {
$url = "redir/{$rr['id']}";
$sparkle = ' class="sparkle" ';
}
else {
} else {
$url = $rr['url'];
$sparkle = '';
}
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'),
'photo_menu' => Contact::photoMenu($rr),
'id' => $rr['id'],
@ -981,7 +962,6 @@ function _contact_detail_for_template($rr){
'url' => $url,
'network' => network_to_name($rr['network'], $rr['url']),
);
}
/**
@ -992,13 +972,13 @@ function _contact_detail_for_template($rr){
* @param array $contact Data about the Contact
* @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));
$contact_action = array();
$contact_actions = array();
// Provide friend suggestion only for Friendica contacts
if($contact['network'] === NETWORK_DFRN) {
if ($contact['network'] === NETWORK_DFRN) {
$contact_actions['suggest'] = array(
'label' => t('Suggest friends'),
'url' => 'fsuggest/' . $contact['id'],
@ -1008,7 +988,7 @@ function contact_actions($contact) {
);
}
if($poll_enabled) {
if ($poll_enabled) {
$contact_actions['update'] = array(
'label' => t('Update now'),
'url' => 'contacts/' . $contact['id'] . '/update',