Bug 1039004 - Port |Bug 633773 - Use Google's HTTPS search by default|, |Bug 958883 - Use HTTPS for Yahoo searches| and search plugin parts of |Bug 959576 - Create a component to get the list of priority domains| to SeaMonkey f=mconnor r=neil
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 21 Jul 2014 20:43:43 +0100
changeset 8330 872926aa336a0d0a1d25b1c8d207656e4eb74998
parent 8329 dba745388fe6754df79713934781373865290eed
child 8331 0ae7c2ff018081fee241811ad2c7e2cc01417029
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersneil
bugs1039004, 633773, 958883, 959576
Bug 1039004 - Port |Bug 633773 - Use Google's HTTPS search by default|, |Bug 958883 - Use HTTPS for Yahoo searches| and search plugin parts of |Bug 959576 - Create a component to get the list of priority domains| to SeaMonkey f=mconnor r=neil X-Channel-Repo: comm-central X-Channel-Converted-Revision: 4ba4f87fef610a875a39927a24a43fdb4152fa5d
suite/searchplugins/google.xml
suite/searchplugins/wikipedia.xml
suite/searchplugins/yahoo.xml
--- a/suite/searchplugins/google.xml
+++ b/suite/searchplugins/google.xml
@@ -2,20 +2,28 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Google</ShortName>
 <Description>Google Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABUUlEQVR42pWTzUsCYRCH9y9zu3SooCCkjhIRRLeIykXokiWCJ7PvDpZRlz6si1lIQZ3SQxQdOhREpgSm0JeQvfu0+i6I7LKLh4F5h5nnnRl+o6jTdHn8omAYbVqhXqvYFXcEBKFDwcoZZB8B4LkEB9cwGGmFKHb01A1EU9JXzfdvDYZi1lwLwBcVAIwsNWPesIwls7gDtB2Z7N9ujVe+IX2LO2AgItB1OL9vJqsmILDrOoK02IkBAdYy4FsQJC5h+VQCHQDWTqYSgo8fuHuRxS4Ae3stQ7UGE5ttAHqCUgfxC7m4ryrowOyeO6CxqHwZxtYFqtYc5+kNan/gDTsAeueEIRj7n/rmRQMwueUAGF0VAAT3rQBTC0Y3DoDOGbm00icML4oWHYSTgo0MFqjlmPpDgqMcFCuQf4erBzjOwXjcriu9qHg0uutO2+es6fl67T9ptebvFRjBVgAAAABJRU5ErkJggg==</Image>
-<Url type="application/x-suggestions+json" method="GET" template="https://suggestqueries.google.com/complete/search?output=firefox&amp;client=firefox&amp;hl={moz:locale}&amp;q={searchTerms}"/>
+<Url type="application/x-suggestions+json"
+     method="GET"
+     template="https://www.google.com/complete/search">
+  <Param name="client" value="firefox"/>
+  <Param name="q" value="{searchTerms}"/>
+</Url>
 <Url type="text/html" method="GET" template="https://www.google.com/search">
   <Param name="q" value="{searchTerms}"/>
   <Param name="ie" value="utf-8"/>
   <Param name="oe" value="utf-8"/>
   <Param name="aq" value="t"/>
   <!-- Dynamic parameters -->
   <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/>
   <MozParam name="client" condition="defaultEngine" trueValue="seamonkey-a" falseValue="seamonkey"/>
 </Url>
-<SearchForm>https://www.google.com/</SearchForm>
+<Url type="text/html"
+     method="GET"
+     template="https://www.google.com/"
+     rel="searchform"/>
 </SearchPlugin>
--- a/suite/searchplugins/wikipedia.xml
+++ b/suite/searchplugins/wikipedia.xml
@@ -6,14 +6,20 @@
 <ShortName>Wikipedia (en)</ShortName>
 <Description>Wikipedia, the free encyclopedia</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</Image>
 <Url type="application/x-suggestions+json" method="GET" template="http://en.wikipedia.org/w/api.php">
   <Param name="action" value="opensearch"/>
   <Param name="search" value="{searchTerms}"/>
 </Url>
-<Url type="text/html" method="GET" template="http://en.wikipedia.org/wiki/Special:Search">
+<Url type="text/html"
+     method="GET"
+     template="http://en.wikipedia.org/wiki/Special:Search"
+     resultdomain="wikipedia.org">
   <Param name="search" value="{searchTerms}"/>
   <Param name="sourceid" value="Mozilla-search"/>
 </Url>
-<SearchForm>http://en.wikipedia.org/wiki/Special:Search</SearchForm>
+<Url type="text/html"
+     method="GET"
+     template="http://en.wikipedia.org/wiki/Special:Search"
+     rel="searchform"/>
 </SearchPlugin>
--- a/suite/searchplugins/yahoo.xml
+++ b/suite/searchplugins/yahoo.xml
@@ -2,16 +2,27 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Yahoo</ShortName>
 <Description>Yahoo Search</Description>
 <InputEncoding>UTF-8</InputEncoding>
 <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgJqAIoCdgCaAnoAnhKCAKYijgCuLpIAskKeALpSpgC+Yq4AzHy8ANqezgDmvt4A7tLqAPz5+wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKlRFIoABWAKERERE6ADcKMzzu2hOgAAhERK8REWCWBERE36ERMHMEREvo6iEgY6hEn6Pu0mAzqkz/xjMzoDNwpERERDoAMzAKlERIoAAzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA//8AAP//AADAOQAAgBkAAAAPAAAACQAAAAkAAAAIAAAACAAAAAgAAIAYAADAOAAA//8AAP//AAD//wAA</Image>
-<Url type="application/x-suggestions+json" method="GET"
-     template="http://ff.search.yahoo.com/gossip?output=fxjson&amp;command={searchTerms}" />
-<Url type="text/html" method="GET" template="http://search.yahoo.com/search">
+<Url type="application/x-suggestions+json"
+     method="GET"
+     template="https://search.yahoo.com/sugg/ff">
+  <Param name="output"  value="fxjson"/>
+  <Param name="appid"   value="smd"/>
+  <Param name="command" value="{searchTerms}"/>
+</Url>
+<Url type="text/html"
+     method="GET"
+     template="https://search.yahoo.com/search"
+     resultdomain="yahoo.com">
   <Param name="p" value="{searchTerms}"/>
   <Param name="ei" value="UTF-8"/>
 </Url>
-<SearchForm>http://search.yahoo.com/</SearchForm>
+<Url type="text/html"
+     method="GET"
+     template="https://search.yahoo.com/"
+     rel="searchform"/>
 </SearchPlugin>