forked from GNUsocial/gnu-social
change from using tag uris to http urls for identifiers
Weirdly, I got in an argument with Tim Berners-Lee in #swig about the tag URIs I was using in FOAF documents. Eventually, I was convinced that it's a better thing to use HTTP URLs instead. So, now we have HTTP URLs. The tricky thing was for users. Since they can change their names, we can't use their profile URL, since it includes the name. Instead, I made up a new action, which simply redirects from a user ID to their current profile URL. This should be sufficiently long-term. darcs-hash:20080620071700-84dde-c6145243dc45dd2dff621aff421375d05796057e.gz
This commit is contained in:
parent
03dba4270a
commit
15a09c5d69
@ -223,7 +223,7 @@ class FinishopenidloginAction extends Action {
|
|||||||
$user = new User();
|
$user = new User();
|
||||||
$user->id = $id;
|
$user->id = $id;
|
||||||
$user->nickname = $nickname;
|
$user->nickname = $nickname;
|
||||||
$user->uri = common_mint_tag('user:'.$id);
|
$user->uri = common_user_uri($user);
|
||||||
|
|
||||||
if ($sreg['email'] && Validate::email($sreg['email'], true)) {
|
if ($sreg['email'] && Validate::email($sreg['email'], true)) {
|
||||||
$user->email = $sreg['email'];
|
$user->email = $sreg['email'];
|
||||||
|
@ -61,7 +61,7 @@ class NewnoticeAction extends Action {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$orig = clone($notice);
|
$orig = clone($notice);
|
||||||
$notice->uri = common_mint_tag('notice:' . $id);
|
$notice->uri = common_notice_uri($notice);
|
||||||
|
|
||||||
if (!$notice->update($orig)) {
|
if (!$notice->update($orig)) {
|
||||||
common_server_error(_t('Problem saving notice.'));
|
common_server_error(_t('Problem saving notice.'));
|
||||||
@ -91,4 +91,4 @@ class NewnoticeAction extends Action {
|
|||||||
common_notice_form();
|
common_notice_form();
|
||||||
common_show_footer();
|
common_show_footer();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -107,7 +107,7 @@ class RegisterAction extends Action {
|
|||||||
$user->nickname = $nickname;
|
$user->nickname = $nickname;
|
||||||
$user->password = common_munge_password($password, $id);
|
$user->password = common_munge_password($password, $id);
|
||||||
$user->created = DB_DataObject_Cast::dateTime(); # current time
|
$user->created = DB_DataObject_Cast::dateTime(); # current time
|
||||||
$user->uri = common_mint_tag('user:'.$id);
|
$user->uri = common_user_uri($user);
|
||||||
|
|
||||||
$result = $user->insert();
|
$result = $user->insert();
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
|
36
actions/userbyid.php
Normal file
36
actions/userbyid.php
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* Laconica - a distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 2008, Controlez-Vous, 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/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (!defined('LACONICA')) { exit(1); }
|
||||||
|
|
||||||
|
class UserbyidAction extends Action {
|
||||||
|
function handle($args) {
|
||||||
|
parent::handle($args);
|
||||||
|
$id = $this->trimmed('id');
|
||||||
|
if (!$id) {
|
||||||
|
$this->client_error(_t('No id.'));
|
||||||
|
}
|
||||||
|
$user =& User::staticGet($id);
|
||||||
|
if (!$id) {
|
||||||
|
$this->client_error(_t('No such user.'));
|
||||||
|
}
|
||||||
|
common_redirect('showstream',
|
||||||
|
array('nickname' => $user->nickname));
|
||||||
|
}
|
||||||
|
}
|
@ -27,6 +27,8 @@ RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
|
|||||||
RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
|
RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
|
||||||
RewriteRule ^notice/(\d+)$ index.php?action=shownotice¬ice=$1 [L,QSA]
|
RewriteRule ^notice/(\d+)$ index.php?action=shownotice¬ice=$1 [L,QSA]
|
||||||
|
|
||||||
|
RewriteRule ^user/(\d+)$ index.php?action=userbyid&id=$1 [L,QSA]
|
||||||
|
|
||||||
RewriteRule ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA]
|
RewriteRule ^(\w+)/subscriptions$ index.php?action=subscriptions&nickname=$1 [L,QSA]
|
||||||
RewriteRule ^(\w+)/subscribers$ index.php?action=subscribers&nickname=$1 [L,QSA]
|
RewriteRule ^(\w+)/subscribers$ index.php?action=subscribers&nickname=$1 [L,QSA]
|
||||||
RewriteRule ^(\w+)/xrds$ index.php?action=xrds&nickname=$1 [L,QSA]
|
RewriteRule ^(\w+)/xrds$ index.php?action=xrds&nickname=$1 [L,QSA]
|
||||||
|
11
lib/util.php
11
lib/util.php
@ -572,6 +572,8 @@ function common_fancy_url($action, $args=NULL) {
|
|||||||
}
|
}
|
||||||
case 'confirmemail':
|
case 'confirmemail':
|
||||||
return common_path('main/confirmemail/'.$args['code']);
|
return common_path('main/confirmemail/'.$args['code']);
|
||||||
|
case 'userbyid':
|
||||||
|
return common_path('user/'.$args['id']);
|
||||||
default:
|
default:
|
||||||
return common_simple_url($action, $args);
|
return common_simple_url($action, $args);
|
||||||
}
|
}
|
||||||
@ -897,3 +899,12 @@ function common_copy_args($from) {
|
|||||||
}
|
}
|
||||||
return $to;
|
return $to;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function common_user_uri(&$user) {
|
||||||
|
return common_local_url('userbyid', array('id' => $user->id));
|
||||||
|
}
|
||||||
|
|
||||||
|
function common_notice_uri(&$notice) {
|
||||||
|
return common_local_url('shownotice',
|
||||||
|
array('notice' => $notice->id));
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user