Merge branch '0.9.x' into finish-account-api

* 0.9.x: (26 commits)
  just sent a http 200 for the check-fancy from install.php
  Add a new event: CanUserChangeField
  shorten flag notification and include a class
  Added flag icon for UserFlag plugin
  Fixed notice option alignment in IE
  add a method to Theme class to list available themes
  Updated Realtime plugin to use the util's NoticeReply object
  Localisation updates from translatewiki.net (2009-11-08)
  Update pot again
  Rebuild pot file *without* --join-existing to get rid of the cruft. Not sure why "--join-existing" must be in. Only thing I can think of is manual additions, which I could not find.
  Revert "More precise field label"
  Remove more contractions
  Revert "* [Cc]an't -> [Cc]annot"
  Revert "More specifics on 'address'"
  * [Cc]an't -> [Cc]annot
  Revert "* check usage of 'people' in UI and change it to 'users' or something else in most places"
  add utilities for calculating local and installation theme root dirs
  Harmonise UI message "No such user."
  Restructure theme.php to define a class Theme
  entity_action responses look more inactive now
  ...

4 files changed, 89 insertions, 4 deletions

diff --git a/scripts/console.php b/scripts/console.php
index 41dd43f28..2a000d39b 100755
--- a/scripts/console.php
+++ b/scripts/console.php
@@ -60,9 +60,9 @@ function read_input_line($prompt)
 }
 
 /**
- * On Unix-like systems where PHP readline extension isn't present,
+ * On Unix-like systems where PHP readline extension is not present,
  * -cough- Mac OS X -cough- we can shell out to bash to do it for us.
- * This lets us at least handle things like arrow keys, but we don't
+ * This lets us at least handle things like arrow keys, but we do not
  * get any entry history. :(
  *
  * Shamelessly ripped from when I wrote the same code for MediaWiki. :)
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index b4e4d9f08..4ec4526ef 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -231,7 +231,7 @@ class MailerDaemon
         foreach ($parsed->parts as $part) {
             $this->extract_part($part,$msg,$attachments);
         }
-        //we don't want any attachments that are a result of this parsing
+        //we do not want any attachments that are a result of this parsing
         return $msg;
     }
 
diff --git a/scripts/userrole.php b/scripts/userrole.php
new file mode 100644
index 000000000..7b6a9b3fd
--- /dev/null
+++ b/scripts/userrole.php
@@ -0,0 +1,85 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+
+$shortoptions = 'i:n:r:d';
+$longoptions = array('id=', 'nickname=', 'role=', 'delete');
+
+$helptext = <<<END_OF_USERROLE_HELP
+userrole.php [options]
+modifies a role for the given user
+
+  -d --delete   delete the role
+  -i --id       ID of the user
+  -n --nickname nickname of the user
+  -r --role     role to add (or delete)
+
+END_OF_USERROLE_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+if (have_option('i', 'id')) {
+    $id = get_option_value('i', 'id');
+    $user = User::staticGet('id', $id);
+    if (empty($user)) {
+        print "Can't find user with ID $id\n";
+        exit(1);
+    }
+} else if (have_option('n', 'nickname')) {
+    $nickname = get_option_value('n', 'nickname');
+    $user = User::staticGet('nickname', $nickname);
+    if (empty($user)) {
+        print "Can't find user with nickname '$nickname'\n";
+        exit(1);
+    }
+} else {
+    print "You must provide either an ID or a nickname.\n";
+    exit(1);
+}
+
+$role = get_option_value('r', 'role');
+
+if (empty($role)) {
+    print "You must provide a role.\n";
+    exit(1);
+}
+
+if (have_option('d', 'delete')) {
+    print "Revoking role '$role' from user '$user->nickname' ($user->id)...";
+    try {
+        $user->revokeRole($role);
+        print "OK\n";
+    } catch (Exception $e) {
+        print "FAIL\n";
+        print $e->getMessage();
+        print "\n";
+    }
+} else {
+    print "Granting role '$role' to user '$user->nickname' ($user->id)...";
+    try {
+        $user->grantRole($role);
+        print "OK\n";
+    } catch (Exception $e) {
+        print "FAIL\n";
+        print $e->getMessage();
+        print "\n";
+    }
+}
diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index c7ed15e49..f5f824dee 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -69,7 +69,7 @@ class XmppConfirmHandler extends XmppQueueHandler
                     continue;
                 } else {
                     $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
-                    # Mark confirmation sent; need a dupe so we don't have the WHERE clause
+                    # Mark confirmation sent; need a dupe so we do not have the WHERE clause
                     $dupe = Confirm_address::staticGet('code', $confirm->code);
                     if (!$dupe) {
                         common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__);