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) ? z_root()."/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 = '';
}
}
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(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
}
// 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') {
$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' => htmlentities($header),
'$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']),
$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',
'accesskey' => 'd');
$tabs[] = array('label' => t('Repair'),
- 'url' => $a->get_baseurl(true) . '/crepair/' . $contact_id,
+ 'url' => 'crepair/' . $contact_id,
'sel' => (($active_tab == 5)?'active':''),
'title' => t('Advanced Contact Settings'),
'id' => 'repair-tab',
$tabs[] = array('label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
+ 'url' => 'contacts/' . $contact_id . '/block',
'sel' => '',
'title' => t('Toggle Blocked status'),
'id' => 'toggle-block-tab',
'accesskey' => 'b');
$tabs[] = array('label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
+ 'url' => 'contacts/' . $contact_id . '/ignore',
'sel' => '',
'title' => t('Toggle Ignored status'),
'id' => 'toggle-ignore-tab',
'accesskey' => 'i');
$tabs[] = array('label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
- 'url' => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
+ 'url' => 'contacts/' . $contact_id . '/archive',
'sel' => '',
'title' => t('Toggle Archive status'),
'id' => 'toggle-archive-tab',
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` IN ('%s', '%s')",
- intval(local_user()),
- dbesc(normalise_link($contact["url"])),
- dbesc(str_replace("http://", "https://", $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` IN ('%s', '%s')
- ORDER BY `item`.`created` DESC LIMIT %d, %d",
- intval(local_user()),
- intval($contact_id),
- dbesc(normalise_link($contact["url"])),
- dbesc(str_replace("http://", "https://", $contact["url"])),
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
- );
-
- if (!$r)
- $o = $contact["url"]." - ".$contact_id;
+ } else
+ $profile = "";
$tab_str = contacts_tab($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);
+ $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;
projects / friendica.git / blobdiff