$profile = $user->getProfile();
if (!$profile) {
- common_server_error(_t('User record exists without profile.'));
+ common_server_error(_('User has no profile.'));
return;
}
'href' => common_local_url('userrss', array('nickname' =>
$user->nickname)),
'type' => 'application/rss+xml',
- 'title' => _t('Notice feed for ') . $user->nickname));
+ 'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
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))));
+ }
+
}
function no_such_user() {
- common_user_error('No such user');
+ common_user_error(_('No such user.'));
}
function show_profile($profile) {
common_element('h1', NULL, $profile->nickname);
}
-
+
if ($profile->location) {
common_element('p', 'location', $profile->location);
}
}
if ($profile->homepage) {
common_element_start('p', 'website');
- common_element('a', array('href' => $profile->homepage),
+ common_element('a', array('href' => $profile->homepage,
+ 'rel' => 'me'),
$profile->homepage);
common_element_end('p');
}
'value' => $profile->nickname));
common_element('input', array('type' => 'submit',
'class' => 'submit',
- 'value' => _t('Subscribe')));
+ 'value' => _('Subscribe')));
common_element_end('form');
}
array('nickname' => $profile->nickname));
common_element('a', array('href' => $url,
'id' => 'remotesubscribe'),
- _t('Subscribe'));
+ _('Subscribe'));
}
function show_unsubscribe_form($profile) {
'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) {
$other->fullname :
$other->nickname,
'href' => $other->profileurl,
+ 'rel' => 'contact',
'class' => 'subscription'));
$avatar = $other->getAvatar(AVATAR_MINI_SIZE);
common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_MINI_SIZE)),
common_element('a', array('href' => common_local_url('subscriptions',
array('nickname' => $profile->nickname)),
'class' => 'moresubscriptions'),
- _t('All subscriptions'));
+ _('All subscriptions'));
common_element_end('p');
}
// 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', _t('Member since'));
- common_element('dd', 'membersince', date('j M Y',
+ 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('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');
common_element_end('dl');
common_element_end('div');
$notice = DB_DataObject::factory('notice');
$notice->profile_id = $profile->id;
- $notice->orderBy('created DESC');
+ $notice->orderBy('created DESC, notice.id DESC');
$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
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'));
if ($notice->rendered) {
function show_notice($notice) {
$profile = $notice->getProfile();
+ if (common_logged_in()) {
+ $user = common_current_user();
+ $user_profile = $user->getProfile();
+ } else {
+ $user_profile = false;
+ }
# XXX: RDFa
common_element_start('li', array('class' => 'notice_single',
'id' => 'notice-' . $notice->id));
$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));
+ 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' => 'permalink',
'href' => $noticeurl,
'title' => common_exact_date($notice->created)),
common_date_string($notice->created));
- common_element_start('a',
+ 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' => _t('reply'),
+ 'title' => _('reply'),
'class' => 'replybutton'));
common_raw('→');
common_element_end('a');
common_element_end('p');
+ if ($user_profile && $notice->profile_id == $user_profile->id) {
+ $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
+ common_element('a', array('class' => 'deletenotice',
+ 'href' => $deleteurl),
+ _('delete'));
+ }
common_element_end('li');
}
}
\ No newline at end of file