X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Finvite.php;h=81b58800248c84b5fd1b8508c0e5e227e7fb91c0;hb=74d813042fa96dd90955cc5c0da8cf4716485cb8;hp=12f8306e8aaaa7540a77f20f2aa348779d00de29;hpb=52f14ffa5f266e0e811b0e3e429734f0ec73a859;p=friendica.git

diff --git a/mod/invite.php b/mod/invite.php
index 12f8306e8a..81b5880024 100644
--- 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(&$a) {
+function invite_post(App $a) {
 
 	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -19,14 +22,15 @@ function invite_post(&$a) {
 	check_form_security_token_redirectOnErr('/', 'send_invite');
 
 	$max_invites = intval(get_config('system','max_invites'));
-	if(! $max_invites)
+	if (! $max_invites) {
 		$max_invites = 50;
+	}
 
 	$current_invites = intval(get_pconfig(local_user(),'system','sent_invites'));
-	if($current_invites > $max_invites) {
+	if ($current_invites > $max_invites) {
 		notice( t('Total invitation limit exceeded.') . EOL);
 		return;
-	};
+	}
 
 
 	$recips  = ((x($_POST,'recipients')) ? explode("\n",$_POST['recipients']) : array());
@@ -34,23 +38,24 @@ function invite_post(&$a) {
 
 	$total = 0;
 
-	if(get_config('system','invitation_only')) {
+	if (get_config('system','invitation_only')) {
 		$invonly = true;
 		$x = get_pconfig(local_user(),'system','invites_remaining');
-		if((! $x) && (! is_site_admin()))
+		if ((! $x) && (! is_site_admin())) {
 			return;
+		}
 	}
 
-	foreach($recips as $recip) {
+	foreach ($recips as $recip) {
 
 		$recip = trim($recip);
 
-		if(! valid_email($recip)) {
+		if (! valid_email($recip)) {
 			notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
 			continue;
 		}
-		
-		if($invonly && ($x || is_site_admin())) {
+
+		if ($invonly && ($x || is_site_admin())) {
 			$code = autoname(8) . srand(1000,9999);
 			$nmessage = str_replace('$invite_code',$code,$message);
 
@@ -59,24 +64,25 @@ function invite_post(&$a) {
 				dbesc(datetime_convert())
 			);
 
-			if(! is_site_admin()) {
+			if (! is_site_admin()) {
 				$x --;
-				if($x >= 0)
+				if ($x >= 0) {
 					set_pconfig(local_user(),'system','invites_remaining',$x);
-				else
+				} else {
 					return;
+				}
 			}
-		}
-		else
+		} else {
 			$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' );
 
-		if($res) {
+		if ($res) {
 			$total ++;
 			$current_invites ++;
 			set_pconfig(local_user(),'system','sent_invites',$current_invites);
@@ -84,8 +90,7 @@ function invite_post(&$a) {
 				notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
 				return;
 			}
-		}
-		else {
+		} else {
 			notice( sprintf( t('%s : Message delivery failed.'), $recip) . EOL);
 		}
 
@@ -95,7 +100,7 @@ function invite_post(&$a) {
 }
 
 
-function invite_content(&$a) {
+function invite_content(App $a) {
 
 	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -105,29 +110,32 @@ function invite_content(&$a) {
 	$tpl = get_markup_template('invite.tpl');
 	$invonly = false;
 
-	if(get_config('system','invitation_only')) {
+	if (get_config('system','invitation_only')) {
 		$invonly = true;
 		$x = get_pconfig(local_user(),'system','invites_remaining');
-		if((! $x) && (! is_site_admin())) {
+		if ((! $x) && (! is_site_admin())) {
 			notice( t('You have no more invitations available') . EOL);
 			return '';
 		}
 	}
 
 	$dirloc = get_config('system','directory');
-	if(strlen($dirloc)) {
+	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');
+		} 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');
 		}
-		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');
+	} 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(
 		'$form_security_token' => get_form_security_token("send_invite"),
@@ -136,9 +144,9 @@ function invite_content(&$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')
 	));