aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php2
-rwxr-xr-xmod/dfrn_request.php8
-rwxr-xr-xview/auto_request.tpl7
-rwxr-xr-xview/dfrn_request.tpl4
4 files changed, 19 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 93c667dc9..749ef6e3f 100755
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1279' );
+define ( 'FRIENDICA_VERSION', '2.3.1280' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1131 );
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 452fec166..4acb5c9bb 100755
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -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],
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index 204fcf247..2958397c9 100755
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -7,8 +7,15 @@ $page_desc<br />
<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
+<li>$emailnet</li>
</ul>
</p>
+<p>
+$invite_desc
+</p>
+<p>
+$desc
+</p>
<form action="dfrn_request/$nickname" method="post" />
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index cd98a4daa..d8aa8b181 100755
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -7,7 +7,11 @@ $page_desc<br />
<li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
+<li>$emailnet</li>
</ul>
+$invite_desc
+</p>
+<p>
$desc
</p>