From 6d496263bbcc662282a059aee76d74784ac44479 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 23 May 2010 19:37:12 -0400
Subject: First version of an OpenSearch endpoint for Elgg

---
 config.ini.sample                            | 45 ++++++++++++++++++++++
 manifest.xml                                 | 10 +++++
 start.php                                    | 47 +++++++++++++++++++++++
 views/default/opensearch/includes.php        |  7 ++++
 views/opensearch_rss/page_shells/default.php | 42 ++++++++++++++++++++
 views/opensearch_rss/search/layout.php       |  2 +
 views/opensearch_rss/search/listing.php      | 25 ++++++++++++
 views/xml/opensearch/description.php         | 57 ++++++++++++++++++++++++++++
 8 files changed, 235 insertions(+)
 create mode 100644 config.ini.sample
 create mode 100644 manifest.xml
 create mode 100644 start.php
 create mode 100644 views/default/opensearch/includes.php
 create mode 100644 views/opensearch_rss/page_shells/default.php
 create mode 100644 views/opensearch_rss/search/layout.php
 create mode 100644 views/opensearch_rss/search/listing.php
 create mode 100644 views/xml/opensearch/description.php

diff --git a/config.ini.sample b/config.ini.sample
new file mode 100644
index 000000000..770023186
--- /dev/null
+++ b/config.ini.sample
@@ -0,0 +1,45 @@
+; OpenSearch configuration
+
+; ShortName
+; Contains a brief human-readable title that identifies this search engine.
+; 16 characters or less of plain text.
+; Required
+shortname = "Elgg"
+
+; Description
+; Contains a human-readable text description of the search engine.
+; 1024 characters or less of plain text.
+; Required
+description	= "Elgg search engine"
+
+; LongName
+; Contains an extended human-readable title that identifies this search engine.
+; 48 characters or less of plain text.
+;longname = ""
+
+; Image
+; Contains a URL that identifies the location of an image that can be used
+; in association with this search content. Can be either a 16x16 ico or
+; 64x64 png or both. Clients will choose the image that best fits the
+; display area. The value should be relative to your Elgg root.
+ico = "_graphics/favicon.ico"
+;png = ""
+
+; Tags
+; Contains a set of words that are used as keywords to identify and categorize
+; this search content. Tags must be a single word and are delimited by the
+; space character (' ').
+; 256 characters or less, space delimited tags
+;tags = "test search elgg"
+
+; Language
+; Contains a string that indicates that the search engine supports search
+; results in the specified language.
+; * or codes according to XML 1.0 Language Identification
+lang[] = "en-us"
+
+; Query
+; Test query available to clients.
+; Clients can submit this as a test query to ensure that the OpenSearch
+; interface works.
+;query = "test"
diff --git a/manifest.xml b/manifest.xml
new file mode 100644
index 000000000..0038dc168
--- /dev/null
+++ b/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Cash Costello" />
+	<field key="version" value="1.0" />
+	<field key="description" value="OpenSearch plugin" />
+	<field key="website" value="" />
+	<field key="copyright" value="" />
+	<field key="licence" value="GNU Public License version 2" />
+	<field key="elgg_version" value="2010030101" />
+</plugin_manifest>
diff --git a/start.php b/start.php
new file mode 100644
index 000000000..015fd3b1e
--- /dev/null
+++ b/start.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * OpenSearch plugin
+ *
+ * http://www.opensearch.org/Home
+ *
+ * @author Cash Costello
+ * @license http://opensource.org/licenses/gpl-2.0.php GPL 2
+ */
+
+register_elgg_event_handler('init', 'system', 'opensearch_init');
+
+function opensearch_init() {
+	global $CONFIG;
+
+	register_page_handler('opensearch', 'opensearch_handler');
+
+	elgg_extend_view('metatags', 'opensearch/includes');
+}
+
+/**
+ * Handles OpenSearch requests
+ *
+ * @param array $page An array of URL elements
+ * @return boolean
+ */
+function opensearch_handler($page) {
+	global $CONFIG;
+
+	// file path to the page scripts
+	$base_path = $CONFIG->pluginspath . 'opensearch';
+
+	if (!isset($page[0])) {
+		require "$base_path/search.php";
+		return TRUE;
+	}
+
+	// select page based on first URL element after /pg/hello/
+	switch ($page[0]) {
+		case 'osd.xml':
+			elgg_set_viewtype('xml');
+			page_draw('', elgg_view('opensearch/description'));
+			return TRUE;
+			break;
+	}
+
+}
diff --git a/views/default/opensearch/includes.php b/views/default/opensearch/includes.php
new file mode 100644
index 000000000..57e56723f
--- /dev/null
+++ b/views/default/opensearch/includes.php
@@ -0,0 +1,7 @@
+<?php
+
+$url = "{$vars['url']}pg/opensearch/osd.xml";
+$title = $vars['config']->sitename;
+?>
+
+<link rel="search" type="application/opensearchdescription+xml" href="<?php echo $url; ?>" title="<?php echo $title; ?>" />
diff --git a/views/opensearch_rss/page_shells/default.php b/views/opensearch_rss/page_shells/default.php
new file mode 100644
index 000000000..52aa8854c
--- /dev/null
+++ b/views/opensearch_rss/page_shells/default.php
@@ -0,0 +1,42 @@
+<?php
+
+global $OPEN_SEARCH_COUNT;
+
+header("Content-Type: application/rss+xml");
+
+// allow caching as required by stupid MS products for https feeds.
+header('Pragma: public', TRUE);
+
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+
+// Set title
+$search_terms = get_input('q');
+$title = $vars['config']->sitename;
+$title .= " Search: $search_terms";
+
+$description = "Search results for \"$search_terms\"";
+
+// Remove viewtype from URL
+$search_url = str_replace('&view=opensearch_rss','', full_url());
+
+$os_url = "{$vars['url']}pg/opensearch/osd.xml";
+
+
+?>
+<rss version="2.0" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+	<title><?php echo $title; ?></title>
+	<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" />
+<?php
+
+		echo $vars['body'];
+
+?>
+</channel>
+</rss>
diff --git a/views/opensearch_rss/search/layout.php b/views/opensearch_rss/search/layout.php
new file mode 100644
index 000000000..4cd2ff050
--- /dev/null
+++ b/views/opensearch_rss/search/layout.php
@@ -0,0 +1,2 @@
+<?php
+echo $vars['body'];
\ No newline at end of file
diff --git a/views/opensearch_rss/search/listing.php b/views/opensearch_rss/search/listing.php
new file mode 100644
index 000000000..367bf332f
--- /dev/null
+++ b/views/opensearch_rss/search/listing.php
@@ -0,0 +1,25 @@
+<?php
+
+global $OPEN_SEARCH_COUNT;
+if (!isset($OPEN_SEARCH_COUNT)) {
+	$OPEN_SEARCH_COUNT = 0;
+}
+
+$OPEN_SEARCH_COUNT += $vars['results']['count'];
+
+//var_dump($vars['results']);
+
+elgg_set_viewtype('rss');
+$entities = $vars['results']['entities'];
+foreach ($entities as $entity) {
+	if ($view = search_get_search_view($vars['params'], 'entity')) {
+		$body .= elgg_view($view, array(
+			'entity' => $entity,
+			'params' => $vars['params'],
+			'results' => $vars['results']
+		));
+	}
+}
+elgg_set_viewtype('opensearch_rss');
+
+echo $body;
\ No newline at end of file
diff --git a/views/xml/opensearch/description.php b/views/xml/opensearch/description.php
new file mode 100644
index 000000000..f8eb0b040
--- /dev/null
+++ b/views/xml/opensearch/description.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Creates an OpenSearch description document from config.ini
+ * http://www.opensearch.org/Specifications/OpenSearch/1.1
+ */
+
+$config_ini = dirname(dirname(dirname(dirname(__FILE__)))) . '/config.ini';
+$config = parse_ini_file($config_ini);
+if ($config == FALSE) {
+	elgg_log("Unable to parse OpenSearch config file", 'ERROR');
+	return TRUE;
+}
+
+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";
+$html_url = "{$vars['url']}pg/search/?q={searchTerms}";
+
+?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+   <ShortName><?php echo $shortname; ?></ShortName>
+   <Description><?php echo $description; ?></Description>
+<?php if (isset($longname)): ?>
+   <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; ?>"/>
+<?php if (isset($ico)): ?>
+   <Image height="16" width="16" type="image/vnd.microsoft.icon"><?php echo "{$vars['url']}$ico"; ?></Image>
+<?php endif; ?>
+<?php if (isset($png)): ?>
+   <Image height="64" width="64" type="image/png"><?php echo "{$vars['url']}$png"; ?></Image>
+<?php endif; ?>
+<?php if (isset($tags)): ?>
+   <Tags><?php echo $tags; ?></Tags>
+<?php endif; ?>
+<?php if (isset($query)): ?>
+   <Query role="example" searchTerms="<?php echo $query; ?>" />
+<?php endif; ?>
+<?php
+if (isset($lang)):
+	foreach ($lang as $language):
+?>
+   <Language><?php echo $language; ?></Language>
+<?php
+	endforeach;
+endif;
+?>
+   <SyndicationRight>open</SyndicationRight>
+   <AdultContent>false</AdultContent>
+   <OutputEncoding>UTF-8</OutputEncoding>
+   <InputEncoding>UTF-8</InputEncoding>
+ </OpenSearchDescription>
-- 
cgit v1.2.3


