summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-03-09 14:20:50 -0800
committerBrion Vibber <brion@pobox.com>2010-03-09 14:20:50 -0800
commit6ea7e1c06e70b4adb459555336402a284fbe3fda (patch)
tree3e3509b54b5954ddffd6636fa072bec082cf76b1
parent8bf1b54abd860fbfa8c036aac0c3d3a5faf2f489 (diff)
parent60e6172bc9e52f1e6b4941811e2d6fd6050c1c6b (diff)
Merge branch 'testing' into 0.9.x
-rw-r--r--install.php15
-rw-r--r--lib/channel.php19
-rwxr-xr-xscripts/command.php80
3 files changed, 113 insertions, 1 deletions
diff --git a/install.php b/install.php
index fbedbaf01..9a7e27fa2 100644
--- a/install.php
+++ b/install.php
@@ -589,7 +589,7 @@ function handlePost()
$sitename = $_POST['sitename'];
$fancy = !empty($_POST['fancy']);
- $adminNick = $_POST['admin_nickname'];
+ $adminNick = strtolower($_POST['admin_nickname']);
$adminPass = $_POST['admin_password'];
$adminPass2 = $_POST['admin_password2'];
$adminEmail = $_POST['admin_email'];
@@ -630,6 +630,19 @@ STR;
updateStatus("No initial StatusNet user nickname specified.", true);
$fail = true;
}
+ if ($adminNick && !preg_match('/^[0-9a-z]{1,64}$/', $adminNick)) {
+ updateStatus('The user nickname "' . htmlspecialchars($adminNick) .
+ '" is invalid; should be plain letters and numbers no longer than 64 characters.', true);
+ $fail = true;
+ }
+ // @fixme hardcoded list; should use User::allowed_nickname()
+ // if/when it's safe to have loaded the infrastructure here
+ $blacklist = array('main', 'admin', 'twitter', 'settings', 'rsd.xml', 'favorited', 'featured', 'favoritedrss', 'featuredrss', 'rss', 'getfile', 'api', 'groups', 'group', 'peopletag', 'tag', 'user', 'message', 'conversation', 'bookmarklet', 'notice', 'attachment', 'search', 'index.php', 'doc', 'opensearch', 'robots.txt', 'xd_receiver.html', 'facebook');
+ if (in_array($adminNick, $blacklist)) {
+ updateStatus('The user nickname "' . htmlspecialchars($adminNick) .
+ '" is reserved.', true);
+ $fail = true;
+ }
if (empty($adminPass)) {
updateStatus("No initial StatusNet user password specified.", true);
diff --git a/lib/channel.php b/lib/channel.php
index 3cd168786..689bca0be 100644
--- a/lib/channel.php
+++ b/lib/channel.php
@@ -47,6 +47,25 @@ class Channel
}
}
+class CLIChannel extends Channel
+{
+ function source()
+ {
+ return 'cli';
+ }
+
+ function output($user, $text)
+ {
+ $site = common_config('site', 'name');
+ print "[{$user->nickname}@{$site}] $text\n";
+ }
+
+ function error($user, $text)
+ {
+ $this->output($user, $text);
+ }
+}
+
class XMPPChannel extends Channel
{
diff --git a/scripts/command.php b/scripts/command.php
new file mode 100755
index 000000000..6041b02eb
--- /dev/null
+++ b/scripts/command.php
@@ -0,0 +1,80 @@
+#!/usr/bin/env php
+<?php
+/*
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, 2010 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:';
+$longoptions = array('id=', 'nickname=');
+
+$helptext = <<<END_OF_USERROLE_HELP
+command.php [options] [command line]
+Perform commands on behalf of a user, such as sub, unsub, join, drop
+
+ -i --id ID of the user
+ -n --nickname nickname of the user
+
+END_OF_USERROLE_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+
+
+function interpretCommand($user, $body)
+{
+ $inter = new CommandInterpreter();
+ $chan = new CLIChannel();
+ $cmd = $inter->handle_command($user, $body);
+ if ($cmd) {
+ $cmd->execute($chan);
+ return true;
+ } else {
+ $chan->error($user, "Not a valid command. Try 'help'?");
+ return false;
+ }
+}
+
+
+
+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\n";
+ print $helptext;
+ exit(1);
+}
+
+// @todo refactor the interactive console in console.php and use
+// that to optionally make an interactive test console here too.
+// Would be good to help people test commands when XMPP or email
+// isn't available locally.
+interpretCommand($user, implode(' ', $args));
+