summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-04 11:19:02 -0800
committerZach Copley <zach@status.net>2010-03-04 11:19:02 -0800
commit980d1a66ec0bb5b42ddb39e253fba9bad1b41aca (patch)
tree5f34622397d3da731e233edaffcf69d75f58f0c5
parentfc3b53853f177e98c10f44c14a3125221ce3e83c (diff)
parentbe4b482f13615fb603736cb1e906efb4a9e06fd0 (diff)
Merge branch 'testing' of gitorious.org:statusnet/mainline into testinglist0.9.0
* 'testing' of gitorious.org:statusnet/mainline: Updated note on geo location and added a note on user roles Set up subscription to update@status.net for admin user on new installation, if OStatus is set up and working. (Will fail gracefully on a behind-the-firewall site.)
-rw-r--r--README7
-rw-r--r--install.php13
2 files changed, 18 insertions, 2 deletions
diff --git a/README b/README
index 9b6e957dd..daa393cbe 100644
--- a/README
+++ b/README
@@ -86,8 +86,9 @@ Notable changes this version:
- Support for the new distributed status update standard OStatus
<http://ostatus.org>, based on PubSubHubbub, Salmon, Webfinger,
and Activity Streams.
-- Support for location. Notices are (optionally) marked with lat-long
- information, and can be shown on a map.
+- Support for location using the Geolocation API. Notices are (optionally)
+ marked with lat-long information with geo microformats, and can be shown
+ on a map.
- No fixed content size. Notice size is configurable, from 1 to
unlimited number of characters. Default is still 140!
- An authorization framework, allowing different levels of users.
@@ -97,6 +98,8 @@ Notable changes this version:
- A flag system that lets users flag profiles for moderator review.
- Support for OAuth <http://oauth.net> authentication in the Twitter
API.
+- User roles system that lets the owner of the site to assign
+ administrator and moderator roles to other users.
- A pluggable authentication system.
- An authentication plugin for LDAP servers.
- Many features that were core in 0.8.x are now plugins, such
diff --git a/install.php b/install.php
index bb53e2b55..8c9b6138b 100644
--- a/install.php
+++ b/install.php
@@ -865,6 +865,19 @@ function registerInitialUser($nickname, $password, $email)
$user->grantRole('owner');
$user->grantRole('moderator');
$user->grantRole('administrator');
+
+ // Attempt to do a remote subscribe to update@status.net
+ // Will fail if instance is on a private network.
+
+ if (class_exists('Ostatus_profile')) {
+ try {
+ $oprofile = Ostatus_profile::ensureProfile('http://update.status.net/');
+ Subscription::start($user->getProfile(), $oprofile->localProfile());
+ updateStatus("Set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
+ } catch (Exception $e) {
+ updateStatus("Could not set up subscription to <a href='http://update.status.net/'>update@status.net</a>.");
+ }
+ }
return true;
}