From 7034d6efbd988e7481ac6f5d6413a8925221ed6b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 2 Aug 2017 08:47:09 +0200 Subject: [PATCH 1/4] use /servers instead of /siteinfo for the directory link in invitations --- mod/invite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/invite.php b/mod/invite.php index 67cd23de74..f4061c2c33 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -121,7 +121,7 @@ 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'); + $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'); } 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'); From 6cf951c930c873beff8b976a7a16bd0633d65e86 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 2 Aug 2017 08:48:01 +0200 Subject: [PATCH 2/4] use /servers instead of /siteinfo for the directory link in invitations --- mod/invite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/invite.php b/mod/invite.php index f4061c2c33..2debd8e3e9 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -124,7 +124,7 @@ function invite_content(App $a) { $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'); } 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'); + . "\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 { $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); From 0c8c69371c4f59421d52b345415e60b808494bd7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 3 Aug 2017 07:22:29 +0200 Subject: [PATCH 3/4] no global directory URL defined? --- mod/invite.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mod/invite.php b/mod/invite.php index 2debd8e3e9..a3c4de2270 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -126,9 +126,14 @@ function invite_content(App $a) { $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 . '/servers'); } - } else { - $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); - return $o; + } 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.'), App::get_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.'); + } } $o = replace_macros($tpl, array( From ee6956a91aa10e326949410d6a2284d6505bcbc6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 3 Aug 2017 07:23:05 +0200 Subject: [PATCH 4/4] else is sufficient here --- mod/invite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/invite.php b/mod/invite.php index a3c4de2270..f2fae5294a 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -122,7 +122,7 @@ function invite_content(App $a) { 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 . '/servers'); - } elseif ($a->config['register_policy'] != REGISTER_CLOSED) { + } else { $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 . '/servers'); }