X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=ef77366da71ddeae61fd4831e05e0693e5b32170;hb=f84309eb9202cb5917f05ca9cfe3a83a953fef0a;hp=6863bd73708ea0621a284b16df88fd8618a5c505;hpb=74d61ed00b9ff6fe768d4a0f4a27da246020c270;p=friendica.git
diff --git a/mod/contacts.php b/mod/contacts.php
old mode 100644
new mode 100755
index 6863bd7370..ef77366da7
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,12 +1,14 @@
argc == 2) && intval($a->argv[1])) {
$contact_id = intval($a->argv[1]);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
@@ -19,36 +21,28 @@ function contacts_init(&$a) {
}
require_once('include/group.php');
+ require_once('include/contact_widgets.php');
+
if(! x($a->page,'aside'))
$a->page['aside'] = '';
- $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
-
- $inv = '
';
-
- if(get_config('system','invitation_only')) {
- $x = get_pconfig(local_user(),'system','invites_remaining');
- if($x || is_site_admin()) {
- $a->page['aside'] .= ''
- . sprintf( tt('%d invitation available','%d invitations available',$x), $x)
- . '
' . $inv;
- }
- }
- elseif($a->config['register_policy'] != REGISTER_CLOSED)
- $a->page['aside'] .= $inv;
-
- $a->page['aside'] .= '';
+ if($contact_id) {
+ $a->data['contact'] = $r[0];
+ $o .= '';
+ $o .= '
' . $a->data['contact']['name'] . '
';
+ $o .= '
';
+ $o .= '
';
+ $a->page['aside'] .= $o;
- $tpl = get_markup_template('follow.tpl');
- $a->page['aside'] .= replace_macros($tpl,array(
- '$label' => t('Connect/Follow'),
- '$hint' => t('Example: bob@example.com, http://example.com/barbara'),
- '$follow' => t('Follow')
- ));
+ }
+ else
+ $a->page['aside'] .= follow_widget();
+ $a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
+ $a->page['aside'] .= findpeople_widget();
+ $a->page['aside'] .= networks_widget('contacts',$_GET['nets']);
}
function contacts_post(&$a) {
@@ -85,28 +79,20 @@ function contacts_post(&$a) {
}
}
+ $hidden = intval($_POST['hidden']);
$priority = intval($_POST['poll']);
- if($priority == (-1))
-
if($priority > 5 || $priority < 0)
$priority = 0;
- $rating = intval($_POST['reputation']);
- if($rating > 5 || $rating < 0)
- $rating = 0;
-
- $reason = notags(trim($_POST['reason']));
-
$info = escape_tags(trim($_POST['info']));
- $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `info` = '%s'
- WHERE `id` = %d AND `uid` = %d LIMIT 1",
+ $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s',
+ `hidden` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($profile_id),
intval($priority),
- intval($rating),
- dbesc($reason),
dbesc($info),
+ intval($hidden),
intval($contact_id),
intval(local_user())
);
@@ -114,6 +100,14 @@ function contacts_post(&$a) {
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 && count($r))
+ $a->data['contact'] = $r[0];
+
return;
}
@@ -124,9 +118,8 @@ function contacts_content(&$a) {
$sort_type = 0;
$o = '';
- $o .= '';
+ nav_set_selected('contacts');
- $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
if(! local_user()) {
notice( t('Permission denied.') . EOL);
@@ -226,22 +219,18 @@ function contacts_content(&$a) {
contact_remove($orig_record[0]['id']);
info( t('Contact has been removed.') . EOL );
- goaway($a->get_baseurl() . '/contacts');
+ if(x($_SESSION,'return_url'))
+ goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+ else
+ goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED
}
}
- if(($a->argc == 2) && intval($a->argv[1])) {
+ if((x($a->data,'contact')) && (is_array($a->data['contact']))) {
- $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(! count($r)) {
- notice( t('Contact not found.') . EOL);
- return;
- }
+ $contact_id = $a->data['contact']['id'];
+ $contact = $a->data['contact'];
$tpl = get_markup_template('contact_head.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
@@ -250,86 +239,117 @@ function contacts_content(&$a) {
$tpl = get_markup_template("contact_edit.tpl");
- switch($r[0]['rel']) {
+ switch($contact['rel']) {
case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif';
- $alt_text = t('Mutual Friendship');
+ $relation_text = t('You are mutual friends with %s');
break;
case CONTACT_IS_FOLLOWER;
$dir_icon = 'images/larrow.gif';
- $alt_text = t('is a fan of yours');
+ $relation_text = t('You are sharing with %s');
break;
case CONTACT_IS_SHARING;
$dir_icon = 'images/rarrow.gif';
- $alt_text = t('you are a fan of');
+ $relation_text = t('%s is sharing with you');
break;
default:
break;
}
- if(($r[0]['network'] === 'dfrn') && ($r[0]['rel'])) {
- $url = "redir/{$r[0]['id']}";
+ $relation_text = sprintf($relation_text,$contact['name']);
+
+ if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
+ $url = "redir/{$contact['id']}";
$sparkle = ' class="sparkle" ';
}
else {
- $url = $r[0]['url'];
+ $url = $contact['url'];
$sparkle = '';
}
- $grps = '';
+ $insecure = t('Private communications are not available for this contact.');
- $insecure = ' '
- . t('Private communications are not available for this contact.') . '
';
-
- $last_update = (($r[0]['last-update'] == '0000-00-00 00:00:00')
+ $last_update = (($contact['last-update'] == '0000-00-00 00:00:00')
? t('Never')
- : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A'));
-
- if($r[0]['last-update'] !== '0000-00-00 00:00:00')
- $last_update .= ' ' . (($r[0]['last-update'] == $r[0]['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
-
- $lblsuggest = (($r[0]['network'] === NETWORK_DFRN)
- ? '' : '');
+ : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A'));
+
+ if($contact['last-update'] !== '0000-00-00 00:00:00')
+ $last_update .= ' ' . (($contact['last-update'] == $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29"));
+
+ $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : '');
+
+ $poll_enabled = (($contact['network'] !== NETWORK_DIASPORA) ? true : false);
+
+ $nettype = sprintf( t('Network type: %s'),network_to_name($contact['network']));
+
+ $common = count_common_friends(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 = count_all_friends(local_user(), $contact['id']);
+ $all_friends = (($x) ? t('View all contacts') : '');
+
+ // tabs
+ $tabs = array(
+ array(
+ 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
+ 'url' => $a->get_baseurl() . '/contacts/' . $contact_id . '/block',
+ 'sel' => '',
+ ),
+ array(
+ 'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
+ 'url' => $a->get_baseurl() . '/contacts/' . $contact_id . '/ignore',
+ 'sel' => '',
+ ),
+ array(
+ 'label' => t('Repair'),
+ 'url' => $a->get_baseurl() . '/crepair/' . $contact_id,
+ 'sel' => '',
+ )
+ );
+ $tab_tpl = get_markup_template('common_tabs.tpl');
+ $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
$o .= replace_macros($tpl,array(
'$header' => t('Contact Editor'),
+ '$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.'), $r[0]['name']),
+ '$lbl_vis2' => sprintf( 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_rep1' => t('Online Reputation'),
- '$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'),
- '$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a reputation to guide them.'),
- '$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'),
- '$visit' => sprintf( t('Visit %s\'s profile [%s]'),$r[0]['name'],$r[0]['url']),
+ '$infedit' => t('Edit contact notes'),
+ '$common_text' => $common_text,
+ '$common_link' => $a->get_baseurl() . '/common/' . $contact['id'],
+ '$all_friends' => $all_friends,
+ '$relation_text' => $relation_text,
+ '$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
'$blockunblock' => t('Block/Unblock contact'),
'$ignorecont' => t('Ignore contact'),
- '$altcrepair' => t('Repair contact URL settings'),
- '$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"),
+ '$lblcrepair' => t("Repair URL settings"),
'$lblrecent' => t('View conversations'),
'$lblsuggest' => $lblsuggest,
- '$grps' => $grps,
'$delete' => t('Delete contact'),
- '$poll_interval' => contact_poll_interval($r[0]['priority']),
- '$lastupdtext' => t('Last updated: '),
- '$updpub' => t('Update public posts: '),
+ '$nettype' => $nettype,
+ '$poll_interval' => contact_poll_interval($contact['priority'],(! $poll_enabled)),
+ '$poll_enabled' => $poll_enabled,
+ '$lastupdtext' => t('Last update:'),
+ '$updpub' => t('Update public posts'),
'$last_update' => $last_update,
'$udnow' => t('Update now'),
- '$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)),
- '$contact_id' => $r[0]['id'],
- '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ),
- '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ),
- '$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK && $r[0]['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
- '$info' => $r[0]['info'],
- '$blocked' => (($r[0]['blocked']) ? '' . t('Currently blocked') . '
' : ''),
- '$ignored' => (($r[0]['readonly']) ? '' . t('Currently ignored') . '
' : ''),
- '$rating' => contact_reputation($r[0]['rating']),
- '$reason' => $r[0]['reason'],
- '$groups' => '', // group_selector(),
- '$photo' => $r[0]['photo'],
- '$name' => $r[0]['name'],
+ '$profile_select' => contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)),
+ '$contact_id' => $contact['id'],
+ '$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
+ '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
+ '$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
+ '$info' => $contact['info'],
+ '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
+ '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
+ '$hidden' => array('hidden', t('Hide this contact from others'), ($contact['hidden'] == 1), t('Replies/likes to your public posts may still be visible')),
+ '$photo' => $contact['photo'],
+ '$name' => $contact['name'],
'$dir_icon' => $dir_icon,
'$alt_text' => $alt_text,
'$sparkle' => $sparkle,
@@ -337,7 +357,7 @@ function contacts_content(&$a) {
));
- $arr = array('contact' => $r[0],'output' => $o);
+ $arr = array('contact' => $contact,'output' => $o);
call_hooks('contact_edit', $arr);
@@ -345,20 +365,32 @@ function contacts_content(&$a) {
}
+ $blocked = false;
+
+ $_SESSION['return_url'] = $a->query_string;
if(($a->argc == 2) && ($a->argv[1] === 'all'))
$sql_extra = '';
- else
- $sql_extra = " AND `blocked` = 0 ";
-
+ else {
+ if(($a->argc == 2) && ($a->argv[1] === 'blocked')) {
+ $sql_extra = " AND `blocked` = 1 ";
+ $blocked = true;
+ }
+ else
+ $sql_extra = " AND `blocked` = 0 ";
+ }
$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+ $nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : '');
$tpl = get_markup_template("contacts-top.tpl");
$o .= replace_macros($tpl,array(
- '$header' => t('Contacts'),
- '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
- '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
+ '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
+ '$hide_url' => (($blocked) ? 'contacts' : 'contacts/blocked'),
+ '$hide_text' => (($blocked) ? t('Show Unblocked Contacts') : t('Show Blocked Contacts')),
+ '$all_url' => 'contacts/all',
+ '$all_text' => t('Show All Contacts'),
'$search' => $search,
+ '$desc' => t('Search your contacts'),
'$finding' => (strlen($search) ? '' . t('Finding: ') . "'" . $search . "'" . '
' : ""),
'$submit' => t('Find'),
'$cmd' => $a->cmd
@@ -370,6 +402,9 @@ function contacts_content(&$a) {
$search = dbesc($search.'*');
$sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
+ 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)) : '');
@@ -427,7 +462,7 @@ function contacts_content(&$a) {
'$alt_text' => $alt_text,
'$dir_icon' => $dir_icon,
'$thumb' => $rr['thumb'],
- '$name' => substr($rr['name'],0,20),
+ '$name' => $rr['name'],
'$username' => $rr['name'],
'$sparkle' => $sparkle,
'$url' => $url