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, 92 insertions, 50 deletions

diff --git a/actions/nudge.php b/actions/nudge.php
index 677f58800..ca6fd3761 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -1,5 +1,17 @@
 <?php
-/*
+
+/**
+ * User by ID action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,68 +29,98 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/mail.php');
-
-class NudgeAction extends Action {
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-	function handle($args) {
-		parent::handle($args);
+require_once INSTALLDIR.'/lib/mail.php';
 
-		if (!common_logged_in()) {
-			$this->client_error(_('Not logged in.'));
-			return;
-		}
+/**
+ * Nudge a user action class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
+class NudgeAction extends Action
+{
+     /**
+     * Class handler.
+     * 
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
+    function handle($args)
+    {
+        parent::handle($args);
 
-		$user = common_current_user();
-		$other = User::staticGet('nickname', $this->arg('nickname'));
+        if (!common_logged_in()) {
+            $this->clientError(_('Not logged in.'));
+            return;
+        }
 
-		if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-			common_redirect(common_local_url('showstream', array('nickname' => $other->nickname)));
-			return;
-		}
+        $user  = common_current_user();
+        $other = User::staticGet('nickname', $this->arg('nickname'));
 
-		# CSRF protection
+        if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+            common_redirect(common_local_url('showstream',
+                array('nickname' => $other->nickname)));
+            return;
+        }
 
-		$token = $this->trimmed('token');
-		
-		if (!$token || $token != common_session_token()) {
-			$this->client_error(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
+        // CSRF protection
+        $token = $this->trimmed('token');
+        
+        if (!$token || $token != common_session_token()) {
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
+            return;
+        }
 
         if (!$other->email || !$other->emailnotifynudge) {
-            $this->client_error(_('This user doesn\'t allow nudges or hasn\'t confirmed or set his email yet.'));
+            $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set his email yet.'));
             return;
         }
 
-		$this->notify($user, $other);
+        $this->notify($user, $other);
 
-		if ($this->boolean('ajax')) {
-			common_start_html('text/xml;charset=utf-8', true);
-			common_element_start('head');
-			common_element('title', null, _('Nudge sent'));
-			common_element_end('head');
-			common_element_start('body');
-			common_nudge_response();
-			common_element_end('body');
-			common_element_end('html');
-		} else {
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8', true);
+            $this->elementStart('head');
+            $this->element('title', null, _('Nudge sent'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
             // display a confirmation to the user
-			common_redirect(common_local_url('showstream',
-											 array('nickname' => $other->nickname)));
-		}
-	}
+            common_redirect(common_local_url('showstream',
+                                             array('nickname' => $other->nickname)));
+        }
+    }
 
-	function notify($user, $other) {
-		if ($other->id != $user->id) {
-			if ($other->email && $other->emailnotifynudge) {
-				mail_notify_nudge($user, $other);
-			}
-			# XXX: notify by IM
-			# XXX: notify by SMS
-		}
-	}
+     /**
+     * Do the actual notification
+     *
+     * @param class $user  nudger
+     * @param class $other nudgee
+     *
+     * @return nothing
+     */
+    function notify($user, $other)
+    {
+        if ($other->id != $user->id) {
+            if ($other->email && $other->emailnotifynudge) {
+                mail_notify_nudge($user, $other);
+            }
+            // XXX: notify by IM
+            // XXX: notify by SMS
+        }
+    }
 }