}
}
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'))
`uri-date` = '%s',
`avatar-date` = '%s'
WHERE `id` = %d",
- dbesc($photos[0]),
+ dbesc($data["photo"]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc(datetime_convert()),
intval($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);
$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
- $tab_str = contact_tabs($a, $contact_id, 2);
+ $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!') : '');
return $o;
}
-function contact_tabs($a, $contact_id, $active_tab) {
+function contacts_tab($a, $contact_id, $active_tab) {
// tabs
$tabs = array(
array(
'sel' => (($active_tab == 2)?'active':''),
'title' => t('Profile Details'),
'id' => 'status-tab',
- 'accesskey' => 'r',
- ),
- array(
- 'label' => t('Repair'),
+ 'accesskey' => 'o',
+ )
+ );
+
+ $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');
+
+ $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('Repair'),
'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
- 'sel' => (($active_tab == 3)?'active':''),
+ 'sel' => (($active_tab == 5)?'active':''),
'title' => t('Advanced Contact Settings'),
'id' => 'repair-tab',
- 'accesskey' => 'r',
- ),
- array(
- 'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
+ 'accesskey' => 'r');
+
+
+ $tabs[] = 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') ),
+ 'accesskey' => 'b');
+
+ $tabs[] = 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') ),
+ 'accesskey' => 'i');
+
+ $tabs[] = 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',
- )
- );
+ 'accesskey' => 'v');
+
$tab_tpl = get_markup_template('common_tabs.tpl');
$tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
function contact_posts($a, $contact_id) {
- require_once('include/conversation.php');
-
- $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($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"]));
- }
-
- 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'])
- );
+ } else
+ $profile = "";
- $tab_str = contact_tabs($a, $contact_id, 1);
+ $tab_str = contacts_tab($a, $contact_id, 1);
$o .= $tab_str;
- $o .= conversation($a,$r,'community',false);
+ $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(!get_config('system', 'old_pager')) {
- $o .= alt_pager($a,count($r));
- } else {
- $o .= paginate($a);
+ if ($r[0]["id"] <> 0)
+ $o .= posts_from_gcontact($a, $r[0]["id"]);
}
return $o;