Merge pull request #3743 from MrPetovan/task/update-languagedetect

[friendica.git] / mod / invite.php

diff --git a/mod/invite.php b/mod/invite.php
index a7739fc774bf9b4b3fd812921f068ff0e942876b..81b58800248c84b5fd1b8508c0e5e227e7fb91c0 100644 (file)
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -7,9 +7,12 @@
  *
  */
 
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once('include/email.php');
 
-function invite_post(App &$a) {
+function invite_post(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -73,8 +76,8 @@ function invite_post(App &$a) {
                        $nmessage = $message;
                }
 
-               $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'), 
-                       $nmessage, 
+               $res = mail($recip, email_header_encode( t('Please join us on Friendica'),'UTF-8'),
+                       $nmessage,
                        "From: " . $a->user['email'] . "\n"
                        . 'Content-type: text/plain; charset=UTF-8' . "\n"
                        . 'Content-transfer-encoding: 8bit' );
@@ -97,7 +100,7 @@ function invite_post(App &$a) {
 }
 
 
-function invite_content(App &$a) {
+function invite_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -119,14 +122,19 @@ function invite_content(App &$a) {
        $dirloc = get_config('system','directory');
        if (strlen($dirloc)) {
                if ($a->config['register_policy'] == REGISTER_CLOSED) {
-                       $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/siteinfo');
-               } elseif ($a->config['register_policy'] != REGISTER_CLOSED) {
-                       $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), App::get_baseurl())
-                       . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/siteinfo');
+                       $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/servers');
+               } else {
+                       $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), System::baseUrl())
+                       . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),$dirloc . '/servers');
+               }
+       } else { // there is no global directory URL defined
+               if ($a->config['register_policy'] == REGISTER_CLOSED) {
+                       $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
+                       return $o;
+               } else {
+                       $linktxt = sprintf( t('To accept this invitation, please visit and register at %s.'), System::baseUrl()
+                       . "\r\n" . "\r\n" . t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks.'));
                }
-       } else {
-               $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
-               return $o;
        }
 
        $o = replace_macros($tpl, array(
@@ -136,9 +144,9 @@ function invite_content(App &$a) {
                '$msg_text'            => t('Your message:'),
                '$default_message'     => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n"
                        . $linktxt
-                       . "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') 
-                       . "\r\n" . "\r\n" . App::get_baseurl() . '/profile/' . $a->user['nickname']
-                       . "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n"  ,
+                       . "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
+                       . "\r\n" . "\r\n" . System::baseUrl() . '/profile/' . $a->user['nickname']
+                       . "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendi.ca') . "\r\n" . "\r\n"  ,
                '$submit'              => t('Submit')
        ));