GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

This commit is contained in:
Evan Prodromou 2009-01-25 18:07:55 +01:00
parent 0d34cd24ab 688d38b101
commit f06d5eff10
2 changed files with 40 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
actions/peopletag.php
View File

@ -19,40 +19,37 @@
if (!defined('LACONICA')) { exit(1); }
require_once(INSTALLDIR.'/lib/profilelist.php');
require_once INSTALLDIR.'/lib/profilelist.php';
class PeopletagAction extends Action
{
var $tag = null;
var $page = null;
function handle($args)
{
parent::handle($args);
$tag = $this->trimmed('tag');
parent::handle($args);
if (!common_valid_profile_tag($tag)) {
$this->clientError(sprintf(_('Not a valid people tag: %s'), $tag));
parent::prepare($args);
$this->tag = $this->trimmed('tag');
if (!common_valid_profile_tag($this->tag)) {
$this->clientError(sprintf(_('Not a valid people tag: %s'), $this->tag));
return;
}
$page = $this->trimmed('page');
if (!$page) {
$page = 1;
$this->page = $this->trimmed('page');
if (!$this->page) {
$this->page = 1;
}
# Looks like we're good; show the header
common_show_header(sprintf(_('Users self-tagged with %s - page %d'), $tag, $page),
null, $tag, array($this, 'show_top'));
$this->show_people($tag, $page);
common_show_footer();
$this->showPage();
}
function show_people($tag, $page)
function showContent()
{
$profile = new Profile();
@ -68,42 +65,28 @@ class PeopletagAction extends Action
# XXX: memcached this
$profile->query(sprintf('SELECT profile.* ' .
'FROM profile JOIN profile_tag ' .
'ON profile.id = profile_tag.tagger ' .
'WHERE profile_tag.tagger = profile_tag.tagged ' .
'AND tag = "%s" ' .
'ORDER BY profile_tag.modified DESC ' .
$lim, $tag));
$pl = new ProfileList($profile);
$cnt = $pl->show_list();
$qry = 'SELECT profile.* ' .
'FROM profile JOIN profile_tag ' .
'ON profile.id = profile_tag.tagger ' .
'WHERE profile_tag.tagger = profile_tag.tagged ' .
'AND tag = "%s" ' .
'ORDER BY profile_tag.modified DESC';
common_pagination($page > 1,
$profile->query(sprintf($qry, $this->tag, $lim));
$pl = new ProfileList($profile, null, $this);
$cnt = $pl->show();
$this->pagination($this->page > 1,
$cnt > PROFILES_PER_PAGE,
$page,
$this->page,
$this->trimmed('action'),
array('tag' => $tag));
array('tag' => $this->tag));
}
function show_top($tag)
function title()
{
$instr = sprintf(_('These are users who have tagged themselves "%s" ' .
'to show a common interest, characteristic, hobby or job.'), $tag);
$this->elementStart('div', 'instructions');
$this->elementStart('p');
$this->text($instr);
$this->elementEnd('p');
$this->elementEnd('div');
}
function get_title()
{
return null;
}
function show_header($arr)
{
return;
return sprintf( _('Users self-tagged with %s - page %d'), $this->tag, $this->page);
}
}

10
lib/rssaction.php
View File

@ -178,11 +178,11 @@ class Rss10Action extends Action
$image = $this->getImage();
if ($image) {
$channel = $this->getChannel();
common_element_start('image', array('rdf:about' => $image));
common_element('title', null, $channel['title']);
common_element('link', null, $channel['link']);
common_element('url', null, $image);
common_element_end('image');
$this->elementStart('image', array('rdf:about' => $image));
$this->element('title', null, $channel['title']);
$this->element('link', null, $channel['link']);
$this->element('url', null, $image);
$this->elementEnd('image');
}
}