GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

Browse Source 
* '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.)
This commit is contained in:
Zach Copley 2010-03-04 11:19:02 -08:00
commit 980d1a66ec
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README
View File

@ -86,8 +86,9 @@ Notable changes this version:
- Support for the new distributed status update standard OStatus - Support for the new distributed status update standard OStatus
<http://ostatus.org>, based on PubSubHubbub, Salmon, Webfinger, <http://ostatus.org>, based on PubSubHubbub, Salmon, Webfinger,
and Activity Streams. and Activity Streams.
- Support for location. Notices are (optionally) marked with lat-long - Support for location using the Geolocation API. Notices are (optionally)
information, and can be shown on a map. 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 - No fixed content size. Notice size is configurable, from 1 to
unlimited number of characters. Default is still 140! unlimited number of characters. Default is still 140!
- An authorization framework, allowing different levels of users. - 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. - A flag system that lets users flag profiles for moderator review.
- Support for OAuth <http://oauth.net> authentication in the Twitter - Support for OAuth <http://oauth.net> authentication in the Twitter
API. API.
- User roles system that lets the owner of the site to assign
administrator and moderator roles to other users.
- A pluggable authentication system. - A pluggable authentication system.
- An authentication plugin for LDAP servers. - An authentication plugin for LDAP servers.
- Many features that were core in 0.8.x are now plugins, such - Many features that were core in 0.8.x are now plugins, such

13
install.php
View File

@ -866,6 +866,19 @@ function registerInitialUser($nickname, $password, $email)
$user->grantRole('moderator'); $user->grantRole('moderator');
$user->grantRole('administrator'); $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; return true;
} }