Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 216 insertions, 176 deletions

diff --git a/actions/invite.php b/actions/invite.php
index c7d92085c..f4ad2f7c5 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -19,181 +19,221 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class InviteAction extends Action {
-
-	function is_readonly() {
-		return false;
-	}
-
-    function handle($args) {
+class InviteAction extends Action
+{
+    var $mode = null;
+    var $error = null;
+    var $already = null;
+    var $subbed = null;
+    var $sent = null;
+
+    function isReadOnly()
+    {
+        return false;
+    }
+
+    function handle($args)
+    {
         parent::handle($args);
-		if (!common_logged_in()) {
-			$this->client_error(sprintf(_('You must be logged in to invite other users to use %s'),
-										common_config('site', 'name')));
-			return;
-		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$this->send_invitations();
-		} else {
-			$this->show_form();
-		}
-	}
-
-	function send_invitations() {
-
-		# CSRF protection
-		$token = $this->trimmed('token');
-		if (!$token || $token != common_session_token()) {
-			$this->show_form(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
-
-		$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 = 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'));
-		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);
-		} else {
-			common_element_start('div', 'instructions');
-			common_element('p', NULL,
-						   _('Use this form to invite your friends and colleagues to use this service.'));
-			common_element_end('div');
-		}
-	}
-
-	function show_form($error=NULL) {
-
-		global $config;
-
-		common_show_header(_('Invite new users'), NULL, $error, array($this, 'show_top'));
-
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'invite',
-										   'action' => common_local_url('invite')));
-		common_hidden('token', common_session_token());
-
-		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('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);
-	}
-
+        if (!common_logged_in()) {
+            $this->clientError(sprintf(_('You must be logged in to invite other users to use %s'),
+                                        common_config('site', 'name')));
+            return;
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->sendInvitations();
+        } else {
+            $this->showForm();
+        }
+    }
+
+    function sendInvitations()
+    {
+        # CSRF protection
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->showForm(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
+
+        $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->showForm(sprintf(_('Invalid email address: %s'), $email));
+                return;
+            }
+        }
+
+        $this->already = array();
+        $this->subbed = array();
+
+        foreach ($addresses as $email) {
+            $email = common_canonical_email($email);
+            $other = User::staticGet('email', $email);
+            if ($other) {
+                if ($user->isSubscribed($other)) {
+                    $this->already[] = $other;
+                } else {
+                    subs_subscribe_to($user, $other);
+                    $this->subbed[] = $other;
+                }
+            } else {
+                $this->sent[] = $email;
+                $this->sendInvitation($email, $user, $personal);
+            }
+        }
+
+        $this->mode = 'sent';
+
+        $this->showPage();
+    }
+
+    function title()
+    {
+        if ($this->mode == 'sent') {
+            return _('Invitation(s) sent');
+        } else {
+            return _('Invite new users');
+        }
+    }
+
+    function showContent()
+    {
+        if ($this->mode == 'sent') {
+            $this->showInvitationSuccess();
+        } else {
+            $this->showInviteForm();
+        }
+    }
+
+    function showInvitationSuccess()
+    {
+        if ($this->already) {
+            $this->element('p', null, _('You are already subscribed to these users:'));
+            $this->elementStart('ul');
+            foreach ($this->already as $other) {
+                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+            }
+            $this->elementEnd('ul');
+        }
+        if ($this->subbed) {
+            $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
+            $this->elementStart('ul');
+            foreach ($this->subbed as $other) {
+                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+            }
+            $this->elementEnd('ul');
+        }
+        if ($this->sent) {
+            $this->element('p', null, _('Invitation(s) sent to the following people:'));
+            $this->elementStart('ul');
+            foreach ($this->sent as $other) {
+                $this->element('li', null, $other);
+            }
+            $this->elementEnd('ul');
+            $this->element('p', null, _('You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!'));
+        }
+    }
+
+    function showPageNotice()
+    {
+        if ($this->mode != 'sent') {
+            if ($this->error) {
+                $this->element('p', 'error', $this->error);
+            } else {
+                $this->elementStart('div', 'instructions');
+                $this->element('p', null,
+                               _('Use this form to invite your friends and colleagues to use this service.'));
+                $this->elementEnd('div');
+            }
+        }
+    }
+
+    function showForm($error=null)
+    {
+        $this->mode = 'form';
+        $this->error = $error;
+        $this->showPage();
+    }
+
+    function showInviteForm()
+    {
+        $this->elementStart('form', array('method' => 'post',
+                                           'id' => 'invite',
+                                           'action' => common_local_url('invite')));
+        $this->hidden('token', common_session_token());
+
+        $this->textarea('addresses', _('Email addresses'),
+                        $this->trimmed('addresses'),
+                        _('Addresses of friends to invite (one per line)'));
+
+        $this->textarea('personal', _('Personal message'),
+                        $this->trimmed('personal'),
+                        _('Optionally add a personal message to the invitation.'));
+
+        $this->submit('send', _('Send'));
+
+        $this->elementEnd('form');
+    }
+
+    function sendInvitation($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);
+    }
+
+    function showLocalNav()
+    {
+        $nav = new SubGroupNav($this, common_current_user());
+        $nav->show();
+    }
 }