From dc84da520d7bde3f2e160d2573a549829fd022cf Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 13 Mar 2012 15:40:16 -0700 Subject: [PATCH] invite potential connectees to the free social web --- boot.php | 2 +- mod/dfrn_request.php | 8 +++++++- view/auto_request.tpl | 7 +++++++ view/dfrn_request.tpl | 4 ++++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index ace358faa7..8f0e8345fc 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 bc159137df..1043d6daf6 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("Connect as an email follower \x28Coming soon\x29"); + + $invite_desc = t('If you are not yet a member of the free social web, follow this link to find a public Friendica site and join us today.'); $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 204fcf2475..2958397c92 100755 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -7,8 +7,15 @@ $page_desc
  • $friendica
  • $diaspora $diasnote
  • $statusnet
  • +
  • $emailnet
  • +

    +$invite_desc +

    +

    +$desc +

    diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index cd98a4daab..d8aa8b1818 100755 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -7,7 +7,11 @@ $page_desc
  • $friendica
  • $diaspora $diasnote
  • $statusnet
  • +
  • $emailnet
  • +$invite_desc +

    +

    $desc