From bfcd3e087980e48b5b908fd30cf2e9b1aa3726e4 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 25 May 2010 07:39:47 -0400
Subject: Updated the RSS for language file and added files missing from
 previous commits

---
 views/opensearch_rss/page_shells/default.php | 8 +++-----
 views/opensearch_rss/search/listing.php      | 1 -
 views/xml/opensearch/description.php         | 6 +++---
 3 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'views')

diff --git a/views/opensearch_rss/page_shells/default.php b/views/opensearch_rss/page_shells/default.php
index 52aa8854c..e9510e9da 100644
--- a/views/opensearch_rss/page_shells/default.php
+++ b/views/opensearch_rss/page_shells/default.php
@@ -12,9 +12,9 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
 // Set title
 $search_terms = get_input('q');
 $title = $vars['config']->sitename;
-$title .= " Search: $search_terms";
+$title .= ' ' . sprintf(elgg_echo('opensearch:title'), $search_terms);
 
-$description = "Search results for \"$search_terms\"";
+$description = sprintf(elgg_echo('opensearch:description'), $search_terms);
 
 // Remove viewtype from URL
 $search_url = str_replace('&view=opensearch_rss','', full_url());
@@ -29,10 +29,8 @@ $os_url = "{$vars['url']}pg/opensearch/osd.xml";
 	<link><?php echo $search_url; ?></link>
 	<description><?php echo $description; ?></description>
 	<opensearch:totalResults><?php echo $OPEN_SEARCH_COUNT; ?></opensearch:totalResults>
-	<opensearch:startIndex>1</opensearch:startIndex>
-	<opensearch:itemsPerPage>10</opensearch:itemsPerPage>
 	<atom:link rel="search" type="application/opensearchdescription+xml" href="<?php echo $os_url; ?>"/>
-	<opensearch:Query role="request" searchTerms="<?php echo $search_terms; ?>" startPage="1" />
+	<opensearch:Query role="request" searchTerms="<?php echo addslashes($search_terms); ?>" startPage="1" />
 <?php
 
 		echo $vars['body'];
diff --git a/views/opensearch_rss/search/listing.php b/views/opensearch_rss/search/listing.php
index 367bf332f..219462976 100644
--- a/views/opensearch_rss/search/listing.php
+++ b/views/opensearch_rss/search/listing.php
@@ -7,7 +7,6 @@ if (!isset($OPEN_SEARCH_COUNT)) {
 
 $OPEN_SEARCH_COUNT += $vars['results']['count'];
 
-//var_dump($vars['results']);
 
 elgg_set_viewtype('rss');
 $entities = $vars['results']['entities'];
diff --git a/views/xml/opensearch/description.php b/views/xml/opensearch/description.php
index f8eb0b040..a77701d46 100644
--- a/views/xml/opensearch/description.php
+++ b/views/xml/opensearch/description.php
@@ -16,7 +16,7 @@ extract($config);
 $site = get_entity($CONFIG->site_guid);
 $email = $site->email;
 
-$rss_url = "{$vars['url']}pg/opensearch/?q={searchTerms}&amp;pw={startPage?}&amp;format=rss";
+$rss_url = "{$vars['url']}pg/search/?q={searchTerms}&amp;view=opensearch_rss";
 $html_url = "{$vars['url']}pg/search/?q={searchTerms}";
 
 ?>
@@ -27,8 +27,8 @@ $html_url = "{$vars['url']}pg/search/?q={searchTerms}";
    <LongName><?php echo $longname; ?></LongName>
 <?php endif; ?>
    <Contact><?php echo $site->email; ?></Contact>
-   <Url type="text/html" indexOffset="0" template="<?php echo $html_url; ?>"/>
-   <Url type="application/rss+xml" indexOffset="0" template="<?php echo $rss_url; ?>"/>
+   <Url type="text/html" template="<?php echo $html_url; ?>"/>
+   <Url type="application/rss+xml" template="<?php echo $rss_url; ?>"/>
 <?php if (isset($ico)): ?>
    <Image height="16" width="16" type="image/vnd.microsoft.icon"><?php echo "{$vars['url']}$ico"; ?></Image>
 <?php endif; ?>
-- 
cgit v1.2.3