From aeaf75138cf8be42d2e3935b708e1d24a97bd0a0 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 18 Jun 2008 13:13:13 -0400 Subject: [PATCH] factor out similarities in subscriptions and subscribers darcs-hash:20080618171313-84dde-3389db1f5110d3f47cd5a4ef17f6a7fc0fcf3b44.gz --- actions/subscribers.php | 46 +++++++++++ actions/subscriptions.php | 96 ++++------------------- actions/subscribed.php => lib/gallery.php | 88 +++++++++++++-------- 3 files changed, 118 insertions(+), 112 deletions(-) create mode 100644 actions/subscribers.php rename actions/subscribed.php => lib/gallery.php (57%) diff --git a/actions/subscribers.php b/actions/subscribers.php new file mode 100644 index 0000000000..f5548d6535 --- /dev/null +++ b/actions/subscribers.php @@ -0,0 +1,46 @@ +. + */ + +if (!defined('LACONICA')) { exit(1); } + +require_once(INSTALLDIR.'/lib/gallery.php'); + +class SubscribersAction extends GalleryAction { + + function gallery_type() { + return _t('Subscribers'); + } + + function get_instructions(&$profile) { + $user =& common_current_user(); + if ($user && ($user->id == $profile->id)) { + return _t('These are the people who listen to your notices.'); + } else { + return _t('These are the people who listen to ') . $profile->nickname . _t('\'s notices.'); + } + } + + function define_subs(&$subs, &$profile) { + $subs->subscribed = $profile->id; + } + + function div_class() { + return 'subscribers'; + } +} \ No newline at end of file diff --git a/actions/subscriptions.php b/actions/subscriptions.php index e5db39bcec..aba974f6e9 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -19,90 +19,28 @@ if (!defined('LACONICA')) { exit(1); } -# XXX: make distinct from similar definitions in showstream.php +require_once(INSTALLDIR.'/lib/gallery.php'); -define('SUBSCRIPTIONS_PER_ROW', 8); -define('SUBSCRIPTIONS_PER_PAGE', 80); +class SubscriptionsAction extends GalleryAction { -class SubscriptionsAction extends Action { - - function handle($args) { - parent::handle($args); - $nickname = $this->arg('nickname'); - $profile = Profile::staticGet('nickname', $nickname); - if (!$profile) { - $this->no_such_user(); - } - $user = User::staticGet($profile->id); - if (!$user) { - $this->no_such_user(); - } - $page = $this->arg('page') || 1; - common_show_header($profile->nickname . ": " . _t('Subscriptions'), - NULL, $profile, - array($this, 'show_top')); - $this->show_subscriptions($profile, $page); - common_show_footer(); + function gallery_type() { + return _t('Subscriptions'); } - function show_top($profile) { - $user = common_current_user(); - common_element('p', 'instructions', - _t('These are the people whose notices ') . - (($user && ($user->id == $profile->id)) ? _t('you listen to.') : ($profile->nickname . _t(' listens to.')))); + function get_instructions(&$profile) { + $user =& common_current_user(); + if ($user && ($user->id == $profile->id)) { + return _t('These are the people whose notices you listen to.'); + } else { + return _t('These are the people whose notices ') . $profile->nickname . _t(' listens to.'); + } + } + + function define_subs(&$subs, &$profile) { + $subs->subscriber = $profile->id; } - function show_subscriptions($profile, $page) { - - $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((($page-1)*SUBSCRIPTIONS_PER_PAGE), SUBSCRIPTIONS_PER_PAGE + 1); - - $subs_count = $subs->find(); - - common_element_start('div', 'subscriptions'); - - $idx = 0; - - while ($subs->fetch()) { - - $idx++; - - $other = Profile::staticGet($subs->subscribed); - - common_element_start('a', array('title' => ($other->fullname) ? - $other->fullname : - $other->nickname, - 'href' => $other->profileurl, - 'class' => 'subscription')); - $avatar = $other->getAvatar(AVATAR_STREAM_SIZE); - common_element('img', - array('src' => - (($avatar) ? $avatar->url : - common_default_avatar(AVATAR_STREAM_SIZE)), - 'width' => AVATAR_STREAM_SIZE, - 'height' => AVATAR_STREAM_SIZE, - 'class' => 'avatar stream', - 'alt' => ($other->fullname) ? - $other->fullname : - $other->nickname)); - common_element_end('a'); - - # XXX: subscribe form here - - if ($idx == SUBSCRIPTIONS_PER_PAGE) { - break; - } - } - - common_element_end('div'); - - common_pagination($page > 1, $subs_count > SUBSCRIPTIONS_PER_PAGE, - $page, 'subscriptions', array('nickname' => $profile->nickname)); + function div_class() { + return 'subscriptions'; } } \ No newline at end of file diff --git a/actions/subscribed.php b/lib/gallery.php similarity index 57% rename from actions/subscribed.php rename to lib/gallery.php index d59af0a53d..6d21b8310f 100644 --- a/actions/subscribed.php +++ b/lib/gallery.php @@ -19,14 +19,10 @@ if (!defined('LACONICA')) { exit(1); } -# XXX: make distinct from similar definitions in showstream.php +define('AVATARS_PER_ROW', 8); +define('AVATARS_PER_PAGE', 80); -define('SUBSCRIPTIONS_PER_ROW', 8); -define('SUBSCRIPTIONS_PER_PAGE', 80); - -class SubscribedAction extends Action { - - # Who is subscribed to a given user? +class GalleryAction extends Action { function handle($args) { parent::handle($args); @@ -34,49 +30,53 @@ class SubscribedAction extends Action { $profile = Profile::staticGet('nickname', $nickname); if (!$profile) { $this->no_such_user(); + return; } $user = User::staticGet($profile->id); if (!$user) { $this->no_such_user(); + return; } - $page = $this->arg('page') || 1; - common_show_header($profile->nickname . ": " . _t('Subscribers'), + common_show_header($profile->nickname . ": " . $this->gallery_type(), NULL, $profile, array($this, 'show_top')); - $this->show_subscribed($profile, $page); + $this->show_gallery($profile, $page); common_show_footer(); } - function show_top($profile) { - $user = common_current_user(); - common_element('p', 'instructions', - _t('These are the people who listen to ') . - (($user && ($user->id == $profile->id)) ? _t('your notices.') : ($profile->nickname . _t('\'s notices.')))); + function no_such_user() { + $this->client_error(_t('No such user.')); } + + function show_top($profile) { + common_element('p', 'instructions', + $this->get_instructions($profile)); + } + + function show_gallery($profile, $page) { - function show_subscribed($profile, $page) { - global $config; + $subs = new Subscription(); + + $this->define_subs($subs, $profile); - $subs = DB_DataObject::factory('subscription'); - $subs->subscribed = $profile->id; - $subs->orderBy('created DESC'); # We ask for an extra one to know if we need to do another page - $subs->limit((($page-1)*SUBSCRIPTIONS_PER_PAGE), SUBSCRIPTIONS_PER_PAGE + 1); + $subs->limit((($page-1)*AVATARS_PER_PAGE), AVATARS_PER_PAGE + 1); $subs_count = $subs->find(); - common_element_start('div', 'subscriptions'); + common_element_start('div', $this->div_class()); $idx = 0; while ($subs->fetch()) { + $idx++; - $other = Profile::staticGet($subs->subscriber); + $other = Profile::staticGet($subs->subscribed); common_element_start('a', array('title' => ($other->fullname) ? $other->fullname : @@ -84,25 +84,47 @@ class SubscribedAction extends Action { 'href' => $other->profileurl, 'class' => 'subscription')); $avatar = $other->getAvatar(AVATAR_STREAM_SIZE); - common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE)), - 'width' => AVATAR_STREAM_SIZE, - 'height' => AVATAR_STREAM_SIZE, - 'class' => 'avatar stream', - 'alt' => ($other->fullname) ? - $other->fullname : - $other->nickname)); + common_element('img', + array('src' => + (($avatar) ? $avatar->url : + common_default_avatar(AVATAR_STREAM_SIZE)), + 'width' => AVATAR_STREAM_SIZE, + 'height' => AVATAR_STREAM_SIZE, + 'class' => 'avatar stream', + 'alt' => ($other->fullname) ? + $other->fullname : + $other->nickname)); common_element_end('a'); # XXX: subscribe form here - if ($idx == SUBSCRIPTIONS_PER_PAGE) { + if ($idx == AVATARS_PER_PAGE) { break; } } common_element_end('div'); - common_pagination($page > 1, $subs_count > SUBSCRIPTIONS_PER_PAGE, - $page, 'subscribed', array('nickname' => $profile->nickname)); + common_pagination($page > 1, + $subs_count > AVATARS_PER_PAGE, + $page, + $this->trimmed('action'), + array('nickname' => $profile->nickname)); + } + + function gallery_type() { + return NULL; + } + + function get_instructions(&$profile) { + return NULL; + } + + function define_subs(&$subs, &$profile) { + return; + } + + function div_class() { + return ''; } } \ No newline at end of file