$contact_id = 0;
- if(($a->argc == 2) && intval($a->argv[1])) {
+ if((($a->argc == 2) && intval($a->argv[1])) OR (($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()),
require_once('include/group.php');
require_once('include/contact_widgets.php');
+ if ($_GET['nets'] == "all")
+ $_GET['nets'] = "";
+
if(! x($a->page,'aside'))
$a->page['aside'] = '';
if($contact_id) {
$a->data['contact'] = $r[0];
+
+ if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) {
+ $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']);
+ } else
+ $networkname = '';
+
$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) ? $a->get_baseurl()."/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:'),
+ 'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
));
+ $finpeople_widget = '';
$follow_widget = '';
+ $networks_widget = '';
}
else {
$vcard_widget = '';
+ $networks_widget .= networks_widget('contacts',$_GET['nets']);
if (isset($_GET['add']))
$follow_widget = follow_widget($_GET['add']);
else
$follow_widget = follow_widget();
+
+ $findpeople_widget .= findpeople_widget();
}
- if ($_GET['nets'] == "all")
- $_GET['nets'] = "";
+ $groups_widget .= group_side('contacts','group','full',0,$contact_id);
- $groups_widget .= group_side('contacts','group',false,0,$contact_id);
- $findpeople_widget .= findpeople_widget();
- $networks_widget .= networks_widget('contacts',$_GET['nets']);
$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,
'$groups_widget' => $groups_widget,
- '$findpeople_widget' => $findpeople_widget,
'$networks_widget' => $networks_widget
));
- $base = $a->get_baseurl();
+ $base = z_root();
$tpl = get_markup_template("contacts-head.tpl");
$a->page['htmlhead'] .= replace_macros($tpl,array(
'$baseurl' => $a->get_baseurl(true),
}
}
if ($count_actions>0) {
- info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) );
+ info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
}
if(x($_SESSION,'return_url'))
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway('' . $_SESSION['return_url']);
else
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
}
if(! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
return; // NOTREACHED
}
intval($contact_id));
} else
// pull feed and consume it, which should subscribe to the hub.
- proc_run('php',"include/onepoll.php","$contact_id", "force");
+ proc_run(PRIORITY_MEDIUM, "include/onepoll.php", $contact_id, "force");
}
function _contact_update_profile($contact_id) {
intval(local_user())
);
- $photos = import_profile_photo($data['photo'], local_user(), $contact_id);
-
- $r = q("UPDATE `contact` SET `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
- `uri-date` = '%s',
- `avatar-date` = '%s'
- WHERE `id` = %d",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- intval($contact_id)
- );
+ // Update the entry in the contact table
+ update_contact_avatar($data['photo'], local_user(), $contact_id);
+ // Update the entry in the gcontact table
+ update_gcontact_from_probe($data["url"]);
}
function _contact_block($contact_id, $orig_record) {
return $r;
}
function _contact_drop($contact_id, $orig_record) {
- require_once('include/Contact.php');
$a = get_app();
terminate_friendship($a->user,$a->contact,$orig_record);
if(! count($orig_record)) {
notice( t('Could not access contact record.') . EOL);
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
return; // NOTREACHED
}
if($cmd === 'update') {
_contact_update($contact_id);
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
// NOTREACHED
}
if($cmd === 'updateprofile') {
_contact_update_profile($contact_id);
- goaway($a->get_baseurl(true) . '/crepair/' . $contact_id);
+ goaway('crepair/' . $contact_id);
// NOTREACHED
}
info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
}
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
}
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
}
- goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+ goaway('contacts/' . $contact_id);
return; // NOTREACHED
}
$a->page['aside'] = '';
return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
- '$contact' => _contact_detail_for_template($orig_record[0]),
+ '$header' => t('Drop contact'),
+ '$contact' => _contact_detail_for_template($orig_record[0]),
'$method' => 'get',
'$message' => t('Do you really want to delete this contact?'),
'$extra_inputs' => $inputs,
// Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) {
if(x($_SESSION,'return_url'))
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway('' . $_SESSION['return_url']);
else
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
}
_contact_drop($contact_id, $orig_record[0]);
info( t('Contact has been removed.') . EOL );
if(x($_SESSION,'return_url'))
- goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+ goaway('' . $_SESSION['return_url']);
else
- goaway($a->get_baseurl(true) . '/contacts');
+ goaway('contacts');
return; // NOTREACHED
}
+ if($cmd === 'posts') {
+ return contact_posts($a, $contact_id);
+ }
}
$nettype = sprintf( t('Network type: %s'),network_to_name($contact['network'], $contact["url"]));
- $common = count_common_friends(local_user(),$contact['id']);
- $common_text = (($common) ? sprintf( tt('%d contact in common','%d contacts in common', $common),$common) : '');
+ //$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') : '');
+ //$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(true) . '/contacts/' . $contact_id . '/block',
- 'sel' => '',
- 'title' => t('Toggle Blocked status'),
- 'id' => 'toggle-block-tab',
- 'accesskey' => 'b',
- ),
- array(
- 'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
- 'sel' => '',
- 'title' => t('Toggle Ignored status'),
- 'id' => 'toggle-ignore-tab',
- 'accesskey' => 'i',
- ),
-
- array(
- 'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
- 'sel' => '',
- 'title' => t('Toggle Archive status'),
- 'id' => 'toggle-archive-tab',
- 'accesskey' => 'v',
- ),
- array(
- 'label' => t('Repair'),
- 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
- 'sel' => '',
- 'title' => t('Advanced Contact Settings'),
- 'id' => 'repair-tab',
- 'accesskey' => 'r',
- )
- );
- $tab_tpl = get_markup_template('common_tabs.tpl');
- $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
+ $tab_str = contacts_tab($a, $contact_id, 2);
$lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
($contact['rel'] == CONTACT_IS_FOLLOWER))
$follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+ // Load contactact related actions like hide, suggest, delete and others
+ $contact_actions = contact_actions($contact);
+
+
$o .= replace_macros($tpl, array(
- '$header' => t('Contact Editor'),
+ //'$header' => t('Contact Editor'),
+ '$header' => t("Contact"),
'$tab_str' => $tab_str,
'$submit' => t('Submit'),
'$lbl_vis1' => t('Profile Visibility'),
'$lbl_info1' => t('Contact Information / Notes'),
'$infedit' => t('Edit contact notes'),
'$common_text' => $common_text,
- '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
+ '$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'],
'$all_friends' => $all_friends,
'$relation_text' => $relation_text,
'$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']),
'$lblcrepair' => t("Repair URL settings"),
'$lblrecent' => t('View conversations'),
'$lblsuggest' => $lblsuggest,
- '$delete' => t('Delete contact'),
+ //'$delete' => t('Delete contact'),
'$nettype' => $nettype,
'$poll_interval' => $poll_interval,
'$poll_enabled' => $poll_enabled,
'$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'],
+ '$cinfo' => array('info', '', $contact['info'], ''),
'$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
'$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
'$archived' => (($contact['archive']) ? t('Currently archived') : ''),
'$url' => $url,
'$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'],
+ 'account_type' => (($contact['forum'] || $contact['prv']) ? t('Forum') : ''),
+ '$location' => bbcode($contact["location"]),
+ '$location_label' => t("Location:"),
+ '$about' => bbcode($contact["about"], false, false),
+ '$about_label' => t("About:"),
+ '$keywords' => $contact["keywords"],
+ '$keywords_label' => t("Tags:"),
+ '$contact_action_button' => t("Actions"),
+ '$contact_actions' => $contact_actions,
+ '$contact_status' => t("Status"),
+ '$contact_settings_label' => t('Contact Settings'),
+ '$contact_profile_label' => t("Profile"),
));
$tabs = array(
array(
'label' => t('Suggestions'),
- 'url' => $a->get_baseurl(true) . '/suggest',
+ 'url' => 'suggest',
'sel' => '',
'title' => t('Suggest potential friends'),
'id' => 'suggestions-tab',
),
array(
'label' => t('All Contacts'),
- 'url' => $a->get_baseurl(true) . '/contacts/all',
+ 'url' => 'contacts/all',
'sel' => ($all) ? 'active' : '',
'title' => t('Show all contacts'),
'id' => 'showall-tab',
),
array(
'label' => t('Unblocked'),
- 'url' => $a->get_baseurl(true) . '/contacts',
+ 'url' => 'contacts',
'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
'title' => t('Only show unblocked contacts'),
'id' => 'showunblocked-tab',
array(
'label' => t('Blocked'),
- 'url' => $a->get_baseurl(true) . '/contacts/blocked',
+ 'url' => 'contacts/blocked',
'sel' => ($blocked) ? 'active' : '',
'title' => t('Only show blocked contacts'),
'id' => 'showblocked-tab',
array(
'label' => t('Ignored'),
- 'url' => $a->get_baseurl(true) . '/contacts/ignored',
+ 'url' => 'contacts/ignored',
'sel' => ($ignored) ? 'active' : '',
'title' => t('Only show ignored contacts'),
'id' => 'showignored-tab',
array(
'label' => t('Archived'),
- 'url' => $a->get_baseurl(true) . '/contacts/archived',
+ 'url' => 'contacts/archived',
'sel' => ($archived) ? 'active' : '',
'title' => t('Only show archived contacts'),
'id' => 'showarchived-tab',
array(
'label' => t('Hidden'),
- 'url' => $a->get_baseurl(true) . '/contacts/hidden',
+ 'url' => 'contacts/hidden',
'sel' => ($hidden) ? 'active' : '',
'title' => t('Only show hidden contacts'),
'id' => 'showhidden-tab',
$total = $r[0]['total'];
}
+ $sql_extra3 = unavailable_networks();
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 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($a->pager['start']),
intval($a->pager['itemspage'])
$tpl = get_markup_template("contacts-template.tpl");
$o .= replace_macros($tpl, array(
- '$baseurl' => $a->get_baseurl(),
+ '$baseurl' => z_root(),
'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
'$tabs' => $t,
'$total' => $total,
'$search' => $search_hdr,
'$desc' => t('Search your contacts'),
- '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
+ '$finding' => (($searching) ? sprintf(t('Results for: %s'),$search) : ""),
'$submit' => t('Find'),
'$cmd' => $a->cmd,
'$contacts' => $contacts,
'$contact_drop_confirm' => t('Do you really want to delete this contact?'),
+ 'multiselect' => 1,
'$batch_actions' => array(
'contacts_batch_update' => t('Update'),
'contacts_batch_block' => t('Block')."/".t("Unblock"),
"contacts_batch_archive" => t('Archive')."/".t("Unarchive"),
"contacts_batch_drop" => t('Delete'),
),
+ '$h_batch_actions' => t('Batch Actions'),
'$paginate' => paginate($a),
));
return $o;
}
+/**
+ * @brief List of pages for the Contact TabBar
+ *
+ * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
+ *
+ * @param 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
+ */
+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':''),
+ 'title' => t('Status Messages and Posts'),
+ 'id' => 'status-tab',
+ 'accesskey' => 'm',
+ ),
+ array(
+ 'label'=>t('Profile'),
+ 'url' => "contacts/".$contact_id,
+ 'sel' => (($active_tab == 2)?'active':''),
+ 'title' => t('Profile Details'),
+ 'id' => 'status-tab',
+ 'accesskey' => 'o',
+ )
+ );
+
+ // Show this tab only if there is visible friend list
+ $x = count_all_friends(local_user(), $contact_id);
+ 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 = count_common_friends(local_user(),$contact_id);
+ 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');
+
+ $tabs[] = array('label' => t('Advanced'),
+ 'url' => 'crepair/' . $contact_id,
+ 'sel' => (($active_tab == 5)?'active':''),
+ 'title' => t('Advanced Contact Settings'),
+ 'id' => 'advanced-tab',
+ 'accesskey' => 'r');
+
+ $tab_tpl = get_markup_template('common_tabs.tpl');
+ $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
+
+ return $tab_str;
+}
+
+function contact_posts($a, $contact_id) {
+
+ $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", intval($contact_id));
+ if ($r) {
+ $contact = $r[0];
+ $a->page['aside'] = "";
+ profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
+ } else
+ $profile = "";
+
+ $tab_str = contacts_tab($a, $contact_id, 1);
+
+ $o .= $tab_str;
+
+ $r = q("SELECT `id` FROM `item` WHERE `contact-id` = %d LIMIT 1", intval($contact_id));
+ if ($r)
+ $o .= posts_from_contact($a, $contact_id);
+ elseif ($contact["url"]) {
+ $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+ dbesc(normalise_link($contact["url"])));
+
+ if ($r[0]["id"] <> 0)
+ $o .= posts_from_gcontact($a, $r[0]["id"]);
+ }
+
+ return $o;
+}
+
function _contact_detail_for_template($rr){
+
+ $community = '';
+
switch($rr['rel']) {
case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif';
$sparkle = '';
}
+ //test if contact is a forum page
+ if (isset($rr['forum']) OR isset($rr['prv']))
+ $community = ($rr['forum'] OR $rr['prv']);
+
return array(
'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
'name' => htmlentities($rr['name']),
'username' => htmlentities($rr['name']),
+ 'account_type' => ($community ? t('Forum') : ''),
'sparkle' => $sparkle,
- 'itemurl' => $rr['url'],
+ 'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
'url' => $url,
'network' => network_to_name($rr['network'], $rr['url']),
);
}
+
+/**
+ * @brief Gives a array with actions which can performed to a given contact
+ *
+ * This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others
+ *
+ * @param array $contact Data about the Contact
+ * @return array with contact related actions
+ */
+function contact_actions($contact) {
+
+ $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
+ $contact_action = array();
+
+ // Provide friend suggestion only for Friendica contacts
+ if($contact['network'] === NETWORK_DFRN) {
+ $contact_actions['suggest'] = array(
+ 'label' => t('Suggest friends'),
+ 'url' => 'fsuggest/' . $contact['id'],
+ 'title' => '',
+ 'sel' => '',
+ 'id' => 'suggest',
+ );
+ }
+
+ if($poll_enabled) {
+ $contact_actions['update'] = array(
+ 'label' => t('Update now'),
+ 'url' => 'contacts/' . $contact['id'] . '/update',
+ 'title' => '',
+ 'sel' => '',
+ 'id' => 'update',
+ );
+ }
+
+ $contact_actions['block'] = array(
+ 'label' => (intval($contact['blocked']) ? t('Unblock') : t('Block') ),
+ 'url' => 'contacts/' . $contact['id'] . '/block',
+ 'title' => t('Toggle Blocked status'),
+ 'sel' => (intval($contact['blocked']) ? 'active' : ''),
+ 'id' => 'toggle-block',
+ );
+
+ $contact_actions['ignore'] = array(
+ 'label' => (intval($contact['readonly']) ? t('Unignore') : t('Ignore') ),
+ 'url' => 'contacts/' . $contact['id'] . '/ignore',
+ 'title' => t('Toggle Ignored status'),
+ 'sel' => (intval($contact['readonly']) ? 'active' : ''),
+ 'id' => 'toggle-ignore',
+ );
+
+ $contact_actions['archive'] = array(
+ 'label' => (intval($contact['archive']) ? t('Unarchive') : t('Archive') ),
+ 'url' => 'contacts/' . $contact['id'] . '/archive',
+ 'title' => t('Toggle Archive status'),
+ 'sel' => (intval($contact['archive']) ? 'active' : ''),
+ 'id' => 'toggle-archive',
+ );
+
+ $contact_actions['delete'] = array(
+ 'label' => t('Delete'),
+ 'url' => 'contacts/' . $contact['id'] . '/drop',
+ 'title' => t('Delete contact'),
+ 'sel' => '',
+ 'id' => 'delete',
+ );
+
+ return $contact_actions;
+}