X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Finvite.php;h=8b4346ca90b9ac8beaae1b4b8b464be75592fc91;hb=bf14709fe2ed18f5a2641f841cb000a4856290fd;hp=e230ec6eea7373f1ec0cbd712f5035c5aaaac48a;hpb=19614f33a4dc3758f5453cc91a4e3e8ae19d3878;p=quix0rs-gnu-social.git

diff --git a/actions/invite.php b/actions/invite.php
index e230ec6eea..8b4346ca90 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -20,11 +20,11 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class InviteAction extends Action {
-	
-	function is_readonly() {				
+
+	function is_readonly() {
 		return false;
 	}
-	
+
     function handle($args) {
         parent::handle($args);
 		if (!common_logged_in()) {
@@ -32,70 +32,79 @@ class InviteAction extends Action {
 										common_config('site', 'name')));
 			return;
 		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$this->send_invitation();
+			$this->send_invitations();
 		} else {
 			$this->show_form();
 		}
 	}
-	
-	function send_invitation() {
-		
+
+	function send_invitations() {
+
 		$user = common_current_user();
 		$profile = $user->getProfile();
-		
+
 		$bestname = $profile->getBestName();
 		$sitename = common_config('site', 'name');
 		$personal = $this->trimmed('personal');
 
 		$addresses = explode("\n", $this->trimmed('addresses'));
-		
+
 		foreach ($addresses as $email) {
-			
 			$email = trim($email);
-			
 			if (!Validate::email($email, true)) {
 				$this->show_form(sprintf(_('Invalid email address: %s'), $email));
 				return;
 			}
 		}
-		
+
+		$already = array();
+		$subbed = array();
+
 		foreach ($addresses as $email) {
-			
-			$email = trim($email);
-			
-			$recipients = array($email);
-			
-			$headers['From'] = mail_notify_from();
-			$headers['To'] = $email;
-			$headers['Subject'] = sprintf(_('%1s has invited you to join them on %2s'), $bestname, $sitename);
-
-			$body = sprintf(_("%1s has invited you to join them on %2s (%3s).\n\n".
-							  "%4s is a micro-blogging service that lets you keep up-to-date with people you know and people who interest you.\n\n".
-							  "You can also share news about yourself, your thoughts, or your life online with people who know about you.\n\n".
-							  "%5s said:\n\n%6s\n\n".
-							  "You can see %7s's profile page on %8s here:\n\n".
-							  "%9s\n\n".
-							  "If you'd like to try the service, click on the link below to accept the invitation.\n\n".
-							  "%10s\n\n".
-							  "If not, you can ignore this message. Thanks for your patience and your time.\n\n".
-							  "Sincerely, %11s\n"),
-							$bestname, $sitename, common_root_url(),
-							$sitename,
-							$bestname, $personal,
-							$bestname, $sitename,
-							common_local_url('showstream', array('nickname' => $user->nickname)),
-							common_local_url('register', array('code' => $invite->code)),
-							$sitename);
-			
-			mail_send($recipients, $headers, $body);
+			$email = common_canonical_email($email);
+			$other = User::staticGet('email', $email);
+			if ($other) {
+				if ($user->isSubscribed($other)) {
+					$already[] = $other;
+				} else {
+					subs_subscribe_to($user, $other);
+					$subbed[] = $other;
+				}
+			} else {
+				$sent[] = $email;
+				$this->send_invitation($email, $user, $personal);
+			}
 		}
-		
 
 		common_show_header(_('Invitation(s) sent'));
-		common_element('p', NULL, _('Invitation(s) sent. You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!'));
+		if ($already) {
+			common_element('p', NULL, _('You are already subscribed to these users:'));
+			common_element_start('ul');
+			foreach ($already as $other) {
+				common_element('li', NULL, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+			}
+			common_element_end('ul');
+		}
+		if ($subbed) {
+			common_element('p', NULL, _('These people are already users and you were automatically subscribed to them:'));
+			common_element_start('ul');
+			foreach ($subbed as $other) {
+				common_element('li', NULL, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+			}
+			common_element_end('ul');
+		}
+		if ($sent) {
+			common_element('p', NULL, _('Invitation(s) sent to the following people:'));
+			common_element_start('ul');
+			foreach ($sent as $other) {
+				common_element('li', NULL, $other);
+			}
+			common_element_end('ul');
+			common_element('p', NULL, _('You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!'));
+		}
 		common_show_footer();
 	}
-	
+
 	function show_top($error=NULL) {
 		if ($error) {
 			common_element('p', 'error', $error);
@@ -108,7 +117,7 @@ class InviteAction extends Action {
 	}
 
 	function show_form($error=NULL) {
-		
+
 		global $config;
 
 		common_show_header(_('Invite new users'), NULL, $error, array($this, 'show_top'));
@@ -120,15 +129,63 @@ class InviteAction extends Action {
 		common_textarea('addresses', _('Email addresses'),
 						$this->trimmed('addresses'),
 						_('Addresses of friends to invite (one per line)'));
-		
+
 		common_textarea('personal', _('Personal message'),
 						$this->trimmed('personal'),
 						_('Optionally add a personal message to the invitation.'));
-		
-		common_submit('preview', _('Preview'));
+
+		common_submit('send', _('Send'));
 
 		common_element_end('form');
-		
+
 		common_show_footer();
 	}
+
+	function send_invitation($email, $user, $personal) {
+
+		$profile = $user->getProfile();
+		$bestname = $profile->getBestName();
+
+		$sitename = common_config('site', 'name');
+
+		$invite = new Invitation();
+
+		$invite->address = $email;
+		$invite->address_type = 'email';
+		$invite->code = common_confirmation_code(128);
+		$invite->user_id = $user->id;
+		$invite->created = common_sql_now();
+
+		if (!$invite->insert()) {
+			common_log_db_error($invite, 'INSERT', __FILE__);
+			return false;
+		}
+
+		$recipients = array($email);
+
+		$headers['From'] = mail_notify_from();
+		$headers['To'] = $email;
+		$headers['Subject'] = sprintf(_('%1$s has invited you to join them on %2$s'), $bestname, $sitename);
+
+		$body = sprintf(_("%1\$s has invited you to join them on %2\$s (%3\$s).\n\n".
+						  "%2\$s is a micro-blogging service that lets you keep up-to-date with people you know and people who interest you.\n\n".
+						  "You can also share news about yourself, your thoughts, or your life online with people who know about you. ".
+						  "It's also great for meeting new people who share your interests.\n\n".
+						  "%1\$s said:\n\n%4\$s\n\n".
+						  "You can see %1\$s's profile page on %2\$s here:\n\n".
+						  "%5\$s\n\n".
+						  "If you'd like to try the service, click on the link below to accept the invitation.\n\n".
+						  "%6\$s\n\n".
+						  "If not, you can ignore this message. Thanks for your patience and your time.\n\n".
+						  "Sincerely, %2\$s\n"),
+						$bestname,
+						$sitename,
+						common_root_url(),
+						$personal,
+						common_local_url('showstream', array('nickname' => $user->nickname)),
+						common_local_url('register', array('code' => $invite->code)));
+
+		mail_send($recipients, $headers, $body);
+	}
+
 }