diff options
| author | Friendika <info@friendika.com> | 2011-09-05 18:34:30 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-09-05 18:34:30 -0700 |
| commit | e921b97a7f4e6f16e499eb7a8dd496f88d18277a (patch) | |
| tree | 2b2b7a0e394604364ff5102a5945a798a7b6158e /mod | |
| parent | 7e8100d2cd27227435ba6ff421dd3c3d8689930f (diff) | |
| download | volse-hubzilla-e921b97a7f4e6f16e499eb7a8dd496f88d18277a.tar.gz volse-hubzilla-e921b97a7f4e6f16e499eb7a8dd496f88d18277a.tar.bz2 volse-hubzilla-e921b97a7f4e6f16e499eb7a8dd496f88d18277a.zip | |
bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_request.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 98901e9f5..ce83001b4 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -611,6 +611,9 @@ function dfrn_request_content(&$a) { $myaddr = ((x($_GET,'address')) ? $_GET['address'] : ''); } + $target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 ); + + /** * * The auto_request form only has the profile address @@ -624,6 +627,11 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); + $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), + $target_addr) . EOL . EOL; + + $page_desc .= t("Please enter your 'Identity Address' from one of the following supported social networks:"); + $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'), @@ -632,11 +640,11 @@ function dfrn_request_content(&$a) { '$yes' => t('Yes'), '$no' => t('No'), '$add_note' => t('Add a personal note:'), - '$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"), + '$page_desc' => $page_desc, '$friendika' => t('Friendika'), '$statusnet' => t('StatusNet/Federated Social Web'), - '$private_net' => t("Private \x28secure\x29 network"), - '$public_net' => t("Public \x28insecure\x29 network"), + '$diaspora' => t('Diaspora'), + '$diasnote' => t('- please share from your own site as noted above'), '$your_address' => t('Your Identity Address:'), '$submit' => t('Submit Request'), '$cancel' => t('Cancel'), |