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, 171 insertions, 169 deletions

diff --git a/classes/CommandInterpreter.php b/classes/CommandInterpreter.php
index eae315cb6..0679f5462 100644
--- a/classes/CommandInterpreter.php
+++ b/classes/CommandInterpreter.php
@@ -21,176 +21,178 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/classes/Command.php');
 
-class CommandInterpreter {
-	
-	function handle_command($user, $text) {
-		# XXX: localise
+class CommandInterpreter
+{
 
-		$text = preg_replace('/\s+/', ' ', trim($text));
-		list($cmd, $arg) = explode(' ', $text, 2);
+    function handle_command($user, $text)
+    {
+        # XXX: localise
 
-		# We try to support all the same commands as Twitter, see
-		# http://getsatisfaction.com/twitter/topics/what_are_the_twitter_commands
-		# There are a few compatibility commands from earlier versions of 
-		# Laconica
-		
-		switch(strtolower($cmd)) {
-		 case 'help':
-			if ($arg) {
-				return NULL;
-			}
-			return new HelpCommand($user);
-		 case 'on':
-			if ($arg) {
-				list($other, $extra) = explode(' ', $arg, 2);
-				if ($extra) {
-					return NULL;
-				} else {
-					return new OnCommand($user, $other);
-				}
-			} else {
-				return new OnCommand($user);
-			}
-		 case 'off':
-			if ($arg) {
-				list($other, $extra) = explode(' ', $arg, 2);
-				if ($extra) {
-					return NULL;
-				} else {
-					return new OffCommand($user, $other);
-				}
-			} else {
-				return new OffCommand($user);
-			}
-		 case 'stop':
-		 case 'quit':
-			if ($arg) {
-				return NULL;
-			} else {
-				return new OffCommand($user);
-			}
-		 case 'follow':
-		 case 'sub':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else {
-				return new SubCommand($user, $other);
-			}
-		 case 'leave':
-		 case 'unsub':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else {
-				return new UnsubCommand($user, $other);
-			}
-		 case 'get':
-		 case 'last':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else {
-				return new GetCommand($user, $other);
-			}
-		 case 'd':
-		 case 'dm':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if (!$extra) {
-				return NULL;
-			} else {
-				return new MessageCommand($user, $other, $extra);
-			}
-		 case 'whois':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else {
-				return new WhoisCommand($user, $other);
-			}
-		 case 'fav':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else {
-				return new FavCommand($user, $other);
-			}
-		 case 'nudge':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else {
-				return new NudgeCommand($user, $other);
-			}
-		 case 'stats':
-			if ($arg) {
-				return NULL;
-			}
-			return new StatsCommand($user);
-		 case 'invite':
-			if (!$arg) {
-				return NULL;
-			}
-			list($other, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else {
-				return new InviteCommand($user, $other);
-			}
-		 case 'track':
-			if (!$arg) {
-				return NULL;
-			}
-			list($word, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else if ($word == 'off') {
-				return new TrackOffCommand($user);
-			} else {
-				return new TrackCommand($user, $word);
-			}
-		 case 'untrack':
-			if (!$arg) {
-				return NULL;
-			}
-			list($word, $extra) = explode(' ', $arg, 2);
-			if ($extra) {
-				return NULL;
-			} else if ($word == 'all') {
-				return new TrackOffCommand($user);
-			} else {
-				return new UntrackCommand($user, $word);
-			}
-		 case 'tracks':
-		 case 'tracking':
-			if ($arg) {
-				return NULL;
-			}
-			return new TrackingCommand($user);
-		 default:
-			return false;
-		}
-	}
+        $text = preg_replace('/\s+/', ' ', trim($text));
+        list($cmd, $arg) = explode(' ', $text, 2);
+
+        # We try to support all the same commands as Twitter, see
+        # http://getsatisfaction.com/twitter/topics/what_are_the_twitter_commands
+        # There are a few compatibility commands from earlier versions of
+        # Laconica
+
+        switch(strtolower($cmd)) {
+         case 'help':
+            if ($arg) {
+                return null;
+            }
+            return new HelpCommand($user);
+         case 'on':
+            if ($arg) {
+                list($other, $extra) = explode(' ', $arg, 2);
+                if ($extra) {
+                    return null;
+                } else {
+                    return new OnCommand($user, $other);
+                }
+            } else {
+                return new OnCommand($user);
+            }
+         case 'off':
+            if ($arg) {
+                list($other, $extra) = explode(' ', $arg, 2);
+                if ($extra) {
+                    return null;
+                } else {
+                    return new OffCommand($user, $other);
+                }
+            } else {
+                return new OffCommand($user);
+            }
+         case 'stop':
+         case 'quit':
+            if ($arg) {
+                return null;
+            } else {
+                return new OffCommand($user);
+            }
+         case 'follow':
+         case 'sub':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else {
+                return new SubCommand($user, $other);
+            }
+         case 'leave':
+         case 'unsub':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else {
+                return new UnsubCommand($user, $other);
+            }
+         case 'get':
+         case 'last':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else {
+                return new GetCommand($user, $other);
+            }
+         case 'd':
+         case 'dm':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if (!$extra) {
+                return null;
+            } else {
+                return new MessageCommand($user, $other, $extra);
+            }
+         case 'whois':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else {
+                return new WhoisCommand($user, $other);
+            }
+         case 'fav':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else {
+                return new FavCommand($user, $other);
+            }
+         case 'nudge':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else {
+                return new NudgeCommand($user, $other);
+            }
+         case 'stats':
+            if ($arg) {
+                return null;
+            }
+            return new StatsCommand($user);
+         case 'invite':
+            if (!$arg) {
+                return null;
+            }
+            list($other, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else {
+                return new InviteCommand($user, $other);
+            }
+         case 'track':
+            if (!$arg) {
+                return null;
+            }
+            list($word, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else if ($word == 'off') {
+                return new TrackOffCommand($user);
+            } else {
+                return new TrackCommand($user, $word);
+            }
+         case 'untrack':
+            if (!$arg) {
+                return null;
+            }
+            list($word, $extra) = explode(' ', $arg, 2);
+            if ($extra) {
+                return null;
+            } else if ($word == 'all') {
+                return new TrackOffCommand($user);
+            } else {
+                return new UntrackCommand($user, $word);
+            }
+         case 'tracks':
+         case 'tracking':
+            if ($arg) {
+                return null;
+            }
+            return new TrackingCommand($user);
+         default:
+            return false;
+        }
+    }
 }