parent::handle($args);
- $nickname = common_canonical_nickname($this->arg('nickname'));
+ $nickname_arg = $this->arg('nickname');
+ $nickname = common_canonical_nickname($nickname_arg);
+
+ # Permanent redirect on non-canonical nickname
+
+ if ($nickname_arg != $nickname) {
+ $args = array('nickname' => $nickname);
+ if ($this->arg('page') && $this->arg('page') != 1) {
+ $args['page'] = $this->arg['page'];
+ }
+ common_redirect(common_local_url('showstream', $args), 301);
+ return;
+ }
+
$user = User::staticGet('nickname', $nickname);
if (!$user) {
$profile = $user->getProfile();
if (!$profile) {
- common_server_error(_t('User record exists without profile.'));
+ common_server_error(_('User has no profile.'));
return;
}
header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
$user->nickname)));
- common_show_header($profile->nickname,
+ common_show_header($profile->nickname,
array($this, 'show_header'), $user,
array($this, 'show_top'));
$this->show_profile($profile);
- $this->show_notices($profile);
+ $this->show_notices($user);
common_show_footer();
}
function show_top($user) {
-
$cur = common_current_user();
-
+
if ($cur && $cur->id == $user->id) {
- common_notice_form();
+ common_notice_form('showstream');
}
-
+
$this->views_menu();
+
+ $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('nickname' => $user->nickname)),
+ 'type' => 'rss',
+ 'version' => 'RSS 1.0',
+ 'item' => 'notices'),
+ 1=>array('href'=>common_local_url('usertimeline', array('nickname' => $user->nickname)),
+ 'type' => 'atom',
+ 'version' => 'Atom 1.0',
+ 'item' => 'usertimeline'),
+
+ 2=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)),
+ 'type' => 'rdf',
+ 'version' => 'FOAF',
+ 'item' => 'foaf')));
}
-
+
function show_header($user) {
+ # Feeds
+ common_element('link', array('rel' => 'alternate',
+ 'href' => common_local_url('api',
+ array('apiaction' => 'statuses',
+ 'method' => 'user_timeline.rss',
+ 'argument' => $user->nickname)),
+ 'type' => 'application/rss+xml',
+ 'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
+ common_element('link', array('rel' => 'alternate feed',
+ 'href' => common_local_url('api',
+ array('apiaction' => 'statuses',
+ 'method' => 'user_timeline.atom',
+ 'argument' => $user->nickname)),
+ 'type' => 'application/atom+xml',
+ 'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
common_element('link', array('rel' => 'alternate',
'href' => common_local_url('userrss', array('nickname' =>
$user->nickname)),
- 'type' => 'application/rss+xml',
- 'title' => _t('Notice feed for ') . $user->nickname));
+ 'type' => 'application/rdf+xml',
+ 'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
+ # FOAF
common_element('link', array('rel' => 'meta',
'href' => common_local_url('foaf', array('nickname' =>
$user->nickname)),
common_element('meta', array('http-equiv' => 'X-XRDS-Location',
'content' => common_local_url('xrds', array('nickname' =>
$user->nickname))));
+ $profile = $user->getProfile();
+ if ($profile->bio) {
+ common_element('meta', array('name' => 'description',
+ 'content' => $profile->bio));
+ }
+
+ if ($user->emailmicroid && $user->email && $profile->profileurl) {
+ common_element('meta', array('name' => 'microid',
+ 'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($profile->profileurl))));
+ }
+ if ($user->jabbermicroid && $user->jabber && $profile->profileurl) {
+ common_element('meta', array('name' => 'microid',
+ 'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($profile->profileurl))));
+ }
+
+ # See https://wiki.mozilla.org/Microsummaries
+
+ common_element('link', array('rel' => 'microsummary',
+ 'href' => common_local_url('microsummary',
+ array('nickname' => $profile->nickname))));
}
function no_such_user() {
- common_user_error('No such user');
+ $this->client_error(_('No such user.'), 404);
}
function show_profile($profile) {
- common_element_start('div', array('id' => 'profile'));
+ common_element_start('div', array('id' => 'profile', 'class' => 'vcard'));
$this->show_personal($profile);
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
common_element_start('div', array('id' => 'profile_avatar'));
- common_element('img', array('src' => ($avatar) ? $avatar->url : common_default_avatar(AVATAR_PROFILE_SIZE),
- 'class' => 'avatar profile',
+ common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+ 'class' => 'avatar profile photo',
'width' => AVATAR_PROFILE_SIZE,
'height' => AVATAR_PROFILE_SIZE,
'alt' => $profile->nickname));
+
+ common_element_start('ul', array('id' => 'profile_actions'));
+
+ common_element_start('li', array('id' => 'profile_subscribe'));
$cur = common_current_user();
if ($cur) {
if ($cur->id != $profile->id) {
if ($cur->isSubscribed($profile)) {
- $this->show_unsubscribe_form($profile);
+ common_unsubscribe_form($profile);
} else {
- $this->show_subscribe_form($profile);
+ common_subscribe_form($profile);
}
}
} else {
- $this->show_remote_subscribe_form($profile);
+ $this->show_remote_subscribe_link($profile);
}
+ common_element_end('li');
+
+ $user = User::staticGet('id', $profile->id);
+ common_profile_new_message_nudge($cur, $user, $profile);
+
+ common_element_end('ul');
+
common_element_end('div');
common_element_start('div', array('id' => 'profile_information'));
-
+
if ($profile->fullname) {
- common_element('h1', NULL, $profile->fullname);
+ common_element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')');
+ } else {
+ common_element('h1', array('class' => 'fn nickname'), $profile->nickname);
}
+
if ($profile->location) {
common_element('p', 'location', $profile->location);
}
if ($profile->bio) {
- common_element('p', 'description', htmlspecialchars($profile->bio));
+ common_element('p', 'description note', $profile->bio);
}
if ($profile->homepage) {
common_element_start('p', 'website');
- common_element('a', array('href' => $profile->homepage),
+ common_element('a', array('href' => $profile->homepage,
+ 'rel' => 'me', 'class' => 'url'),
$profile->homepage);
common_element_end('p');
}
-
+
$this->show_statistics($profile);
common_element_end('div');
}
- function show_subscribe_form($profile) {
- common_element_start('form', array('id' => 'subscribe', 'method' => 'POST',
- 'action' => common_local_url('subscribe')));
- common_element('input', array('id' => 'subscribeto',
- 'name' => 'subscribeto',
- 'type' => 'hidden',
- 'value' => $profile->nickname));
- common_element('input', array('type' => 'submit',
- 'class' => 'submit',
- 'value' => _t('Subscribe')));
- common_element_end('form');
- }
-
- function show_remote_subscribe_form($profile) {
- common_element_start('form', array('id' => 'remotesubscribe',
- 'method' => 'POST',
- 'action' => common_local_url('remotesubscribe')));
- common_hidden('nickname', $profile->nickname);
- common_element('input', array('name' => 'profile_url',
- 'type' => 'text',
- 'id' => 'profile_url',
- 'size' => '15'));
- common_element('input', array('type' => 'submit',
- 'id' => 'submit',
- 'name' => 'submit',
- 'value' => _t('Subscribe'),
- 'class' => 'submit'));
- common_element_end('form');
+ function show_remote_subscribe_link($profile) {
+ $url = common_local_url('remotesubscribe',
+ array('nickname' => $profile->nickname));
+ common_element('a', array('href' => $url,
+ 'id' => 'remotesubscribe'),
+ _('Subscribe'));
}
function show_unsubscribe_form($profile) {
- common_element_start('form', array('id' => 'unsubscribe', 'method' => 'POST',
+ common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post',
'action' => common_local_url('unsubscribe')));
+ common_hidden('token', common_session_token());
common_element('input', array('id' => 'unsubscribeto',
'name' => 'unsubscribeto',
'type' => 'hidden',
'value' => $profile->nickname));
common_element('input', array('type' => 'submit',
'class' => 'submit',
- 'value' => _t('Unsubscribe')));
+ 'value' => _('Unsubscribe')));
common_element_end('form');
}
$subs = DB_DataObject::factory('subscription');
$subs->subscriber = $profile->id;
+ $subs->whereAdd('subscribed != ' . $profile->id);
+
+ $subs->orderBy('created DESC');
# We ask for an extra one to know if we need to do another page
common_element_start('div', array('id' => 'subscriptions'));
- common_element('h2', NULL, _t('Subscriptions'));
+ common_element('h2', NULL, _('Subscriptions'));
if ($subs_count > 0) {
-
+
common_element_start('ul', array('id' => 'subscriptions_avatars'));
-
+
for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
-
+
if (!$subs->fetch()) {
common_debug('Weirdly, broke out of subscriptions loop early', __FILE__);
break;
$other = Profile::staticGet($subs->subscribed);
- common_element_start('li');
+ if (!$other) {
+ common_log_db_error($subs, 'SELECT', __FILE__);
+ continue;
+ }
+
+ common_element_start('li', 'vcard');
common_element_start('a', array('title' => ($other->fullname) ?
$other->fullname :
$other->nickname,
'href' => $other->profileurl,
- 'class' => 'subscription'));
+ 'rel' => 'contact',
+ 'class' => 'subscription fn url'));
$avatar = $other->getAvatar(AVATAR_MINI_SIZE);
- common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_MINI_SIZE)),
+ common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)),
'width' => AVATAR_MINI_SIZE,
'height' => AVATAR_MINI_SIZE,
- 'class' => 'avatar mini',
+ 'class' => 'avatar mini photo',
'alt' => ($other->fullname) ?
$other->fullname :
$other->nickname));
common_element_end('a');
common_element_end('li');
}
-
+
common_element_end('ul');
}
if ($subs_count > SUBSCRIPTIONS) {
common_element_start('p', array('id' => 'subscriptions_viewall'));
-
+
common_element('a', array('href' => common_local_url('subscriptions',
array('nickname' => $profile->nickname)),
'class' => 'moresubscriptions'),
- _t('All subscriptions'));
+ _('All subscriptions'));
common_element_end('p');
}
-
+
common_element_end('div');
}
// XXX: WORM cache this
$subs = DB_DataObject::factory('subscription');
$subs->subscriber = $profile->id;
- $subs_count = (int) $subs->count();
+ $subs_count = (int) $subs->count() - 1;
$subbed = DB_DataObject::factory('subscription');
$subbed->subscribed = $profile->id;
- $subbed_count = (int) $subbed->count();
+ $subbed_count = (int) $subbed->count() - 1;
$notices = DB_DataObject::factory('notice');
$notices->profile_id = $profile->id;
$notice_count = (int) $notices->count();
common_element_start('div', 'statistics');
- common_element('h2', 'statistics', _t('Statistics'));
+ common_element('h2', 'statistics', _('Statistics'));
# Other stats...?
common_element_start('dl', 'statistics');
+ common_element('dt', 'membersince', _('Member since'));
+ common_element('dd', 'membersince', date('j M Y',
+ strtotime($profile->created)));
+
common_element_start('dt', 'subscriptions');
common_element('a', array('href' => common_local_url('subscriptions',
array('nickname' => $profile->nickname))),
- _t('Subscriptions'));
+ _('Subscriptions'));
common_element_end('dt');
- common_element('dd', 'subscriptions', $subs_count);
+ common_element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
common_element_start('dt', 'subscribers');
- common_element('a', array('href' => common_local_url('subscribed',
+ common_element('a', array('href' => common_local_url('subscribers',
array('nickname' => $profile->nickname))),
- _t('Subscribers'));
+ _('Subscribers'));
common_element_end('dt');
- common_element('dd', 'subscribers', $subbed_count);
- common_element('dt', 'notices', _t('Notices'));
- common_element('dd', 'notices', $notice_count);
+ common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
+ common_element('dt', 'notices', _('Notices'));
+ common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
+ # XXX: link these to something
+ common_element('dt', 'tags', _('Tags'));
+ common_element_start('dd', 'tags');
+ $tags = Profile_tag::getTags($profile->id, $profile->id);
+
+ common_element_start('ul', 'tags xoxo');
+ foreach ($tags as $tag) {
+ common_element_start('li');
+ common_element('a', array('rel' => 'bookmark tag',
+ 'href' => common_local_url('peopletag',
+ array('tag' => $tag))),
+ $tag);
+ common_element_end('li');
+ }
+ common_element_end('ul');
+ common_element_end('dd');
+
common_element_end('dl');
common_element_end('div');
}
- function show_notices($profile) {
-
- $notice = DB_DataObject::factory('notice');
- $notice->profile_id = $profile->id;
-
- $notice->orderBy('created DESC');
+ function show_notices($user) {
$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
- $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
+ $notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
- $cnt = $notice->find();
+ $cnt = 0;
+
+ if ($notice) {
- if ($cnt > 0) {
common_element_start('ul', array('id' => 'notices'));
-
- for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
- if ($notice->fetch()) {
- $this->show_notice($notice);
- } else {
- // shouldn't happen!
+
+ while ($notice->fetch()) {
+ $cnt++;
+ if ($cnt > NOTICES_PER_PAGE) {
break;
}
+ $this->show_notice($notice);
}
-
+
common_element_end('ul');
}
+
common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
- 'showstream', array('nickname' => $profile->nickname));
+ 'showstream', array('nickname' => $user->nickname));
}
function show_last_notice($profile) {
- common_element('h2', NULL, _t('Currently'));
+ common_element('h2', NULL, _('Currently'));
- $notice = DB_DataObject::factory('notice');
- $notice->profile_id = $profile->id;
- $notice->orderBy('created DESC');
- $notice->limit(0, 1);
+ $notice = $profile->getCurrentNotice();
- if ($notice->find(true)) {
+ if ($notice) {
# FIXME: URL, image, video, audio
common_element_start('p', array('class' => 'notice_current'));
- common_raw(common_render_content($notice->content, $notice));
+ if ($notice->rendered) {
+ common_raw($notice->rendered);
+ } else {
+ # XXX: may be some uncooked notices in the DB,
+ # we cook them right now. This can probably disappear in future
+ # versions (>> 0.4.x)
+ common_raw(common_render_content($notice->content, $notice));
+ }
common_element_end('p');
}
}
function show_notice($notice) {
$profile = $notice->getProfile();
+ $user = common_current_user();
+
# XXX: RDFa
- common_element_start('li', array('class' => 'notice_single',
+ common_element_start('li', array('class' => 'notice_single hentry',
'id' => 'notice-' . $notice->id));
+ if ($user) {
+ if ($user->hasFave($notice)) {
+ common_disfavor_form($notice);
+ } else {
+ common_favor_form($notice);
+ }
+ }
$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
# FIXME: URL, image, video, audio
- common_element_start('p');
- common_raw(common_render_content($notice->content, $notice));
+ common_element_start('p', 'entry-title');
+ if ($notice->rendered) {
+ common_raw($notice->rendered);
+ } else {
+ # XXX: may be some uncooked notices in the DB,
+ # we cook them right now. This can probably disappear in future
+ # versions (>> 0.4.x)
+ common_raw(common_render_content($notice->content, $notice));
+ }
common_element_end('p');
common_element_start('p', array('class' => 'time'));
- common_element('a', array('class' => 'notice',
- 'href' => $noticeurl),
- common_date_string($notice->created));
+ common_element_start('a', array('class' => 'permalink',
+ 'rel' => 'bookmark',
+ 'href' => $noticeurl));
+ common_element('abbr', array('class' => 'published',
+ 'title' => common_date_iso8601($notice->created)),
+ common_date_string($notice->created));
+ common_element_end('a');
+
+ if ($notice->source) {
+ common_text(_(' from '));
+ $this->source_link($notice->source);
+ }
+ if ($notice->reply_to) {
+ $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
+ common_text(' (');
+ common_element('a', array('class' => 'inreplyto',
+ 'href' => $replyurl),
+ _('in reply to...'));
+ common_text(')');
+ }
+ common_element_start('a',
+ array('href' => common_local_url('newnotice',
+ array('replyto' => $profile->nickname)),
+ 'onclick' => 'doreply("'.$profile->nickname.'"); return false',
+ 'title' => _('reply'),
+ 'class' => 'replybutton'));
+ common_raw('→');
+ common_element_end('a');
+ if ($user && $notice->profile_id == $user->id) {
+ $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
+ common_element_start('a', array('class' => 'deletenotice',
+ 'href' => $deleteurl,
+ 'title' => _('delete')));
+ common_raw('×');
+ common_element_end('a');
+ }
+
common_element_end('p');
common_element_end('li');
}
projects / quix0rs-gnu-social.git / blobdiff