$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];
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
- '$name' => $a->data['contact']['name'],
+ '$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) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url']
));
+ $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),
/*contact actions*/
function _contact_update($contact_id) {
- // pull feed and consume it, which should subscribe to the hub.
- proc_run('php',"include/poller.php","$contact_id");
+ $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
+ if (!$r)
+ return;
+
+ $uid = $r[0]["uid"];
+
+ if ($uid != local_user())
+ return;
+
+ if ($r[0]["network"] == NETWORK_OSTATUS) {
+ $result = new_contact($uid, $r[0]["url"], false);
+
+ if ($result['success'])
+ $r = q("UPDATE `contact` SET `subhub` = 1 WHERE `id` = %d",
+ intval($contact_id));
+ } else
+ // pull feed and consume it, which should subscribe to the hub.
+ proc_run('php',"include/onepoll.php","$contact_id", "force");
}
function _contact_update_profile($contact_id) {
- $r = q("SELECT `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
+ $r = q("SELECT `uid`, `url`, `network` FROM `contact` WHERE `id` = %d", intval($contact_id));
if (!$r)
return;
+ $uid = $r[0]["uid"];
+
+ if ($uid != local_user())
+ return;
+
$data = probe_url($r[0]["url"]);
- // "Feed" is mostly a sign of communication problems
- if (($data["network"] == NETWORK_FEED) AND ($data["network"] != $r[0]["network"]))
+ // "Feed" or "Unknown" is mostly a sign of communication problems
+ if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"]))
return;
$updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm",
- "poco", "network", "alias", "pubkey");
+ "poco", "network", "alias");
$update = array();
+ if ($data["network"] == NETWORK_OSTATUS) {
+ $result = new_contact($uid, $data["url"], false);
+
+ if ($result['success'])
+ $update["subhub"] = true;
+ }
+
foreach($updatefields AS $field)
if (isset($data[$field]) AND ($data[$field] != ""))
$update[$field] = $data[$field];
}
$a->page['aside'] = '';
-
+
return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
'$contact' => _contact_detail_for_template($orig_record[0]),
'$method' => 'get',
goaway($a->get_baseurl(true) . '/contacts');
return; // NOTREACHED
}
+ if($cmd === 'posts') {
+ return contact_posts($a, $contact_id);
+ }
}
if(!in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)))
$relation_text = "";
- $relation_text = sprintf($relation_text,$contact['name']);
+ $relation_text = sprintf($relation_text,htmlentities($contact['name']));
if(($contact['network'] === NETWORK_DFRN) && ($contact['rel'])) {
$url = "redir/{$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'),
- ),
- array(
- 'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
- 'sel' => '',
- 'title' => t('Toggle Ignored status'),
- ),
-
- array(
- 'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
- 'sel' => '',
- 'title' => t('Toggle Archive status'),
- ),
- array(
- 'label' => t('Repair'),
- 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
- 'sel' => '',
- 'title' => t('Advanced Contact Settings'),
- )
- );
- $tab_tpl = get_markup_template('common_tabs.tpl');
- $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
+ $tab_str = contact_tabs($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!') : '');
if ($contact['network'] == NETWORK_DFRN)
$profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false));
+ if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS)) AND
+ ($contact['rel'] == CONTACT_IS_FOLLOWER))
+ $follow = $a->get_baseurl(true)."/follow?url=".urlencode($contact["url"]);
+
+
+ $header = $contact["name"];
+
+ if ($contact["addr"] != "")
+ $header .= " <".$contact["addr"].">";
+
+ $header .= " (".network_to_name($contact['network'], $contact['url']).")";
+
$o .= replace_macros($tpl, array(
- '$header' => t('Contact Editor'),
+ //'$header' => t('Contact Editor'),
+ '$header' => htmlentities($header),
'$tab_str' => $tab_str,
'$submit' => t('Submit'),
'$lbl_vis1' => t('Profile Visibility'),
'$updpub' => t('Update public posts'),
'$last_update' => $last_update,
'$udnow' => t('Update now'),
+ '$follow' => $follow,
+ '$follow_text' => t("Connect/Follow"),
'$profile_select' => $profile_select,
'$contact_id' => $contact['id'],
'$block_text' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
'$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
'$ffi_keyword_blacklist' => array('ffi_keyword_blacklist', t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')),
'$photo' => $contact['photo'],
- '$name' => $contact['name'],
+ '$name' => htmlentities($contact['name']),
'$dir_icon' => $dir_icon,
'$alt_text' => $alt_text,
'$sparkle' => $sparkle,
'$url' => $url,
'$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'],
+ '$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:")
));
$tabs = array(
array(
'label' => t('Suggestions'),
- 'url' => $a->get_baseurl(true) . '/suggest',
+ 'url' => $a->get_baseurl(true) . '/suggest',
'sel' => '',
'title' => t('Suggest potential friends'),
+ 'id' => 'suggestions-tab',
+ 'accesskey' => 'g',
),
array(
'label' => t('All Contacts'),
- 'url' => $a->get_baseurl(true) . '/contacts/all',
+ 'url' => $a->get_baseurl(true) . '/contacts/all',
'sel' => ($all) ? 'active' : '',
'title' => t('Show all contacts'),
+ 'id' => 'showall-tab',
+ 'accesskey' => 'l',
),
array(
'label' => t('Unblocked'),
'url' => $a->get_baseurl(true) . '/contacts',
'sel' => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
'title' => t('Only show unblocked contacts'),
+ 'id' => 'showunblocked-tab',
+ 'accesskey' => 'o',
),
array(
'url' => $a->get_baseurl(true) . '/contacts/blocked',
'sel' => ($blocked) ? 'active' : '',
'title' => t('Only show blocked contacts'),
+ 'id' => 'showblocked-tab',
+ 'accesskey' => 'b',
),
array(
'url' => $a->get_baseurl(true) . '/contacts/ignored',
'sel' => ($ignored) ? 'active' : '',
'title' => t('Only show ignored contacts'),
+ 'id' => 'showignored-tab',
+ 'accesskey' => 'i',
),
array(
'url' => $a->get_baseurl(true) . '/contacts/archived',
'sel' => ($archived) ? 'active' : '',
'title' => t('Only show archived contacts'),
+ 'id' => 'showarchived-tab',
+ 'accesskey' => 'y',
),
array(
'url' => $a->get_baseurl(true) . '/contacts/hidden',
'sel' => ($hidden) ? 'active' : '',
'title' => t('Only show hidden contacts'),
+ 'id' => 'showhidden-tab',
+ 'accesskey' => 'h',
),
);
$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,
'$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"),
return $o;
}
+function contact_tabs($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' => 'r',
+ ),
+ array(
+ 'label' => t('Repair'),
+ 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
+ 'sel' => (($active_tab == 3)?'active':''),
+ 'title' => t('Advanced Contact Settings'),
+ 'id' => 'repair-tab',
+ 'accesskey' => 'r',
+ ),
+ 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',
+ )
+ );
+ $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) {
+
+ require_once('include/conversation.php');
+
+ $r = q("SELECT * 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"]));
+ }
+
+ if(get_config('system', 'old_pager')) {
+ $r = q("SELECT COUNT(*) AS `total` FROM `item`
+ WHERE `item`.`uid` = %d AND (`author-link` = '%s')",
+ intval(local_user()), dbesc($contact["url"]));
+
+ $a->set_pager_total($r[0]['total']);
+ }
+
+ $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
+ `author-name` AS `name`, `owner-avatar` AS `photo`,
+ `owner-link` AS `url`, `owner-avatar` AS `thumb`
+ FROM `item` FORCE INDEX (uid_contactid_created)
+ WHERE `item`.`uid` = %d AND `contact-id` = %d
+ AND (`author-link` = '%s')
+ ORDER BY `item`.`created` DESC LIMIT %d, %d",
+ intval(local_user()),
+ intval($contact_id),
+ dbesc($contact["url"]),
+ intval($a->pager['start']),
+ intval($a->pager['itemspage'])
+ );
+
+ $tab_str = contact_tabs($a, $contact_id, 1);
+
+ $header = $contact["name"];
+
+ if ($contact["addr"] != "")
+ $header .= " <".$contact["addr"].">";
+
+ $header .= " (".network_to_name($contact['network'], $contact['url']).")";
+
+ $tpl = get_markup_template("section_title.tpl");
+ $o = replace_macros($tpl,array(
+ '$title' => htmlentities($header)
+ ));
+
+ $o .= $tab_str;
+
+ $o .= conversation($a,$r,'community',false);
+
+ if(!get_config('system', 'old_pager')) {
+ $o .= alt_pager($a,count($r));
+ } else {
+ $o .= paginate($a);
+ }
+
+ return $o;
+}
+
function _contact_detail_for_template($rr){
+
+ $community = '';
+
switch($rr['rel']) {
case CONTACT_IS_FRIEND:
$dir_icon = 'images/lrarrow.gif';
$url = $rr['url'];
$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']),
'edit_hover' => t('Edit contact'),
'id' => $rr['id'],
'alt_text' => $alt_text,
'dir_icon' => $dir_icon,
- 'thumb' => proxy_url($rr['thumb']),
- 'name' => $rr['name'],
- 'username' => $rr['name'],
+ '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']),
);
projects / friendica.git / blobdiff