try to auto-fill the profile address if we actually do know it.
This commit is contained in:
parent
e68f68007c
commit
d8985b3a54
4
README
4
README
|
@ -41,8 +41,8 @@ interaction you've grown to love, *and* was free to use, *and* was open source,
|
|||
|
||||
And what if this social network could scale to encompass the entire
|
||||
internet, and *not* require a central organisation to provide servers (in
|
||||
exchange for selling your private information - and everything else they can
|
||||
find out about you from logging all of your online activities and
|
||||
exchange for selling your private information; and everything else they can
|
||||
find out about you - from logging all of your online activities and
|
||||
conversations)?
|
||||
|
||||
Look no further.
|
||||
|
|
|
@ -157,7 +157,6 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) {
|
|||
'$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME))
|
||||
));
|
||||
|
||||
|
||||
call_hooks('atom_feed', $atom);
|
||||
|
||||
if(! count($items)) {
|
||||
|
|
|
@ -543,13 +543,41 @@ function dfrn_request_content(&$a) {
|
|||
killme();
|
||||
return; // NOTREACHED
|
||||
}
|
||||
else {
|
||||
|
||||
/**
|
||||
* Normal web request. Display our user's introduction form.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Try to auto-fill the profile address
|
||||
*/
|
||||
|
||||
if(local_user()) {
|
||||
if(strlen($a->path)) {
|
||||
$myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
|
||||
}
|
||||
else {
|
||||
$myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 );
|
||||
}
|
||||
}
|
||||
else {
|
||||
$myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
|
||||
// Normal web request. Display our user's introduction form.
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* The auto_request form only has the profile address
|
||||
* because nobody is going to read the comments and
|
||||
* it doesn't matter if they know you or not.
|
||||
*
|
||||
*/
|
||||
|
||||
if($a->profile['page-flags'] == PAGE_NORMAL)
|
||||
$tpl = load_view_file('view/dfrn_request.tpl');
|
||||
else
|
||||
$tpl = load_view_file('view/auto_request.tpl');
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$header' => t('Friend/Connection Request'),
|
||||
'$pls_answer' => t('Please answer the following:'),
|
||||
|
|
Loading…
Reference in a new issue