aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-01 13:12:31 -0800
committerFriendika <info@friendika.com>2011-01-01 13:12:31 -0800
commitd8985b3a548422dca8a8d659f4c66975366818df (patch)
tree79bb658db26ecf5e8cd959dad100a5d21569673e
parente68f68007cf5dca510a16aad6018659c131149b3 (diff)
downloadvolse-hubzilla-d8985b3a548422dca8a8d659f4c66975366818df.tar.gz
volse-hubzilla-d8985b3a548422dca8a8d659f4c66975366818df.tar.bz2
volse-hubzilla-d8985b3a548422dca8a8d659f4c66975366818df.zip
try to auto-fill the profile address if we actually do know it.
-rw-r--r--README4
-rw-r--r--include/items.php1
-rw-r--r--mod/dfrn_request.php32
3 files changed, 32 insertions, 5 deletions
diff --git a/README b/README
index 7b9a51dea..e5c5e02d6 100644
--- a/README
+++ b/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.
diff --git a/include/items.php b/include/items.php
index 22d47d44f..6f73984e2 100644
--- a/include/items.php
+++ b/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)) {
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 93ef4097b..844fbbf6d 100644
--- a/mod/dfrn_request.php
+++ b/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:'),