We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 8a65c517 authored by Robin Millette's avatar Robin Millette

Merge branch 'master' of /var/www/trunk

parents 4a4efc3b 1132e66f
......@@ -23,6 +23,9 @@ require_once(INSTALLDIR.'/lib/openid.php');
class FinishopenidloginAction extends Action
{
var $error = null;
var $username = null;
var $message = null;
function handle($args)
{
......@@ -32,32 +35,32 @@ class FinishopenidloginAction extends Action
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.'));
$this->showForm(_('There was a problem with your session token. Try again, please.'));
return;
}
if ($this->arg('create')) {
if (!$this->boolean('license')) {
$this->show_form(_('You can\'t register if you don\'t agree to the license.'),
$this->trimmed('newname'));
$this->showForm(_('You can\'t register if you don\'t agree to the license.'),
$this->trimmed('newname'));
return;
}
$this->create_new_user();
$this->createNewUser();
} else if ($this->arg('connect')) {
$this->connect_user();
$this->connectUser();
} else {
common_debug(print_r($this->args, true), __FILE__);
$this->show_form(_('Something weird happened.'),
$this->trimmed('newname'));
$this->showForm(_('Something weird happened.'),
$this->trimmed('newname'));
}
} else {
$this->try_login();
$this->tryLogin();
}
}
function show_top($error=null)
function showPageNotice()
{
if ($error) {
$this->element('div', array('class' => 'error'), $error);
if ($this->error) {
$this->element('div', array('class' => 'error'), $this->error);
} else {
global $config;
$this->element('div', 'instructions',
......@@ -65,21 +68,36 @@ class FinishopenidloginAction extends Action
}
}
function show_form($error=null, $username=null)
function title()
{
common_show_header(_('OpenID Account Setup'), null, $error,
array($this, 'show_top'));
return _('OpenID Account Setup');
}
function showForm($error=null, $username=null)
{
$this->error = $error;
$this->username = $username;
$this->showPage();
}
function showContent()
{
if ($this->message_text) {
$this->element('p', null, $this->message);
return;
}
$this->elementStart('form', array('method' => 'post',
'id' => 'account_connect',
'action' => common_local_url('finishopenidlogin')));
'id' => 'account_connect',
'action' => common_local_url('finishopenidlogin')));
$this->hidden('token', common_session_token());
$this->element('h2', null,
_('Create new account'));
$this->element('p', null,
_('Create a new user with this nickname.'));
$this->input('newname', _('New nickname'),
($username) ? $username : '',
($this->username) ? $this->username : '',
_('1-64 lowercase letters or numbers, no punctuation or spaces'));
$this->elementStart('p');
$this->element('input', array('type' => 'checkbox',
......@@ -87,7 +105,7 @@ class FinishopenidloginAction extends Action
'name' => 'license',
'value' => 'true'));
$this->text(_('My text and files are available under '));
$this->element('a', array(href => common_config('license', 'url')),
$this->element('a', array('href' => common_config('license', 'url')),
common_config('license', 'title'));
$this->text(_(' except this private data: password, email address, IM address, phone number.'));
$this->elementEnd('p');
......@@ -100,12 +118,10 @@ class FinishopenidloginAction extends Action
$this->password('password', _('Password'));
$this->submit('connect', _('Connect'));
$this->elementEnd('form');
common_show_footer();
}
function try_login()
function tryLogin()
{
$consumer = oid_consumer();
$response = $consumer->complete(common_local_url('finishopenidlogin'));
......@@ -143,22 +159,21 @@ class FinishopenidloginAction extends Action
common_rememberme($user);
}
unset($_SESSION['openid_rememberme']);
$this->go_home($user->nickname);
$this->goHome($user->nickname);
} else {
$this->save_values($display, $canonical, $sreg);
$this->show_form(null, $this->best_new_nickname($display, $sreg));
$this->saveValues($display, $canonical, $sreg);
$this->showForm(null, $this->bestNewNickname($display, $sreg));
}
}
}
function message($msg)
{
common_show_header(_('OpenID Login'));
$this->element('p', null, $msg);
common_show_footer();
$this->message_text = $msg;
$this->showPage();
}
function save_values($display, $canonical, $sreg)
function saveValues($display, $canonical, $sreg)
{
common_ensure_session();
$_SESSION['openid_display'] = $display;
......@@ -166,16 +181,15 @@ class FinishopenidloginAction extends Action
$_SESSION['openid_sreg'] = $sreg;
}
function get_saved_values()
function getSavedValues()
{
return array($_SESSION['openid_display'],
$_SESSION['openid_canonical'],
$_SESSION['openid_sreg']);
}
function create_new_user()
function createNewUser()
{
# FIXME: save invite code before redirect, and check here
if (common_config('site', 'closed') || common_config('site', 'inviteonly')) {
......@@ -188,21 +202,21 @@ class FinishopenidloginAction extends Action
if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
$this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
$this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
return;
}
if (!User::allowed_nickname($nickname)) {
$this->show_form(_('Nickname not allowed.'));
$this->showForm(_('Nickname not allowed.'));
return;
}
if (User::staticGet('nickname', $nickname)) {
$this->show_form(_('Nickname already in use. Try another one.'));
$this->showForm(_('Nickname already in use. Try another one.'));
return;
}
list($display, $canonical, $sreg) = $this->get_saved_values();
list($display, $canonical, $sreg) = $this->getSavedValues();
if (!$display || !$canonical) {
$this->serverError(_('Stored OpenID not found.'));
......@@ -256,14 +270,13 @@ class FinishopenidloginAction extends Action
common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)));
}
function connect_user()
function connectUser()
{
$nickname = $this->trimmed('nickname');
$password = $this->trimmed('password');
if (!common_check_user($nickname, $password)) {
$this->show_form(_('Invalid username or password.'));
$this->showForm(_('Invalid username or password.'));
return;
}
......@@ -271,7 +284,7 @@ class FinishopenidloginAction extends Action
$user = User::staticGet('nickname', $nickname);
list($display, $canonical, $sreg) = $this->get_saved_values();
list($display, $canonical, $sreg) = $this->getSavedValues();
if (!$display || !$canonical) {
$this->serverError(_('Stored OpenID not found.'));
......@@ -293,10 +306,10 @@ class FinishopenidloginAction extends Action
common_rememberme($user);
}
unset($_SESSION['openid_rememberme']);
$this->go_home($user->nickname);
$this->goHome($user->nickname);
}
function go_home($nickname)
function goHome($nickname)
{
$url = common_get_returnto();
if ($url) {
......@@ -310,14 +323,14 @@ class FinishopenidloginAction extends Action
common_redirect($url);
}
function best_new_nickname($display, $sreg)
function bestNewNickname($display, $sreg)
{
# Try the passed-in nickname
if ($sreg['nickname']) {
$nickname = $this->nicknamize($sreg['nickname']);
if ($this->is_new_nickname($nickname)) {
if ($this->isNewNickname($nickname)) {
return $nickname;
}
}
......@@ -326,16 +339,16 @@ class FinishopenidloginAction extends Action
if ($sreg['fullname']) {
$fullname = $this->nicknamize($sreg['fullname']);
if ($this->is_new_nickname($fullname)) {
if ($this->isNewNickname($fullname)) {
return $fullname;
}
}
# Try the URL
$from_url = $this->openid_to_nickname($display);
$from_url = $this->openidToNickname($display);
if ($from_url && $this->is_new_nickname($from_url)) {
if ($from_url && $this->isNewNickname($from_url)) {
return $from_url;
}
......@@ -344,14 +357,14 @@ class FinishopenidloginAction extends Action
return null;
}
function is_new_nickname($str)
function isNewNickname($str)
{
if (!Validate::string($str, array('min_length' => 1,
'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
return false;
}
if (!User::allowed_nickname($str)) {
if (!User::allowed_nickname($str)) {
return false;
}
if (User::staticGet('nickname', $str)) {
......@@ -360,12 +373,12 @@ class FinishopenidloginAction extends Action
return true;
}
function openid_to_nickname($openid)
function openidToNickname($openid)
{
if (Auth_Yadis_identifierScheme($openid) == 'XRI') {
return $this->xri_to_nickname($openid);
return $this->xriToNickname($openid);
} else {
return $this->url_to_nickname($openid);
return $this->urlToNickname($openid);
}
}
......@@ -374,7 +387,7 @@ class FinishopenidloginAction extends Action
# 2. One element in path, like http://profile.typekey.com/EvanProdromou/
# or http://getopenid.com/evanprodromou
function url_to_nickname($openid)
function urlToNickname($openid)
{
static $bad = array('query', 'user', 'password', 'port', 'fragment');
......@@ -421,9 +434,9 @@ class FinishopenidloginAction extends Action
return null;
}
function xri_to_nickname($xri)
function xriToNickname($xri)
{
$base = $this->xri_base($xri);
$base = $this->xriBase($xri);
if (!$base) {
return null;
......@@ -435,7 +448,7 @@ class FinishopenidloginAction extends Action
}
}
function xri_base($xri)
function xriBase($xri)
{
if (substr($xri, 0, 6) == 'xri://') {
return substr($xri, 6);
......
......@@ -25,35 +25,40 @@ define('BOTH', 0);
class FoafAction extends Action
{
function isReadOnly()
{
return true;
}
function handle($args)
function prepare($args)
{
parent::handle($args);
parent::prepare($args);
$this->nickname = $this->trimmed('nickname');
$nickname = $this->trimmed('nickname');
$this->user = User::staticGet('nickname', $this->nickname);
$user = User::staticGet('nickname', $nickname);
if (!$user) {
if (!$this->user) {
$this->clientError(_('No such user.'), 404);
return;
return false;
}
$profile = $user->getProfile();
$this->profile = $this->user->getProfile();
if (!$profile) {
if (!$this->profile) {
$this->serverError(_('User has no profile.'), 500);
return;
return false;
}
return true;
}
function handle($args)
{
parent::handle($args);
header('Content-Type: application/rdf+xml');
common_start_xml();
$this->startXML();
$this->elementStart('rdf:RDF', array('xmlns:rdf' =>
'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
'xmlns:rdfs' =>
......@@ -62,42 +67,42 @@ class FoafAction extends Action
'http://www.w3.org/2003/01/geo/wgs84_pos#',
'xmlns' => 'http://xmlns.com/foaf/0.1/'));
# This is the document about the user
// This is the document about the user
$this->show_ppd('', $user->uri);
$this->showPpd('', $this->user->uri);
# XXX: might not be a person
// XXX: might not be a person
$this->elementStart('Person', array('rdf:about' =>
$user->uri));
$this->element('mbox_sha1sum', null, sha1('mailto:' . $user->email));
if ($profile->fullname) {
$this->element('name', null, $profile->fullname);
$this->user->uri));
$this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email));
if ($this->profile->fullname) {
$this->element('name', null, $this->profile->fullname);
}
if ($profile->homepage) {
$this->element('homepage', array('rdf:resource' => $profile->homepage));
if ($this->profile->homepage) {
$this->element('homepage', array('rdf:resource' => $this->profile->homepage));
}
if ($profile->bio) {
$this->element('rdfs:comment', null, $profile->bio);
if ($this->profile->bio) {
$this->element('rdfs:comment', null, $this->profile->bio);
}
# XXX: more structured location data
if ($profile->location) {
// XXX: more structured location data
if ($this->profile->location) {
$this->elementStart('based_near');
$this->elementStart('geo:SpatialThing');
$this->element('name', null, $profile->location);
$this->element('name', null, $this->profile->location);
$this->elementEnd('geo:SpatialThing');
$this->elementEnd('based_near');
}
$this->show_microblogging_account($profile, common_root_url());
$this->showMicrobloggingAccount($this->profile, common_root_url());
$avatar = $profile->getOriginalAvatar();
$avatar = $this->profile->getOriginalAvatar();
if ($avatar) {
$this->elementStart('img');
$this->elementStart('Image', array('rdf:about' => $avatar->url));
foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
$scaled = $profile->getAvatar($size);
if (!$scaled->original) { # sometimes the original has one of our scaled sizes
$scaled = $this->profile->getAvatar($size);
if (!$scaled->original) { // sometimes the original has one of our scaled sizes
$this->elementStart('thumbnail');
$this->element('Image', array('rdf:about' => $scaled->url));
$this->elementEnd('thumbnail');
......@@ -107,14 +112,14 @@ class FoafAction extends Action
$this->elementEnd('img');
}
# Get people user is subscribed to
// Get people user is subscribed to
$person = array();
$sub = new Subscription();
$sub->subscriber = $profile->id;
$sub->subscriber = $this->profile->id;
$sub->whereAdd('subscriber != subscribed');
if ($sub->find()) {
while ($sub->fetch()) {
if ($sub->token) {
......@@ -131,10 +136,10 @@ class FoafAction extends Action
}
}
# Get people who subscribe to user
// Get people who subscribe to user
$sub = new Subscription();
$sub->subscribed = $profile->id;
$sub->subscribed = $this->profile->id;
$sub->whereAdd('subscriber != subscribed');
if ($sub->find()) {
......@@ -163,26 +168,27 @@ class FoafAction extends Action
if ($p[1] instanceof User) {
$foaf_url = common_local_url('foaf', array('nickname' => $p[1]->nickname));
}
$profile = Profile::staticGet($p[1]->id);
$this->profile = Profile::staticGet($p[1]->id);
$this->elementStart('Person', array('rdf:about' => $uri));
if ($p[0] == LISTENER || $p[0] == BOTH) {
$this->element('knows', array('rdf:resource' => $user->uri));
$this->element('knows', array('rdf:resource' => $this->user->uri));
}
$this->show_microblogging_account($profile, ($p[1] instanceof User) ?
$this->showMicrobloggingAccount($this->profile, ($p[1] instanceof User) ?
common_root_url() : null);
if ($foaf_url) {
$this->element('rdfs:seeAlso', array('rdf:resource' => $foaf_url));
}
$this->elementEnd('Person');
if ($foaf_url) {
$this->show_ppd($foaf_url, $uri);
$this->showPpd($foaf_url, $uri);
}
}
$this->elementEnd('rdf:RDF');
$this->endXML();
}
function show_ppd($foaf_url, $person_uri)
function showPpd($foaf_url, $person_uri)
{
$this->elementStart('PersonalProfileDocument', array('rdf:about' => $foaf_url));
$this->element('maker', array('rdf:resource' => $person_uri));
......@@ -190,9 +196,9 @@ class FoafAction extends Action
$this->elementEnd('PersonalProfileDocument');
}
function show_microblogging_account($profile, $service=null)
function showMicrobloggingAccount($profile, $service=null)
{
# Their account
// Their account
$this->elementStart('holdsAccount');
$this->elementStart('OnlineAccount');
if ($service) {
......
......@@ -21,6 +21,11 @@ if (!defined('LACONICA')) { exit(1); }
class InviteAction extends Action
{
var $mode = null;
var $error = null;
var $already = null;
var $subbed = null;
var $sent = null;
function isReadOnly()
{
......@@ -35,19 +40,18 @@ class InviteAction extends Action
common_config('site', 'name')));
return;
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->send_invitations();
$this->sendInvitations();
} else {
$this->show_form();
$this->showForm();
}
}
function send_invitations()
function sendInvitations()
{
# CSRF protection
$token = $this->trimmed('token');
if (!$token || $token != common_session_token()) {
$this->show_form(_('There was a problem with your session token. Try again, please.'));
$this->showForm(_('There was a problem with your session token. Try again, please.'));
return;
}
......@@ -63,78 +67,105 @@ class InviteAction extends Action
foreach ($addresses as $email) {
$email = trim($email);
if (!Validate::email($email, true)) {
$this->show_form(sprintf(_('Invalid email address: %s'), $email));
$this->showForm(sprintf(_('Invalid email address: %s'), $email));
return;
}
}
$already = array();
$subbed = array();
$this->already = array();
$this->subbed = array();
foreach ($addresses as $email) {
$email = common_canonical_email($email);
$other = User::staticGet('email', $email);
if ($other) {
if ($user->isSubscribed($other)) {
$already[] = $other;
$this->already[] = $other;
} else {
subs_subscribe_to($user, $other);
$subbed[] = $other;
$this->subbed[] = $other;
}
} else {
$sent[] = $email;
$this->send_invitation($email, $user, $personal);
$this->sent[] = $email;
$this->sendInvitation($email, $user, $personal);
}
}
common_show_header(_('Invitation(s) sent'));
if ($already) {
$this->mode = 'sent';
$this->showPage();
}
function title()
{
if ($this->mode == 'sent') {
return _('Invitation(s) sent');
} else {
return _('Invite new users');
}
}
function showContent()
{
if ($this->mode == 'sent') {
$this->showInvitationSuccess();
} else {
$this->showInviteForm();
}
}
function showInvitationSuccess()
{
if ($this->already) {
$this->element('p', null, _('You are already subscribed to these use