diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-14 07:20:13 +0100 |
| commit | 4fcdada4320d5d5619eb3a1f517d0fea6b26857b (patch) | |
| tree | bc2ba3aac0a08c1464718f688be8080d0dff6d2c /mod/dfrn_request.php | |
| parent | 5bae7159cc7b182e40229bb6d547ccf303eb4282 (diff) | |
| parent | fb77bfa648c3dd06d1b3f343f5ad98f32a7ce313 (diff) | |
| download | volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.gz volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.tar.bz2 volse-hubzilla-4fcdada4320d5d5619eb3a1f517d0fea6b26857b.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'mod/dfrn_request.php')
| -rwxr-xr-x | mod/dfrn_request.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index bc159137d..4acb5c9bb 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -43,7 +43,7 @@ function dfrn_request_post(&$a) { return; - if($_POST['cancel']) { + if(x($_POST, 'cancel')) { goaway(z_root()); } @@ -666,7 +666,11 @@ function dfrn_request_content(&$a) { $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:"); + $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:"); + + $emailnet = t("<strike>Connect as an email follower</strike> \x28Coming soon\x29"); + + $invite_desc = t('If you are not yet a member of the free social web, <a href="http://dir.friendica.com/siteinfo">follow this link to find a public Friendica site and join us today</a>.'); $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), @@ -682,6 +686,8 @@ function dfrn_request_content(&$a) { '$diaspora' => t('Diaspora'), '$diasnote' => t('- please share from your own site as noted above'), '$your_address' => t('Your Identity Address:'), + '$invite_desc' => $invite_desc, + '$emailnet' => $emailnet, '$submit' => t('Submit Request'), '$cancel' => t('Cancel'), '$nickname' => $a->argv[1], |