From 4d80af63de9125eda856652ee92cbd1e01afff51 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 23 May 2010 20:36:15 -0400
Subject: Added README

---
 README | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 000000000..1725196a6
--- /dev/null
+++ b/README
@@ -0,0 +1,14 @@
+OpenSearch endpoint for Elgg
+
+INSTALL
+Rename config.ini.sample to config.ini
+Edit config.ini to reflect your site
+Activate the plugin
+
+USAGE
+Adds an OpenSearch description definition to the html head. Browsers
+will pick this up and allow you to add site specific search to your 
+search bar.
+
+The plugin also provides an RSS 2.0 feed that conforms to the OpenSearch
+standard. 
-- 
cgit v1.2.3


From adb7af64321c8a80744ac0eaa870fdb38630294d Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 25 May 2010 07:07:22 -0400
Subject: OpenSearch RSS feed working with Elgg 1.7

---
 views/opensearch_rss/pageshells/pageshell.php | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 views/opensearch_rss/pageshells/pageshell.php

diff --git a/views/opensearch_rss/pageshells/pageshell.php b/views/opensearch_rss/pageshells/pageshell.php
new file mode 100644
index 000000000..f883f236a
--- /dev/null
+++ b/views/opensearch_rss/pageshells/pageshell.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * To support Elgg 1.7
+ */
+
+require_once(dirname(dirname(__FILE__)) . "/page_shells/default.php");
-- 
cgit v1.2.3


From a19ccb50eed9be0aab45cb72ee367fb3cbd47ab2 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Tue, 25 May 2010 07:29:50 -0400
Subject: added language file

---
 languages/en.php | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 languages/en.php

diff --git a/languages/en.php b/languages/en.php
new file mode 100644
index 000000000..c0b3e5bf5
--- /dev/null
+++ b/languages/en.php
@@ -0,0 +1,9 @@
+<?php
+
+$english = array(
+	'opensearch:title' => "Search: %s",
+	'opensearch:description' => "Search results for \"%s\"",
+	
+);
+
+add_translation("en", $english);
-- 
cgit v1.2.3


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

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

diff --git a/manifest.xml b/manifest.xml
index 0038dc168..a8733595b 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -3,8 +3,8 @@
 	<field key="author" value="Cash Costello" />
 	<field key="version" value="1.0" />
 	<field key="description" value="OpenSearch plugin" />
-	<field key="website" value="" />
-	<field key="copyright" value="" />
+	<field key="website" value="http://cashcostello.com/blog/" />
+	<field key="copyright" value="Cash Costello 2010" />
 	<field key="licence" value="GNU Public License version 2" />
 	<field key="elgg_version" value="2010030101" />
 </plugin_manifest>
