]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
authorEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 23:13:04 +0000 (18:13 -0500)
committerEvan Prodromou <evan@status.net>
Mon, 2 Nov 2009 23:13:04 +0000 (18:13 -0500)
Conflicts:
classes/User.php

README
classes/User.php
db/notice_source.sql
lib/profilelist.php
scripts/makegroupadmin.php [new file with mode: 0644]
scripts/registeruser.php [new file with mode: 0644]

diff --git a/README b/README
index 952c914fec371693ade5d84bd903b443863617bf..7ecd025ac5e8e91441ca87602b3042365e36ec52 100644 (file)
--- a/README
+++ b/README
@@ -151,6 +151,8 @@ released Aug 26 2009. Notable changes this version:
 - Check for site servername config'd.
 - Compatibility fix for empty status updates with Twitter API.
 - Option to show files privately (EXPERIMENTAL! Use with caution.)
+- a script to register a new user.
+- a script to make a user admin of a group.
 
 Prerequisites
 =============
index 530ece1ba4ee3762e1ad80470e7731e77e080d04..96a64ccb29448cc4b898bc41aa5a4114b8cdf2c8 100644 (file)
@@ -117,7 +117,6 @@ class User extends Memcached_DataObject
     function allowed_nickname($nickname)
     {
         // XXX: should already be validated for size, content, etc.
-
         $blacklist = common_config('nickname', 'blacklist');
 
         //all directory and file names should be blacklisted
index 2657763f440ba59b9ef45312ab97c81f084a66e2..5c5c939dd07d7f91eaba4402a2bba98f9122cee7 100644 (file)
@@ -7,6 +7,7 @@ VALUES
     ('anyio', 'Any.IO', 'http://any.io/', now()),
     ('betwittered','BeTwittered','http://www.32hours.com/betwitteredinfo/', now()),
     ('bti','bti','http://gregkh.github.com/bti/', now()),
+    ('choqok', 'Choqok', 'http://choqok.gnufolks.org/', now()),
     ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
     ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
     ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
@@ -43,6 +44,7 @@ VALUES
     ('rygh.no','rygh.no','http://rygh.no/', now()),
     ('ryghsms','ryghsms','http://sms.rygh.no/', now()),
     ('smob','SMOB','http://smob.sioc-project.org/', now()),
+    ('socialoomphBfD4pMqz31', 'SocialOomph', 'http://www.socialoomph.com/', now()),
     ('spaz','Spaz','http://funkatron.com/spaz', now()),
     ('tarpipe','tarpipe','http://tarpipe.com/', now()),
     ('tjunar','Tjunar','http://nederflash.nl/boek/titels/tjunar-air', now()),
index 5cc211e362156be6e9cebcbcf36d32206c135812..5f536e0f4d24cc94868fecabed3d4b289d2b65d4 100644 (file)
@@ -200,53 +200,37 @@ class ProfileListItem extends Widget
     function showFullName()
     {
         if (!empty($this->profile->fullname)) {
-            $this->out->elementStart('dl', 'entity_fn');
-            $this->out->element('dt', null, 'Full name');
-            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
     }
 
     function showLocation()
     {
         if (!empty($this->profile->location)) {
-            $this->out->elementStart('dl', 'entity_location');
-            $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'label');
+            $this->out->elementStart('span', 'location');
             $this->out->raw($this->highlight($this->profile->location));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('span');
         }
     }
 
     function showHomepage()
     {
         if (!empty($this->profile->homepage)) {
-            $this->out->elementStart('dl', 'entity_url');
-            $this->out->element('dt', null, _('URL'));
-            $this->out->elementStart('dd');
             $this->out->elementStart('a', array('href' => $this->profile->homepage,
                                                 'class' => 'url'));
             $this->out->raw($this->highlight($this->profile->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
         }
     }
 
     function showBio()
     {
         if (!empty($this->profile->bio)) {
-            $this->out->elementStart('dl', 'entity_note');
-            $this->out->element('dt', null, _('Note'));
-            $this->out->elementStart('dd', 'note');
+            $this->out->elementStart('p', 'note');
             $this->out->raw($this->highlight($this->profile->bio));
-            $this->out->elementEnd('dd');
-            $this->out->elementEnd('dl');
+            $this->out->elementEnd('p');
         }
     }
 
diff --git a/scripts/makegroupadmin.php b/scripts/makegroupadmin.php
new file mode 100644 (file)
index 0000000..a687984
--- /dev/null
@@ -0,0 +1,89 @@
+#!/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 = 'g:n:';
+$longoptions = array('nickname=', 'group=');
+
+$helptext = <<<END_OF_MAKEGROUPADMIN_HELP
+makegroupadmin.php [options]
+makes a user the admin of a group
+
+  -g --group    group to add an admin to
+  -n --nickname nickname of the new admin
+
+END_OF_MAKEGROUPADMIN_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$nickname = get_option_value('n', 'nickname');
+$groupname = get_option_value('g', 'group');
+
+if (empty($nickname) || empty($groupname)) {
+    print "Must provide a nickname and group.\n";
+    exit(1);
+}
+
+try {
+
+    $user = User::staticGet('nickname', $nickname);
+
+    if (empty($user)) {
+        throw new Exception("No user named '$nickname'.");
+    }
+
+    $group = User_group::staticGet('nickname', $groupname);
+
+    if (empty($group)) {
+        throw new Exception("No group named '$groupname'.");
+    }
+
+    $member = Group_member::pkeyGet(array('group_id' => $group->id,
+                                          'profile_id' => $user->id));
+
+    if (empty($member)) {
+        $member = new Group_member();
+
+        $member->group_id   = $group->id;
+        $member->profile_id = $user->id;
+        $member->created    = common_sql_now();
+
+        if (!$member->insert()) {
+            throw new Exception("Can't add '$nickname' to '$groupname'.");
+        }
+    }
+
+    if ($member->is_admin) {
+        throw new Exception("'$nickname' is already an admin of '$groupname'.");
+    }
+
+    $orig = clone($member);
+
+    $member->is_admin = 1;
+
+    if (!$member->update($orig)) {
+        throw new Exception("Can't make '$nickname' admin of '$groupname'.");
+    }
+
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+    exit(1);
+}
diff --git a/scripts/registeruser.php b/scripts/registeruser.php
new file mode 100644 (file)
index 0000000..5d9c886
--- /dev/null
@@ -0,0 +1,81 @@
+#!/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 = 'n:w:f:e:';
+$longoptions = array('nickname=', 'password=', 'fullname=', 'email=');
+
+$helptext = <<<END_OF_REGISTERUSER_HELP
+registeruser.php [options]
+registers a user in the database
+
+  -n --nickname nickname of the new user
+  -w --password password of the new user
+  -f --fullname full name of the new user (optional)
+  -e --email    email address of the new user (optional)
+
+END_OF_REGISTERUSER_HELP;
+
+require_once INSTALLDIR.'/scripts/commandline.inc';
+
+$nickname = get_option_value('n', 'nickname');
+$password = get_option_value('w', 'password');
+$fullname = get_option_value('f', 'fullname');
+
+$email = get_option_value('e', 'email');
+
+if (empty($nickname) || empty($password)) {
+    print "Must provide a username and password.\n";
+    exit(1);
+}
+
+try {
+
+    $user = User::staticGet('nickname', $nickname);
+
+    if (!empty($user)) {
+        throw new Exception("A user named '$nickname' already exists.");
+    }
+
+    $user = User::register(array('nickname' => $nickname,
+                                 'password' => $password,
+                                 'fullname' => $fullname));
+
+    if (empty($user)) {
+        throw new Exception("Can't register user '$nickname' with password '$password' and fullname '$fullname'.");
+    }
+
+    if (!empty($email)) {
+
+        $orig = clone($user);
+
+        $user->email = $email;
+
+        if (!$user->updateKeys($orig)) {
+            print "Failed!\n";
+            throw new Exception("Can't update email address.");
+        }
+    }
+
+} catch (Exception $e) {
+    print $e->getMessage() . "\n";
+    exit(1);
+}