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

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. 

addon/README

@@ -118,6 +118,12 @@ Current hooks:
 	$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
 
 

include/items.php

@@ -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)) {

mod/dfrn_request.php

@@ -544,12 +544,40 @@ function dfrn_request_content(&$a) {
 		return; // NOTREACHED
 	}
 	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)
 			$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:'),

mod/xrd.php

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