wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-02-11 09:54:23 -05:00
commit 26b0bc3aab
2 changed files with 63 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
actions/noticesearch.php
View File

@ -78,6 +78,62 @@ class NoticesearchAction extends SearchAction
return _('Text search'); return _('Text search');
} }
function showExportData()
{
$q = $this->trimmed('q');
if (!$q) {
return;
}
$fl = new FeedList($this);
$fl->show(array(0 => array('href' => common_local_url('noticesearchrss', array('q' => $q)),
'type' => 'rss',
'version' => 'RSS 1.0',
'item' => 'noticesearchrss')));
}
function showFeeds()
{
$q = $this->trimmed('q');
if (!$q) {
return;
}
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('noticesearchrss',
array('q' => $q)),
'type' => 'application/rss+xml',
'title' => _('Search Stream Feed')));
}
/**
* Show header
*
* @param array $arr array containing the query
*
* @return void
*/
function extraHead2()
{
$q = $this->trimmed('q');
if ($q) {
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('noticesearchrss',
array('q' => $q)),
'type' => 'application/rss+xml',
'title' => _('Search Stream Feed')));
}
}
/** /**
* Show results * Show results
* *
@ -119,26 +175,6 @@ class NoticesearchAction extends SearchAction
$page, 'noticesearch', array('q' => $q)); $page, 'noticesearch', array('q' => $q));
} }
/**
* Show header
*
* @param array $arr array containing the query
*
* @return void
*/
function extraHead()
{
$q = $this->trimmed('q');
if ($q) {
$this->element('link', array('rel' => 'alternate',
'href' => common_local_url('noticesearchrss',
array('q' => $q)),
'type' => 'application/rss+xml',
'title' => _('Search Stream Feed')));
}
}
/** /**
* Show notice * Show notice
* *

7
lib/feedlist.php
View File

@ -112,6 +112,13 @@ class FeedList extends Widget
$feed['textContent'] = "Atom"; $feed['textContent'] = "Atom";
break; break;
case 'noticesearchrss':
$feed_classname = $feed['type'];
$feed_mimetype = "application/".$feed['type']."+xml";
$feed_title = $feed['version']." feed for this notice search";
$feed['textContent'] = "RSS";
break;
case 'tagrss': case 'tagrss':
$feed_classname = $feed['type']; $feed_classname = $feed['type'];
$feed_mimetype = "application/".$feed['type']."+xml"; $feed_mimetype = "application/".$feed['type']."+xml";