Merge branch 'uiredesign' of /var/www/trunk into uiredesign

[quix0rs-gnu-social.git] / actions / opensearch.php

diff --git a/actions/opensearch.php b/actions/opensearch.php
index 6811226a2f1305c6aa1d31fe869a42b972b2beda..6e6e794e9603b16dbec2bbf60efa3db04f09cc4a 100644 (file)
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -19,41 +19,43 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class OpensearchAction extends Action {
-
-       function handle($args) {
-
-               parent::handle($args);
-
-                $type = $this->trimmed('type');
-                
-                $short_name = '';
-                if ($type == 'people') {
-                    $type = 'peoplesearch';
-                    $short_name = 'People Search';
-                } else {
-                    $short_name = 'Notice Search';
-                    $type = 'noticesearch';
-                }
-
-               header('Content-Type: text/html');
-
-               common_start_xml();
-               common_element_start('OpenSearchDescription', array('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/'));
-                
-                $short_name =  common_config('site', 'name').' '.$short_name;
-               common_element('ShortName', NULL, $short_name);
-               common_element('Contact', NULL, common_config('site', 'email'));
-                common_element('Url', array('type' => 'text/html', 'method' => 'get', 
-                               'template' => common_path('index.php?action='.$type.'&q={searchTerms}'))); 
-                common_element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico')); 
-                common_element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png')); 
-                common_element('AdultContent', NULL, 'false');
-                common_element('Language', NULL, common_language());
-                common_element('OutputEncoding', NULL, 'UTF-8');
-                common_element('InputEncoding', NULL, 'UTF-8');
-
-               common_element_end('OpenSearchDescription');
-               common_end_xml();
-       }
+class OpensearchAction extends Action
+{
+
+    function handle($args)
+    {
+
+        parent::handle($args);
+
+        $type = $this->trimmed('type');
+
+        $short_name = '';
+        if ($type == 'people') {
+            $type = 'peoplesearch';
+            $short_name = _('People Search');
+        } else {
+            $short_name = _('Notice Search');
+            $type = 'noticesearch';
+        }
+
+        header('Content-Type: text/html');
+
+        common_start_xml();
+        $this->elementStart('OpenSearchDescription', array('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/'));
+
+        $short_name =  common_config('site', 'name').' '.$short_name;
+        $this->element('ShortName', null, $short_name);
+        $this->element('Contact', null, common_config('site', 'email'));
+        $this->element('Url', array('type' => 'text/html', 'method' => 'get',
+                       'template' => str_replace('---', '{searchTerms}', common_local_url($type, array('q' => '---')))));
+        $this->element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico'));
+        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png'));
+        $this->element('AdultContent', null, 'false');
+        $this->element('Language', null, common_language());
+        $this->element('OutputEncoding', null, 'UTF-8');
+        $this->element('InputEncoding', null, 'UTF-8');
+
+        $this->elementEnd('OpenSearchDescription');
+        common_end_xml();
+    }
 }