From 43110db749850e49d309ad8b3e72266bd373a2a8 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 17 Jul 2011 16:08:47 -0700
Subject: [PATCH] begin invites, fb setup changes

---
 addon/facebook/README        |  2 ++
 addon/facebook/facebook.php  |  3 +++
 boot.php                     |  2 +-
 doc/Installing-Connectors.md |  4 ++++
 include/zotfns.php           |  2 --
 mod/contacts.php             | 17 +++++++++++++--
 mod/invite.php               | 40 +++++++++++++++++++++++++++++++++---
 7 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/addon/facebook/README b/addon/facebook/README
index 42ec01383c..19c5948866 100644
--- a/addon/facebook/README
+++ b/addon/facebook/README
@@ -15,6 +15,8 @@ Installing the Friendika/Facebook connector
         $a->config['facebook']['appid'] = 'xxxxxxxxxxx';
         $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
      Replace with the settings Facebook gives you.
+  d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set Site URL 
+     to yoursubdomain.yourdomain.com.  Set Site Domain to your yourdomain.com.
 2. Enable the facebook plugin by including it in .htconfig.php - e.g. 
     $a->config['system']['addon'] = 'plugin1,plugin2,facebook';
 3. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index c54d5b5f09..73518afb2d 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -23,6 +23,9 @@
  *         $a->config['facebook']['appid'] = 'xxxxxxxxxxx';
  *         $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
  *      Replace with the settings Facebook gives you.
+ *   d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set 
+ *      Site URL to yoursubdomain.yourdomain.com. Set Site Domain to your 
+ *      yourdomain.com.
  * 2. Enable the facebook plugin by including it in .htconfig.php - e.g. 
  *     $a->config['system']['addon'] = 'plugin1,plugin2,facebook';
  * 3. Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
diff --git a/boot.php b/boot.php
index 6a622dbc0e..af510a808b 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1043' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1044' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1075      );
 
diff --git a/doc/Installing-Connectors.md b/doc/Installing-Connectors.md
index e43f17fe3c..c8fc8e7905 100644
--- a/doc/Installing-Connectors.md
+++ b/doc/Installing-Connectors.md
@@ -129,6 +129,10 @@ $a->config['facebook']['appsecret'] = 'xxxxxxxxxxxxxxx';
 
 Replace with the settings Facebook gives you.
 
+d. Navigate to Set Web->Site URL & Domain -> Website Settings.  Set Site URL
+to yoursubdomain.yourdomain.com.  Set Site Domain to your yourdomain.com.
+
+
 Visit the Facebook Settings section of the "Settings->Plugin Settings" page.
 and click 'Install Facebook Connector'.
 
diff --git a/include/zotfns.php b/include/zotfns.php
index a95a064cd1..1ec39aefca 100644
--- a/include/zotfns.php
+++ b/include/zotfns.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once('include/text.php');
-
 function zot_get($url,$args) {
 	$argstr = '';
 	foreach($args as $k => $v) {
diff --git a/mod/contacts.php b/mod/contacts.php
index 7a97b53d23..388bf08e63 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -3,13 +3,26 @@
 require_once('include/Contact.php');
 
 function contacts_init(&$a) {
+	if(! local_user())
+		return;
+
 	require_once('include/group.php');
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
 	$a->page['aside'] .= group_side();
 
-	if($a->config['register_policy'] != REGISTER_CLOSED)
-		$a->page['aside'] .= '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
+	$inv = '<div class="side-link" id="side-invite-link" ><a href="invite" >' . t("Invite Friends") . '</a></div>';
+
+	if(get_config('system','invitations_only')) {
+		$x = get_pconfig(local_user(),'system','invites_remaining');
+		if($x || is_site_admin()) {
+			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' 
+			. sprintf( tt('%d invitation available','%d invitations available',$x), $x) 
+			. '</div>' . $inv;
+		}
+	}
+	elseif($a->config['register_policy'] != REGISTER_CLOSED)
+		$a->page['aside'] .= $inv;
 
 
 	$a->page['aside'] .= '<div class="side-link" id="side-match-link"><a href="match" >' 
diff --git a/mod/invite.php b/mod/invite.php
index b52aa19f61..5a67454361 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -20,6 +20,13 @@ function invite_post(&$a) {
 
 	$total = 0;
 
+	if(get_config('system','invitations_only')) {
+		$invonly = true;
+		$x = get_pconfig(local_user(),'system','invites_remaining');
+		if((! $x) && (! is_site_admin()))
+			return;
+	}
+
 	foreach($recips as $recip) {
 
 		$recip = trim($recip);
@@ -28,9 +35,25 @@ function invite_post(&$a) {
 			notice(  sprintf( t('%s : Not a valid email address.'), $recip) . EOL);
 			continue;
 		}
+		
+		if($invonly && ($x || is_site_admin())) {
+			$code = autoname(8) . srand(1000,9999);
+			$nmessage = str_replace('$invite_code',$code,$message);
+			// store in db
+
+			if(! is_site_admin()) {
+				$x --;
+				if($x >= 0)
+					set_pconfig(local_user(),'system','invites_remaining,$x);
+				else
+					return;
+			}
+		}
+		else
+			$nmessage = $message;
 
 		$res = mail($recip, sprintf( t('Please join my network on %s'), $a->config['sitename']), 
-			$message, 
+			$nmessage, 
 			"From: " . $a->user['email'] . "\n"
 			. 'Content-type: text/plain; charset=UTF-8' . "\n"
 			. 'Content-transfer-encoding: 8bit' );
@@ -56,14 +79,25 @@ function invite_content(&$a) {
 	}
 
 	$tpl = get_markup_template('invite.tpl');
-	
+	$invonly = false;
+
+	if(get_config('system','invitations_only')) {
+		$invonly = true;
+		$x = get_pconfig(local_user(),'system','invites_remaining');
+		if((! $x) && (! is_site_admin())) {
+			notice( t('You have no more invitations available') . EOL);
+			return '';
+		}
+	}			
+
+
 	$o = replace_macros($tpl, array(
 		'$invite' => t('Send invitations'),
 		'$addr_text' => t('Enter email addresses, one per line:'),
 		'$msg_text' => t('Your message:'),
 		'$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
 			. t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
-			. "\r\n" . "\r\n" . t('Once you have registered, please connect with me via my profile page at:') 
+			. "\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() . '/profile/' . $a->user['nickname'] ,
 		'$submit' => t('Submit')
 	));