Revert "merge"

This reverts commit c0cd147a3a9a86b270ea32026089ced16fb2f50c, reversing
changes made to d2d1e54bfe928fe4cdfdcfc7e9acf658cda76898.

1 files changed, 16 insertions, 31 deletions

diff --git a/mod/invite.php b/mod/invite.php
index cb8cd1f63..cb8d4c6eb 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -68,12 +68,9 @@ function invite_post(&$a) {
 		else
 			$nmessage = $message;
 
-		$account = $a->get_account();
-
-
 		$res = mail($recip, sprintf( t('Please join us on Red'), $a->config['sitename']), 
 			$nmessage, 
-			"From: " . $account['account_email'] . "\n"
+			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
 			. 'Content-transfer-encoding: 8bit' );
 
@@ -115,41 +112,29 @@ function invite_content(&$a) {
 		}
 	}			
 
-//	$dirloc = get_config('system','directory_submit_url');
-//	if(strlen($dirloc)) {
-//		if($a->config['system']['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.'), dirname($dirloc) . '/siteinfo');
-//		elseif($a->config['system']['register_policy'] != REGISTER_CLOSED)
-//			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->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.'),dirname($dirloc) . '/siteinfo');
-//	}
-//	else {
-//		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
-//		return $o;
-//	}
-
-	$ob = $a->get_observer();
-	if(! $ob)
+	$dirloc = get_config('system','directory_submit_url');
+	if(strlen($dirloc)) {
+		if($a->config['system']['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.'), dirname($dirloc) . '/siteinfo');
+		elseif($a->config['system']['register_policy'] != REGISTER_CLOSED)
+			$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->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.'),dirname($dirloc) . '/siteinfo');
+	}
+	else {
+		$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
 		return $o;
-
-	$channel = $a->get_channel();
+	}
 
 	$o = replace_macros($tpl, array(
 		'$form_security_token' => get_form_security_token("send_invite"),
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$msg_text' => t('Your message:'),
-		'$default_message' => t('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised social and information tool.') . "\r\n" . "\r\n"
+		'$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
-			. (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') 
-
-			. t('Please visit my channel at')
-			. "\r\n" . "\r\n"
-			. z_root() . "/channel/" . $channel['channel_address']
-			. "\r\n" . "\r\n"
-						. t('Once you have registered, please connect with my Red Matrix channel address:') 
-			. "\r\n" . "\r\n" . $ob['xchan_addr']
-			. "\r\n" . "\r\n" . t('For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.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" . $a->get_baseurl() . '/channel/' . $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"  ,
 		'$submit' => t('Submit')
 	));