This commit is contained in:
Mike Macgirvin 2010-07-06 05:07:28 -07:00
parent 6817c5d59a
commit 1ea69ae275
10 changed files with 182 additions and 23 deletions

View file

@ -80,7 +80,44 @@ function contacts_content(&$a) {
return;
}
if(($a->argc2 == 2) && ($a->argv[1] == 'all'))
if(($a->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",
$_SESSION['uid'],
intval($contact_id)
);
if(! count($r)) {
notice("Contact not found.");
return;
}
require_once('view/contact_selectors.php');
$tpl = file_get_contents("view/contact_edit.tpl");
$o .= replace_macros($tpl,array(
'$profile_select' => contact_profile_assign($r[0]['profile-id']),
'$contact_id' => $r[0]['id'],
'$blocked' => $r[0]['blocked'],
'$rating' => $r[0]['rating'],
'$reason' => $r[0]['reason'],
// '$groups' => group_selector(),
'$photo' => $r[0]['photo'],
'$name' => $r[0]['name'],
'$dir_icon' => $dir_icon,
'$alt_text' => $alt_text
));
return $o;
}
if(($a->argc == 2) && ($a->argv[1] == 'all'))
$sql_extra = '';
else
$sql_extra = " AND `blocked` = 0 ";

View file

@ -187,7 +187,7 @@ function dfrn_request_post(&$a) {
if(is_array($contact_record)) {
// There is a contact record but no issued-id, so this
// is a reciprocal introduction from a known contact
$r = q("UPDATE `contact` SET `issued-id` = '%s', `ret-blocked` = 1 WHERE `id` = %d LIMIT 1",
$r = q("UPDATE `contact` SET `issued-id` = '%s' WHERE `id` = %d LIMIT 1",
dbesc($issued_id),
intval($contact_record['id'])
);

View file

@ -58,7 +58,7 @@ function item_post(&$a) {
intval($post_id));
}
}
goaway($a->get_baseurl() . "/profile/$uid");
goaway($a->get_baseurl() . "/profile/$profile_uid");