diff --git a/start.php b/start.php
index 015fd3b1e..7adc0f733 100644
--- a/start.php
+++ b/start.php
@@ -27,15 +27,6 @@ function opensearch_init() {
 function opensearch_handler($page) {
 	global $CONFIG;
 
-	// file path to the page scripts
-	$base_path = $CONFIG->pluginspath . 'opensearch';
-
-	if (!isset($page[0])) {
-		require "$base_path/search.php";
-		return TRUE;
-	}
-
-	// select page based on first URL element after /pg/hello/
 	switch ($page[0]) {
 		case 'osd.xml':
 			elgg_set_viewtype('xml');
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


From 98acc22fec2dc7942e5c6e5bcdd2e6a356c6e905 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 4 Jul 2010 13:44:09 -0400
Subject: added fix for IE8

---
 views/xml/opensearch/description.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/xml/opensearch/description.php b/views/xml/opensearch/description.php
index a77701d46..221cb768e 100644
--- a/views/xml/opensearch/description.php
+++ b/views/xml/opensearch/description.php
@@ -4,6 +4,10 @@
  * http://www.opensearch.org/Specifications/OpenSearch/1.1
  */
 
+// reset cache headers because IE8 is stupid
+header('Pragma: public', TRUE);
+header('Cache-Control: public', TRUE);
+
 $config_ini = dirname(dirname(dirname(dirname(__FILE__)))) . '/config.ini';
 $config = parse_ini_file($config_ini);
 if ($config == FALSE) {
-- 
cgit v1.2.3


From c4ed70ad4cf233f6091f6de22a5cfaf81ea88747 Mon Sep 17 00:00:00 2001
From: cash <cash.costello@gmail.com>
Date: Fri, 2 Dec 2011 22:05:50 -0500
Subject: Elgg 1.8 version

---
 README                                        | 16 +++++++---
 languages/en.php                              |  6 ++--
 manifest.xml                                  | 24 +++++++++------
 start.php                                     | 19 +++++-------
 views/default/opensearch/includes.php         |  7 +++--
 views/opensearch_rss/page/default.php         | 42 +++++++++++++++++++++++++++
 views/opensearch_rss/page/layouts/default.php |  5 ++++
 views/opensearch_rss/page_shells/default.php  | 40 -------------------------
 views/opensearch_rss/pageshells/pageshell.php |  6 ----
 views/opensearch_rss/search/layout.php        |  3 ++
 views/opensearch_rss/search/list.php          | 27 +++++++++++++++++
 views/opensearch_rss/search/listing.php       | 24 ---------------
 views/xml/opensearch/description.php          | 20 +++++++------
 13 files changed, 131 insertions(+), 108 deletions(-)
 create mode 100644 views/opensearch_rss/page/default.php
 create mode 100644 views/opensearch_rss/page/layouts/default.php
 delete mode 100644 views/opensearch_rss/page_shells/default.php
 delete mode 100644 views/opensearch_rss/pageshells/pageshell.php
 create mode 100644 views/opensearch_rss/search/list.php
 delete mode 100644 views/opensearch_rss/search/listing.php

diff --git a/README b/README
index 1725196a6..236ce9da2 100644
--- a/README
+++ b/README
@@ -1,14 +1,22 @@
 OpenSearch endpoint for Elgg
 
+OVERVIEW
+-------------
+OpenSearch is a standard for exposing the data in your website for search
+to browsers and other web sites. For more information on this technology, visit
+the Wikipedia page on OpenSearch at http://en.wikipedia.org/wiki/OpenSearch
+
 INSTALL
-Rename config.ini.sample to config.ini
-Edit config.ini to reflect your site
-Activate the plugin
+-------------
+ * Rename config.ini.sample to config.ini
+ * Edit config.ini to reflect your site
+ * Activate the plugin
 
 USAGE
+-------------
 Adds an OpenSearch description definition to the html head. Browsers
 will pick this up and allow you to add site specific search to your 
 search bar.
 
 The plugin also provides an RSS 2.0 feed that conforms to the OpenSearch
-standard. 
+standard.
diff --git a/languages/en.php b/languages/en.php
index c0b3e5bf5..011e5d0b5 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,9 +1,11 @@
 <?php
+/**
+ * OpenSearch English language file
+ */
 
 $english = array(
 	'opensearch:title' => "Search: %s",
-	'opensearch:description' => "Search results for \"%s\"",
-	
+	'opensearch:description' => "Search results for \"%s\"",	
 );
 
 add_translation("en", $english);
diff --git a/manifest.xml b/manifest.xml
index a8733595b..525027c63 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin_manifest>
-	<field key="author" value="Cash Costello" />
-	<field key="version" value="1.0" />
-	<field key="description" value="OpenSearch plugin" />
-	<field key="website" value="http://cashcostello.com/blog/" />
-	<field key="copyright" value="Cash Costello 2010" />
-	<field key="licence" value="GNU Public License version 2" />
-	<field key="elgg_version" value="2010030101" />
-</plugin_manifest>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>OpenSearch</name>
+	<author>Cash Costello</author>
+	<version>1.1</version>
+	<category>utility</category>
+	<category>search</category>
+	<description>OpenSearch integration</description>
+	<website>https://github.com/cash/opensearch</website>
+	<copyright>Cash Costello 2010-2011</copyright>
+	<license>GNU Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+</plugin_manifest>
\ No newline at end of file
diff --git a/start.php b/start.php
index 7adc0f733..88329c8d1 100644
--- a/start.php
+++ b/start.php
@@ -8,31 +8,26 @@
  * @license http://opensource.org/licenses/gpl-2.0.php GPL 2
  */
 
-register_elgg_event_handler('init', 'system', 'opensearch_init');
+elgg_register_event_handler('init', 'system', 'opensearch_init');
 
 function opensearch_init() {
-	global $CONFIG;
-
-	register_page_handler('opensearch', 'opensearch_handler');
-
-	elgg_extend_view('metatags', 'opensearch/includes');
+	elgg_register_page_handler('opensearch', 'opensearch_handler');
+	elgg_extend_view('page/elements/head', 'opensearch/includes');
 }
 
 /**
  * Handles OpenSearch requests
  *
  * @param array $page An array of URL elements
- * @return boolean
+ * @return bool
  */
 function opensearch_handler($page) {
-	global $CONFIG;
-
 	switch ($page[0]) {
 		case 'osd.xml':
 			elgg_set_viewtype('xml');
-			page_draw('', elgg_view('opensearch/description'));
-			return TRUE;
+			echo elgg_view_page('', elgg_view('opensearch/description'));
+			return true;
 			break;
 	}
-
+	return false;
 }
diff --git a/views/default/opensearch/includes.php b/views/default/opensearch/includes.php
index 57e56723f..6aceb45c2 100644
--- a/views/default/opensearch/includes.php
+++ b/views/default/opensearch/includes.php
@@ -1,7 +1,10 @@
 <?php
+/**
+ * OpenSearch head include
+ */
 
-$url = "{$vars['url']}pg/opensearch/osd.xml";
-$title = $vars['config']->sitename;
+$url = elgg_normalize_url('opensearch/osd.xml');
+$title = elgg_get_site_entity()->name;
 ?>
 
 <link rel="search" type="application/opensearchdescription+xml" href="<?php echo $url; ?>" title="<?php echo $title; ?>" />
diff --git a/views/opensearch_rss/page/default.php b/views/opensearch_rss/page/default.php
new file mode 100644
index 000000000..79cd544c4
--- /dev/null
+++ b/views/opensearch_rss/page/default.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Page shell for OpenSearch RSS feed
+ */
+
+global $OPEN_SEARCH_COUNT;
+
+header("Content-Type: application/rss+xml");
+
+// allow caching as required by stupid MS products for https feeds.
+header('Pragma: public', TRUE);
+
+echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+
+// Set title
+$search_terms = get_input('q');
+$title = elgg_get_site_entity()->name;
+$title .= ' ' . elgg_echo('opensearch:title', array($search_terms));
+
+$description = elgg_echo('opensearch:description', array($search_terms));
+
+// Remove viewtype from URL
+$search_url = str_replace('&view=opensearch_rss', '', full_url());
+
+$os_url = elgg_normalize_url('opensearch/osd.xml');
+
+?>
+<rss version="2.0" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
+<channel>
+	<title><?php echo $title; ?></title>
+	<link><?php echo $search_url; ?></link>
+	<description><?php echo $description; ?></description>
+	<opensearch:totalResults><?php echo $OPEN_SEARCH_COUNT; ?></opensearch:totalResults>
+	<atom:link rel="search" type="application/opensearchdescription+xml" href="<?php echo $os_url; ?>"/>
+	<opensearch:Query role="request" searchTerms="<?php echo addslashes($search_terms); ?>" startPage="1" />
+<?php
+
+		echo $vars['body'];
+
+?>
+</channel>
+</rss>
diff --git a/views/opensearch_rss/page/layouts/default.php b/views/opensearch_rss/page/layouts/default.php
new file mode 100644
index 000000000..488734f84
--- /dev/null
+++ b/views/opensearch_rss/page/layouts/default.php
@@ -0,0 +1,5 @@
+<?php
+/**
+ * OpenSearch RSS layout shell
+ */
+echo $vars['content'];
\ No newline at end of file
diff --git a/views/opensearch_rss/page_shells/default.php b/views/opensearch_rss/page_shells/default.php
deleted file mode 100644
index e9510e9da..000000000
--- a/views/opensearch_rss/page_shells/default.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-global $OPEN_SEARCH_COUNT;
-
-header("Content-Type: application/rss+xml");
-
-// allow caching as required by stupid MS products for https feeds.
-header('Pragma: public', TRUE);
-
-echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-
-// Set title
-$search_terms = get_input('q');
-$title = $vars['config']->sitename;
-$title .= ' ' . sprintf(elgg_echo('opensearch:title'), $search_terms);
-
-$description = sprintf(elgg_echo('opensearch:description'), $search_terms);
-
-// Remove viewtype from URL
-$search_url = str_replace('&view=opensearch_rss','', full_url());
-
-$os_url = "{$vars['url']}pg/opensearch/osd.xml";
-
-
-?>
-<rss version="2.0" xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/" xmlns:atom="http://www.w3.org/2005/Atom">
-<channel>
-	<title><?php echo $title; ?></title>
-	<link><?php echo $search_url; ?></link>
-	<description><?php echo $description; ?></description>
-	<opensearch:totalResults><?php echo $OPEN_SEARCH_COUNT; ?></opensearch:totalResults>
-	<atom:link rel="search" type="application/opensearchdescription+xml" href="<?php echo $os_url; ?>"/>
-	<opensearch:Query role="request" searchTerms="<?php echo addslashes($search_terms); ?>" startPage="1" />
-<?php
-
-		echo $vars['body'];
-
-?>
-</channel>
-</rss>
diff --git a/views/opensearch_rss/pageshells/pageshell.php b/views/opensearch_rss/pageshells/pageshell.php
deleted file mode 100644
index f883f236a..000000000
--- a/views/opensearch_rss/pageshells/pageshell.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-/**
- * To support Elgg 1.7
- */
-
-require_once(dirname(dirname(__FILE__)) . "/page_shells/default.php");
diff --git a/views/opensearch_rss/search/layout.php b/views/opensearch_rss/search/layout.php
index 4cd2ff050..d5bb9fe57 100644
--- a/views/opensearch_rss/search/layout.php
+++ b/views/opensearch_rss/search/layout.php
@@ -1,2 +1,5 @@
 <?php
+/**
+ * OpenSearch search layout
+ */
 echo $vars['body'];
\ No newline at end of file
diff --git a/views/opensearch_rss/search/list.php b/views/opensearch_rss/search/list.php
new file mode 100644
index 000000000..bc7b5574e
--- /dev/null
+++ b/views/opensearch_rss/search/list.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * OpenSearch serach results list
+ */
+
+global $OPEN_SEARCH_COUNT;
+if (!isset($OPEN_SEARCH_COUNT)) {
+	$OPEN_SEARCH_COUNT = 0;
+}
+
+$OPEN_SEARCH_COUNT += $vars['results']['count'];
+
+
+elgg_set_viewtype('rss');
+$entities = $vars['results']['entities'];
+foreach ($entities as $entity) {
+	if ($view = search_get_search_view($vars['params'], 'entity')) {
+		$body .= elgg_view($view, array(
+			'entity' => $entity,
+			'params' => $vars['params'],
+			'results' => $vars['results']
+		));
+	}
+}
+elgg_set_viewtype('opensearch_rss');
+
+echo $body;
\ No newline at end of file
diff --git a/views/opensearch_rss/search/listing.php b/views/opensearch_rss/search/listing.php
deleted file mode 100644
index 219462976..000000000
--- a/views/opensearch_rss/search/listing.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-global $OPEN_SEARCH_COUNT;
-if (!isset($OPEN_SEARCH_COUNT)) {
-	$OPEN_SEARCH_COUNT = 0;
-}
-
-$OPEN_SEARCH_COUNT += $vars['results']['count'];
-
-
-elgg_set_viewtype('rss');
-$entities = $vars['results']['entities'];
-foreach ($entities as $entity) {
-	if ($view = search_get_search_view($vars['params'], 'entity')) {
-		$body .= elgg_view($view, array(
-			'entity' => $entity,
-			'params' => $vars['params'],
-			'results' => $vars['results']
-		));
-	}
-}
-elgg_set_viewtype('opensearch_rss');
-
-echo $body;
\ No newline at end of file
diff --git a/views/xml/opensearch/description.php b/views/xml/opensearch/description.php
index 221cb768e..78aadc699 100644
--- a/views/xml/opensearch/description.php
+++ b/views/xml/opensearch/description.php
@@ -5,23 +5,25 @@
  */
 
 // reset cache headers because IE8 is stupid
-header('Pragma: public', TRUE);
-header('Cache-Control: public', TRUE);
+header('Pragma: public', true);
+header('Cache-Control: public', true);
 
 $config_ini = dirname(dirname(dirname(dirname(__FILE__)))) . '/config.ini';
 $config = parse_ini_file($config_ini);
-if ($config == FALSE) {
+if ($config == false) {
 	elgg_log("Unable to parse OpenSearch config file", 'ERROR');
-	return TRUE;
+	return true;
 }
 
 extract($config);
 
-$site = get_entity($CONFIG->site_guid);
+$site = elgg_get_site_entity();
 $email = $site->email;
 
-$rss_url = "{$vars['url']}pg/search/?q={searchTerms}&amp;view=opensearch_rss";
-$html_url = "{$vars['url']}pg/search/?q={searchTerms}";
+$rss_url = elgg_normalize_url('search/?q={searchTerms}&view=opensearch_rss');
+$rss_url = elgg_format_url($rss_url);
+$html_url = elgg_normalize_url('search/?q={searchTerms}');
+$site_url = elgg_get_site_url();
 
 ?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
@@ -34,10 +36,10 @@ $html_url = "{$vars['url']}pg/search/?q={searchTerms}";
    <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>
+   <Image height="16" width="16" type="image/vnd.microsoft.icon"><?php echo "{$site_url}$ico"; ?></Image>
 <?php endif; ?>
 <?php if (isset($png)): ?>
-   <Image height="64" width="64" type="image/png"><?php echo "{$vars['url']}$png"; ?></Image>
+   <Image height="64" width="64" type="image/png"><?php echo "{$site_url}$png"; ?></Image>
 <?php endif; ?>
 <?php if (isset($tags)): ?>
    <Tags><?php echo $tags; ?></Tags>
-- 
cgit v1.2.3


From 7f6149b755b42125e18b767c7a361132c7a2f8c9 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 30 Dec 2011 03:46:00 +0100
Subject: Added catalan, spanish, basque and polish languages.

---
 languages/ca.php | 11 +++++++++++
 languages/es.php | 11 +++++++++++
 languages/eu.php | 11 +++++++++++
 languages/pl.php | 11 +++++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 languages/ca.php
 create mode 100644 languages/es.php
 create mode 100644 languages/eu.php
 create mode 100755 languages/pl.php

diff --git a/languages/ca.php b/languages/ca.php
new file mode 100644
index 000000000..2e4dca2bc
--- /dev/null
+++ b/languages/ca.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * OpenSearch Catalan language file
+ */
+
+$catalan = array( 
+	'opensearch:title'  =>  "Cerca: %s" , 
+	'opensearch:description'  =>  "Resultats de la cerca \"%s\""
+); 
+
+add_translation('ca', $catalan); 
diff --git a/languages/es.php b/languages/es.php
new file mode 100644
index 000000000..ace043fad
--- /dev/null
+++ b/languages/es.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * OpenSearch Spanish language file
+ */
+
+$spanish = array( 
+	'opensearch:title'  =>  "Búsqueda: %s" , 
+	'opensearch:description'  =>  "Resultados de la búsqueda \"%s\""
+); 
+
+add_translation('es', $spanish); 
diff --git a/languages/eu.php b/languages/eu.php
new file mode 100644
index 000000000..151e5d906
--- /dev/null
+++ b/languages/eu.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * OpenSearch Basque language file
+ */
+
+$basque = array(
+	'opensearch:title' => "Bilatu: %s",
+	'opensearch:description' => "\"%s\" bilaketaren emaitak",
+);
+
+add_translation("eu", $basque);
diff --git a/languages/pl.php b/languages/pl.php
new file mode 100755
index 000000000..f73a1042d
--- /dev/null
+++ b/languages/pl.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * OpenSearch Polish language file
+ */
+
+$polish = array( 
+	'opensearch:title'  =>  "Szukaj: %s" , 
+	'opensearch:description'  =>  "Wyniki wyszukiwania dla \"%s\""
+); 
+
+add_translation('pl', $polish); 
-- 
cgit v1.2.3


From 7803f4e28220c11ce6250fbf28e93cd1411a6e48 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 30 Dec 2011 04:50:08 +0100
Subject: No more config file. Cofiguration is now set by settings.

---
 README                                        |  3 +-
 config.ini.sample                             | 45 -------------
 languages/en.php                              | 19 +++++-
 views/default/plugins/opensearch/settings.php | 97 +++++++++++++++++++++++++++
 views/xml/opensearch/description.php          | 42 +++++++-----
 5 files changed, 143 insertions(+), 63 deletions(-)
 delete mode 100644 config.ini.sample
 create mode 100644 views/default/plugins/opensearch/settings.php

diff --git a/README b/README
index 236ce9da2..a25a00c93 100644
--- a/README
+++ b/README
@@ -8,9 +8,8 @@ the Wikipedia page on OpenSearch at http://en.wikipedia.org/wiki/OpenSearch
 
 INSTALL
 -------------
- * Rename config.ini.sample to config.ini
- * Edit config.ini to reflect your site
  * Activate the plugin
+ * Edit OpenSearch settings in administration pages to reflect your site
 
 USAGE
 -------------
diff --git a/config.ini.sample b/config.ini.sample
deleted file mode 100644
index 770023186..000000000
--- a/config.ini.sample
+++ /dev/null
@@ -1,45 +0,0 @@
-; OpenSearch configuration
-
-; ShortName
-; Contains a brief human-readable title that identifies this search engine.
-; 16 characters or less of plain text.
-; Required
-shortname = "Elgg"
-
-; Description
-; Contains a human-readable text description of the search engine.
-; 1024 characters or less of plain text.
-; Required
-description	= "Elgg search engine"
-
-; LongName
-; Contains an extended human-readable title that identifies this search engine.
-; 48 characters or less of plain text.
-;longname = ""
-
-; Image
-; Contains a URL that identifies the location of an image that can be used
-; in association with this search content. Can be either a 16x16 ico or
-; 64x64 png or both. Clients will choose the image that best fits the
-; display area. The value should be relative to your Elgg root.
-ico = "_graphics/favicon.ico"
-;png = ""
-
-; Tags
-; Contains a set of words that are used as keywords to identify and categorize
-; this search content. Tags must be a single word and are delimited by the
-; space character (' ').
-; 256 characters or less, space delimited tags
-;tags = "test search elgg"
-
-; Language
-; Contains a string that indicates that the search engine supports search
-; results in the specified language.
-; * or codes according to XML 1.0 Language Identification
-lang[] = "en-us"
-
-; Query
-; Test query available to clients.
-; Clients can submit this as a test query to ensure that the OpenSearch
-; interface works.
-;query = "test"
diff --git a/languages/en.php b/languages/en.php
index 011e5d0b5..9a77f362b 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -5,7 +5,24 @@
 
 $english = array(
 	'opensearch:title' => "Search: %s",
-	'opensearch:description' => "Search results for \"%s\"",	
+	'opensearch:description' => "Search results for \"%s\"",
+	'opensearch:engine' => "%s Search Engine",
+	
+	'opensearh:settings:shortname' => "Short name",
+	'opensearh:settings:desc' => "Description",
+	'opensearh:settings:longname' => "Long name",
+	'opensearh:settings:icon' => "Icon",
+	'opensearh:settings:tags' => "Tags",
+	'opensearh:settings:lang' => "Language",
+	'opensearh:settings:query' => "Query",
+	'opensearh:settings:shortname:description' => "Contains a brief human-readable title that identifies this search engine. 16 characters or less of plain text. <strong>Required</strong>",
+	'opensearh:settings:desc:description' => "Contains a human-readable text description of the search engine. 1024 characters or less of plain text. <strong>Required</strong>",
+	'opensearh:settings:longname:description' => "Contains an extended human-readable title that identifies this search engine. 48 characters or less of plain text.",
+	'opensearh:settings:icon:description' => "Contains a URL that identifies the location of an image that can be used in association with this search content. Can be either a 16x16 ico or 64x64 png or both. Clients will choose the image that best fits the display area. The value should be relative to your Elgg root.",
+	'opensearh:settings:tags:description' => "Contains a set of words that are used as keywords to identify and categorize this search content. Tags must be a single word and are delimited by the space character (' '). 256 characters or less, space delimited tags",
+	'opensearh:settings:lang:description' => "Contains a string that indicates that the search engine supports search results in the specified language. * or codes according to XML 1.0 Language Identification",
+	'opensearh:settings:query:description' => "Test query available to clients. Clients can submit this as a test query to ensure that the OpenSearch interface works.",
+	
 );
 
 add_translation("en", $english);
diff --git a/views/default/plugins/opensearch/settings.php b/views/default/plugins/opensearch/settings.php
new file mode 100644
index 000000000..23ba19538
--- /dev/null
+++ b/views/default/plugins/opensearch/settings.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Opensearch plugin settings
+ */
+
+// set default value
+if (!isset($vars['entity']->shortname)) {
+	$vars['entity']->shortname = elgg_get_site_entity()->name;
+}
+if (!isset($vars['entity']->desc)) {
+	$vars['entity']->desc = elgg_echo('opensearch:engine', array(elgg_get_site_entity()->name));
+}
+if (!isset($vars['entity']->longname)) {
+	$vars['entity']->longname = elgg_get_site_entity()->description;
+}
+if (!isset($vars['entity']->icon)) {
+	$vars['entity']->icon = '_graphics/favicon.ico';
+}
+if (!isset($vars['entity']->tags)) {
+	$vars['entity']->tags = '';
+}
+if (!isset($vars['entity']->lang)) {
+	$vars['entity']->lang = 'en-us';
+}
+if (!isset($vars['entity']->query)) {
+	$vars['entity']->query = '';
+}
+
+echo '<div>';
+echo '<label>'.elgg_echo('opensearh:settings:shortname').'</label> ';
+echo elgg_echo('opensearh:settings:shortname:description');
+echo ' ';
+echo elgg_view('input/text', array(
+	'name' => 'params[shortname]',
+	'value' => $vars['entity']->shortname,
+));
+echo '</div>';
+
+echo '<div>';
+echo '<label>'.elgg_echo('opensearh:settings:desc').'</label> ';
+echo elgg_echo('opensearh:settings:desc:description');
+echo ' ';
+echo elgg_view('input/text', array(
+	'name' => 'params[desc]',
+	'value' => $vars['entity']->desc,
+));
+echo '</div>';
+
+echo '<div>';
+echo '<label>'.elgg_echo('opensearh:settings:longname').'</label> ';
+echo elgg_echo('opensearh:settings:longname:description');
+echo ' ';
+echo elgg_view('input/text', array(
+	'name' => 'params[longname]',
+	'value' => $vars['entity']->longname,
+));
+echo '</div>';
+
+echo '<div>';
+echo '<label>'.elgg_echo('opensearh:settings:icon').'</label> ';
+echo elgg_echo('opensearh:settings:icon:description');
+echo ' ';
+echo elgg_view('input/text', array(
+	'name' => 'params[icon]',
+	'value' => $vars['entity']->icon,
+));
+echo '</div>';
+
+echo '<div>';
+echo '<label>'.elgg_echo('opensearh:settings:tags').'</label> ';
+echo elgg_echo('opensearh:settings:tags:description');
+echo ' ';
+echo elgg_view('input/text', array(
+	'name' => 'params[tags]',
+	'value' => $vars['entity']->tags,
+));
+echo '</div>';
+
+echo '<div>';
+echo '<label>'.elgg_echo('opensearh:settings:lang').'</label> ';
+echo elgg_echo('opensearh:settings:lang:description');
+echo ' ';
+echo elgg_view('input/text', array(
+	'name' => 'params[lang]',
+	'value' => $vars['entity']->lang,
+));
+echo '</div>';
+
+echo '<div>';
+echo '<label>'.elgg_echo('opensearh:settings:query').'</label> ';
+echo elgg_echo('opensearh:settings:query:description');
+echo ' ';
+echo elgg_view('input/text', array(
+	'name' => 'params[query]',
+	'value' => $vars['entity']->query,
+));
+echo '</div>';
diff --git a/views/xml/opensearch/description.php b/views/xml/opensearch/description.php
index 78aadc699..586cadf83 100644
--- a/views/xml/opensearch/description.php
+++ b/views/xml/opensearch/description.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Creates an OpenSearch description document from config.ini
+ * Creates an OpenSearch description document from plugin settings
  * http://www.opensearch.org/Specifications/OpenSearch/1.1
  */
 
@@ -8,18 +8,31 @@
 header('Pragma: public', true);
 header('Cache-Control: public', true);
 
-$config_ini = dirname(dirname(dirname(dirname(__FILE__)))) . '/config.ini';
-$config = parse_ini_file($config_ini);
-if ($config == false) {
-	elgg_log("Unable to parse OpenSearch config file", 'ERROR');
-	return true;
-}
-
-extract($config);
-
 $site = elgg_get_site_entity();
 $email = $site->email;
 
+$shortname = elgg_get_plugin_setting('shortname', 'opensearch');
+$description = elgg_get_plugin_setting('desc', 'opensearch');
+$longname = elgg_get_plugin_setting('longname', 'opensearch');
+$icon = elgg_get_plugin_setting('icon', 'opensearch');
+$tags = elgg_get_plugin_setting('tags', 'opensearch');
+$lang = string_to_tag_array(elgg_get_plugin_setting('lang', 'opensearch'));
+$query = elgg_get_plugin_setting('query', 'opensearch');
+
+if (empty($shortname)) {
+	$shortname = $site->name;
+}
+if (empty($description)) {
+	$description = elgg_echo('opensearch:engine', array(elgg_get_site_entity()->name));
+}
+if (empty($icon)) {
+	$icon = '_graphics/favicon.ico';
+}
+if (empty($lang)) {
+	$lang = 'en-us';
+}
+
+
 $rss_url = elgg_normalize_url('search/?q={searchTerms}&view=opensearch_rss');
 $rss_url = elgg_format_url($rss_url);
 $html_url = elgg_normalize_url('search/?q={searchTerms}');
@@ -35,11 +48,10 @@ $site_url = elgg_get_site_url();
    <Contact><?php echo $site->email; ?></Contact>
    <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 "{$site_url}$ico"; ?></Image>
-<?php endif; ?>
-<?php if (isset($png)): ?>
-   <Image height="64" width="64" type="image/png"><?php echo "{$site_url}$png"; ?></Image>
+<?php if (preg_match("/.ico$/", $icon)): ?>
+   <Image height="16" width="16" type="image/vnd.microsoft.icon"><?php echo "{$site_url}$icon"; ?></Image>
+<?php elseif (preg_match("/.png$/", $icon)): ?>
+   <Image height="64" width="64" type="image/png"><?php echo "{$site_url}$icon"; ?></Image>
 <?php endif; ?>
 <?php if (isset($tags)): ?>
    <Tags><?php echo $tags; ?></Tags>
-- 
cgit v1.2.3


From 9a4204b81ee84e1d23b0bc442932dc93da52bada Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 30 Dec 2011 05:09:36 +0100
Subject: Upgraded spanish language file.

---
 languages/es.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/languages/es.php b/languages/es.php
index ace043fad..07da82053 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -5,7 +5,24 @@
 
 $spanish = array( 
 	'opensearch:title'  =>  "Búsqueda: %s" , 
-	'opensearch:description'  =>  "Resultados de la búsqueda \"%s\""
+	'opensearch:description'  =>  "Resultados de la búsqueda \"%s\"",
+	'opensearch:engine' => "Motor de búsqueda de %s",
+	
+	'opensearh:settings:shortname' => "Nombre corto",
+	'opensearh:settings:desc' => "Descripción",
+	'opensearh:settings:longname' => "Nombre largo",
+	'opensearh:settings:icon' => "Icono",
+	'opensearh:settings:tags' => "Etiquetas",
+	'opensearh:settings:lang' => "Idioma",
+	'opensearh:settings:query' => "Petición",
+	'opensearh:settings:shortname:description' => "Contiene un título breve para este motor de búsqueda. 16 carácteres o menos de texto plano. <strong>Requerido</strong>",
+	'opensearh:settings:desc:description' => "Contiene una descripción del motor de búsqueda. 1024 carácteres o menos de texto plano. <strong>Requerido</strong>",
+	'opensearh:settings:longname:description' => "Contiene un título más largo para este motor de búsqueda. 48 carácteres o menos de texto plano.",
+	'opensearh:settings:icon:description' => "Contiene la URL de la localización de una imagen de icono. Puede ser un ico de 16x16 o un png 64x64 píxeles. El dirección debería ser relativa a la raíz de Elgg.",
+	'opensearh:settings:tags:description' => "Continene un conjunto de palabras usadas como palabras clave para identificar y categorizar este contenido de búsqueda. Las etiquetas deberían ser palabras simples y delimtadas por espacios (' '). 256 carácteres o menos, etiquetas delimitadas por espacios",
+	'opensearh:settings:lang:description' => "Contiene una cadena que indica que el motor de búsqueda soporta resultados de búsqueda en el idioma especificado. * o códigos acorde al XML 1.0 Language Identification",
+	'opensearh:settings:query:description' => "Petición de prueba disponible para clientes. Los clientes pueden enviarlo como petición de prueba para asegurarse de que el interfaz OpenSearch funciona.",
+	
 ); 
 
 add_translation('es', $spanish); 
-- 
cgit v1.2.3


From fdb19865380ee01989c97b48a3e505c1350512ae Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Mon, 7 May 2012 18:58:25 +0200
Subject: Updated spanish language.

---
 languages/es.php | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/languages/es.php b/languages/es.php
index 07da82053..c2d9bee60 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -1,28 +1,23 @@
 <?php
-/**
- * OpenSearch Spanish language file
- */
+$es = array (
+  'opensearch:title' => 'Búsqueda: %s',
+  'opensearch:description' => 'Resultados de la búsqueda "%s"',
+  'opensearch:engine' => 'Motor de búsqueda de %s',
+  'opensearh:settings:shortname' => 'Nombre corto',
+  'opensearh:settings:desc' => 'Descripción',
+  'opensearh:settings:longname' => 'Nombre largo',
+  'opensearh:settings:icon' => 'Icono',
+  'opensearh:settings:tags' => 'Etiquetas',
+  'opensearh:settings:lang' => 'Idioma',
+  'opensearh:settings:query' => 'Petición',
+  'opensearh:settings:shortname:description' => 'Contiene un título breve para este motor de búsqueda. 16 carácteres o menos de texto plano. <strong>Requerido</strong>',
+  'opensearh:settings:desc:description' => 'Contiene una descripción del motor de búsqueda. 1024 carácteres o menos de texto plano. <strong>Requerido</strong>',
+  'opensearh:settings:longname:description' => 'Contiene un título más largo para este motor de búsqueda. 48 carácteres o menos de texto plano.',
+  'opensearh:settings:icon:description' => 'Contiene la URL de la localización de una imagen de icono. Puede ser un ico de 16x16 o un png 64x64 píxeles. El dirección debería ser relativa a la raíz de Elgg.',
+  'opensearh:settings:tags:description' => 'Continene un conjunto de palabras usadas como palabras clave para identificar y categorizar este contenido de búsqueda. Las etiquetas deberían ser palabras simples y delimtadas por espacios (\' \'). 256 carácteres o menos, etiquetas delimitadas por espacios',
+  'opensearh:settings:lang:description' => 'Contiene una cadena que indica que el motor de búsqueda soporta resultados de búsqueda en el idioma especificado. * o códigos acorde al XML 1.0 Language Identification',
+  'opensearh:settings:query:description' => 'Petición de prueba disponible para clientes. Los clientes pueden enviarlo como petición de prueba para asegurarse de que el interfaz OpenSearch funciona.',
+);
 
-$spanish = array( 
-	'opensearch:title'  =>  "Búsqueda: %s" , 
-	'opensearch:description'  =>  "Resultados de la búsqueda \"%s\"",
-	'opensearch:engine' => "Motor de búsqueda de %s",
-	
-	'opensearh:settings:shortname' => "Nombre corto",
-	'opensearh:settings:desc' => "Descripción",
-	'opensearh:settings:longname' => "Nombre largo",
-	'opensearh:settings:icon' => "Icono",
-	'opensearh:settings:tags' => "Etiquetas",
-	'opensearh:settings:lang' => "Idioma",
-	'opensearh:settings:query' => "Petición",
-	'opensearh:settings:shortname:description' => "Contiene un título breve para este motor de búsqueda. 16 carácteres o menos de texto plano. <strong>Requerido</strong>",
-	'opensearh:settings:desc:description' => "Contiene una descripción del motor de búsqueda. 1024 carácteres o menos de texto plano. <strong>Requerido</strong>",
-	'opensearh:settings:longname:description' => "Contiene un título más largo para este motor de búsqueda. 48 carácteres o menos de texto plano.",
-	'opensearh:settings:icon:description' => "Contiene la URL de la localización de una imagen de icono. Puede ser un ico de 16x16 o un png 64x64 píxeles. El dirección debería ser relativa a la raíz de Elgg.",
-	'opensearh:settings:tags:description' => "Continene un conjunto de palabras usadas como palabras clave para identificar y categorizar este contenido de búsqueda. Las etiquetas deberían ser palabras simples y delimtadas por espacios (' '). 256 carácteres o menos, etiquetas delimitadas por espacios",
-	'opensearh:settings:lang:description' => "Contiene una cadena que indica que el motor de búsqueda soporta resultados de búsqueda en el idioma especificado. * o códigos acorde al XML 1.0 Language Identification",
-	'opensearh:settings:query:description' => "Petición de prueba disponible para clientes. Los clientes pueden enviarlo como petición de prueba para asegurarse de que el interfaz OpenSearch funciona.",
-	
-); 
+add_translation("es", $es);
 
-add_translation('es', $spanish); 
-- 
cgit v1.2.3


From 4d70b93a56c16e8499e92808041e9a8a7da969db Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 12 Oct 2012 18:05:15 +0200
Subject: Updated languages.

---
 languages/ca.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/languages/ca.php b/languages/ca.php
index 2e4dca2bc..35e4dfb9e 100644
--- a/languages/ca.php
+++ b/languages/ca.php
@@ -5,7 +5,22 @@
 
 $catalan = array( 
 	'opensearch:title'  =>  "Cerca: %s" , 
-	'opensearch:description'  =>  "Resultats de la cerca \"%s\""
+	'opensearch:description'  =>  "Resultats de la cerca \"%s\"",
+	'opensearch:engine' => 'Motor de cerca %s',
+	'opensearh:settings:shortname' => 'Nom curt',
+	'opensearh:settings:desc' => 'Descripció',
+	'opensearh:settings:longname' => 'Nom llarg',
+	'opensearh:settings:icon' => 'Icona',
+	'opensearh:settings:tags' => 'Etiquetes',
+	'opensearh:settings:lang' => 'Idioma',
+	'opensearh:settings:query' => 'Pregunta',
+	'opensearh:settings:shortname:description' => 'Conté un petit títol llegible que identifica el motor de cerca. 16 caràcters o menys de text pla. <strong>Requerit</strong>',
+	'opensearh:settings:desc:description' => 'Conté una petita descripció llegible sobre el motor de cerca. 1024 caràcters o menys de text pla. <strong>Requerit</strong>',
+	'opensearh:settings:longname:description' => 'Conté un títol llegible llarg que identifica el motor de cerca. 48 caràcters o menys de text pla.',
+	'opensearh:settings:icon:description' => 'Conté una adreça que identifica la localització d\'una imatge que pot ser utilitzada en associació amb el contingut d\'aquesta cerca. Pot ser un .ico de 16x16, un png de 64x64 o ambdues. Els clients escolliran la imatge que millor encaixi amb l\'espai disponible. El valor ha d\'estar relacionat amb el teu root de l\'Elgg',
+	'opensearh:settings:tags:description' => 'Conté un grup de paraules que poden ser utilitzades com a paraules clau per a identificar i categoritzar el contingut d\'aquesta cerca. Les etiquetes han de ser una paraula simple i han de ser delimitades amb el caràcter d\'espai (\' \'). 256 caràcters o menys, l\'espai delimita les etiquetes',
+	'opensearh:settings:lang:description' => 'Conté una cadena que indica que el motor de cerca està cercant resultats en un idioma específic. * o codis d\'acord amb la identificació d\'idiomes de l\'XML 1.0',
+	'opensearh:settings:query:description' => 'Pregunta de prova disponible pels clients. El clients poden enviar aquesta com una pregunta de prova per assegurar-se que la interfície de l\'OpenSearch funciona.',
 ); 
 
 add_translation('ca', $catalan); 
-- 
cgit v1.2.3


From 3734a58f828c6f2c758178b5b5a4a92969766f08 Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Fri, 8 Nov 2013 06:43:29 +0100
Subject: Bumped version 1.8.0

---
 manifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index 525027c63..98ae3356d 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
 <plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
 	<name>OpenSearch</name>
 	<author>Cash Costello</author>
-	<version>1.1</version>
+	<version>1.8.0</version>
 	<category>utility</category>
 	<category>search</category>
 	<description>OpenSearch integration</description>
@@ -13,4 +13,4 @@
 		<type>elgg_release</type>
 		<version>1.8</version>
 	</requires>
-</plugin_manifest>
\ No newline at end of file
+</plugin_manifest>
-- 
cgit v1.2.3