header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
$user->nickname)));
- common_show_header($profile->nickname, array($this, 'show_header'), $user);
+ common_show_header($profile->nickname,
+ array($this, 'show_header'), $user,
+ array($this, 'show_top'));
- $cur = common_current_user();
-
- if ($cur && $cur->id == $profile->id) {
- common_notice_form();
- }
-
- $this->views_menu();
-
$this->show_profile($profile);
$this->show_notices($profile);
common_show_footer();
}
+ function show_top($user) {
+
+ $cur = common_current_user();
+
+ if ($cur && $cur->id == $user->id) {
+ common_notice_form('showstream');
+ }
+
+ $this->views_menu();
+ }
+
function show_header($user) {
common_element('link', array('rel' => 'alternate',
'href' => common_local_url('userrss', array('nickname' =>
function show_personal($profile) {
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
- if ($avatar) {
- common_element_start('div', array('id' => 'profile_avatar'));
- common_element('img', array('src' => $avatar->url,
- 'class' => 'avatar profile',
- 'width' => AVATAR_PROFILE_SIZE,
- 'height' => AVATAR_PROFILE_SIZE,
- 'alt' => $profile->nickname));
- $cur = common_current_user();
- if ($cur) {
- if ($cur->id != $profile->id) {
- if ($cur->isSubscribed($profile)) {
- $this->show_unsubscribe_form($profile);
- } else {
- $this->show_subscribe_form($profile);
- }
+ common_element_start('div', array('id' => 'profile_avatar'));
+ common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+ 'class' => 'avatar profile',
+ 'width' => AVATAR_PROFILE_SIZE,
+ 'height' => AVATAR_PROFILE_SIZE,
+ 'alt' => $profile->nickname));
+ $cur = common_current_user();
+ if ($cur) {
+ if ($cur->id != $profile->id) {
+ if ($cur->isSubscribed($profile)) {
+ $this->show_unsubscribe_form($profile);
+ } else {
+ $this->show_subscribe_form($profile);
}
- } else {
- $this->show_remote_subscribe_form($profile);
}
- common_element_end('div');
+ } else {
+ $this->show_remote_subscribe_link($profile);
}
+ common_element_end('div');
+
common_element_start('div', array('id' => 'profile_information'));
-
+
if ($profile->fullname) {
- common_element('h1', NULL, $profile->fullname);
+ common_element('h1', NULL, $profile->fullname . ' (' . $profile->nickname . ')');
+ } else {
+ common_element('h1', NULL, $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', $profile->bio);
}
if ($profile->homepage) {
- common_element('p', 'website', $profile->homepage);
+ common_element_start('p', 'website');
+ common_element('a', array('href' => $profile->homepage),
+ $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',
+ 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' => 'button',
+ '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',
- 'type' => 'text',
- 'id' => 'profile',
- 'size' => '15'));
- common_element('input', array('type' => 'submit',
- 'id' => 'submit',
- 'name' => 'submit',
- 'value' => _t('Subscribe'),
- 'class' => 'button'));
- 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'),
+ _t('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_element('input', array('id' => 'unsubscribeto',
'name' => 'unsubscribeto',
'type' => 'hidden',
'value' => $profile->nickname));
common_element('input', array('type' => 'submit',
- 'class' => 'button',
+ 'class' => 'submit',
'value' => _t('Unsubscribe')));
common_element_end('form');
}
function show_subscriptions($profile) {
global $config;
- # XXX: add a limit
$subs = DB_DataObject::factory('subscription');
$subs->subscriber = $profile->id;
+ $subs->orderBy('created DESC');
# We ask for an extra one to know if we need to do another page
- $subs->limit(0, SUBSCRIPTIONS);
+ $subs->limit(0, SUBSCRIPTIONS + 1);
$subs_count = $subs->find();
common_element('h2', NULL, _t('Subscriptions'));
if ($subs_count > 0) {
-
+
common_element_start('ul', array('id' => 'subscriptions_avatars'));
-
- while ($subs->fetch()) {
+
+ 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);
'href' => $other->profileurl,
'class' => 'subscription'));
$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',
common_element_end('a');
common_element_end('li');
}
+
common_element_end('ul');
}
- 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'));
+ 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'));
+ common_element_end('p');
+ }
- common_element_end('p');
-
common_element_end('div');
}
# Other stats...?
common_element_start('dl', 'statistics');
- common_element('dt', 'subscriptions', _t('Subscriptions'));
+ common_element('dt', 'membersince', _t('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'));
+ common_element_end('dt');
common_element('dd', 'subscriptions', $subs_count);
- common_element('dt', 'subscribers', _t('Subscribers'));
+ common_element_start('dt', 'subscribers');
+ common_element('a', array('href' => common_local_url('subscribers',
+ array('nickname' => $profile->nickname))),
+ _t('Subscribers'));
+ common_element_end('dt');
common_element('dd', 'subscribers', $subbed_count);
common_element('dt', 'notices', _t('Notices'));
common_element('dd', 'notices', $notice_count);
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);
break;
}
}
-
+
common_element_end('ul');
}
common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
projects / quix0rs-gnu-social.git / blobdiff