clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/friendika/friendika

This commit is contained in:
root 2011-01-02 10:35:52 +01:00
parent e024360d44 be3cfe8b65
commit 0b4a6f8eac
5 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -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 And what if this social network could scale to encompass the entire
internet, and *not* require a central organisation to provide servers (in internet, and *not* require a central organisation to provide servers (in
exchange for selling your private information - and everything else they can exchange for selling your private information; and everything else they can
find out about you from logging all of your online activities and find out about you - from logging all of your online activities and
conversations)? conversations)?
Look no further. Look no further.

6
addon/README
View File

@ -118,6 +118,12 @@ Current hooks:
$b is (string) HTML of nav region $b is (string) HTML of nav region
'personal_xrd' - called prior to output of personal XRD file.
$b is an array
'user' => the user record for the person
'xml' => the complete XML to be output
*** = subject to change *** = subject to change

1
include/items.php
View File

@ -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)) '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME))
)); ));
call_hooks('atom_feed', $atom); call_hooks('atom_feed', $atom);
if(! count($items)) { if(! count($items)) {

32
mod/dfrn_request.php
View File

@ -544,12 +544,40 @@ function dfrn_request_content(&$a) {
return; // NOTREACHED return; // NOTREACHED
} }
else { else {
$myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : '');
// Normal web request. Display our user's introduction form. /**
* 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']) : '');
}
/**
*
* 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) if($a->profile['page-flags'] == PAGE_NORMAL)
$tpl = load_view_file('view/dfrn_request.tpl'); $tpl = load_view_file('view/dfrn_request.tpl');
else else
$tpl = load_view_file('view/auto_request.tpl'); $tpl = load_view_file('view/auto_request.tpl');
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'), '$header' => t('Friend/Connection Request'),
'$pls_answer' => t('Please answer the following:'), '$pls_answer' => t('Please answer the following:'),

4
mod/xrd.php
View File

@ -39,6 +39,10 @@ function xrd_content(&$a) {
'$modexp' => 'data:application/magic-public-key,' . $salmon_key '$modexp' => 'data:application/magic-public-key,' . $salmon_key
)); ));
$arr = array('user' => $r[0], 'xml' => $o);
call_hooks('personal_xrd', $arr);
echo $o; echo $o;
killme(); killme();