Update SearchEngines

1 files changed, 17 insertions, 7 deletions

diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index 9a40f96748..d56159eeb8 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -189,6 +189,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'searchqu.com'                   => array('Ask'),
         'search.tb.ask.com'              => array('Ask'),
         'nortonsafe.search.ask.com'      => array('Ask'),
+        'safesearch.avira.com'           => array('Ask'),
+        'avira.search.ask.com'           => array('Ask'),        
 
         // Atlas
         'searchatlas.centrum.cz'         => array('Atlas', 'q', '?q={k}'),
@@ -283,6 +285,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
 
         // DasOertliche
         'www.dasoertliche.de'            => array('DasOertliche', 'kw'),
+        'www2.dasoertliche.de'            => array('DasOertliche', array('ph', 'kw')),        
 
         // DasTelefonbuch
         'www1.dastelefonbuch.de'         => array('DasTelefonbuch', 'kw'),
@@ -453,6 +456,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'suche.gmx.net'                  => array('Google', 'q', 'web?q={k}'),
         'search.incredibar.com'          => array('Google', 'q', 'search.php?q={k}'),
         'www.delta-search.com'           => array('Google', 'q'),
+        'www1.delta-search.com'          => array('Google', 'q'),        
         'search.1und1.de'                => array('Google', 'q', 'web?q={k}'),
         'search.zonealarm.com'           => array('Google'),
         'start.lenovo.com'               => array('Google', 'q', 'search/index.php?q={k}'),
@@ -464,11 +468,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'search.smt.docomo.ne.jp'        => array('Google', 'MT'),
         'image.search.smt.docomo.ne.jp'  => array('Google', 'MT'),
         'gfsoso.com'                     => array('Google', 'q'),
-
-        // Google Earth
-        // - 2010-09-13: are these redirects now?
-        'www.googleearth.de'             => array('Google'),
-        'www.googleearth.fr'             => array('Google'),
+        'searches.safehomepage.com'      => array('Google', 'q'),
+        'searches.f-secure.com'          => array('Google', 'query', 'search?query={k}'),
 
         // Google Cache
         'webcache.googleusercontent.com' => array('Google', '/\/search\?q=cache:[A-Za-z0-9]+:[^+]+([^&]+)/', 'search?q={k}'),
@@ -619,6 +620,8 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'eu.ixquick.com'                 => array('Ixquick'),
         's8-eu.ixquick.com'              => array('Ixquick'),
         's1-eu.ixquick.de'               => array('Ixquick'),
+        's2-eu4.ixquick.com'             => array('Ixquick'),
+        's5-eu4.ixquick.com'             => array('Ixquick'),        
 
         // Jyxo
         'jyxo.1188.cz'                   => array('Jyxo', 'q', 's?q={k}'),
@@ -680,6 +683,7 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         // Metager
         'meta.rrzn.uni-hannover.de'      => array('Metager', 'eingabe', 'meta/cgi-bin/meta.ger1?eingabe={k}'),
         'www.metager.de'                 => array('Metager'),
+        'metager.de'                     => array('Metager'),        
 
         // Metager2
         'metager2.de'                    => array('Metager2', 'q', 'search/index.php?q={k}'),
@@ -777,6 +781,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'www.qualigo.de'                 => array('Qualigo'),
         'www.qualigo.nl'                 => array('Qualigo'),
 
+	    // Qwant
+        'www.qwant.com'                 => array('Qwant', 'q'),
+        
         // Rakuten
         'websearch.rakuten.co.jp'        => array('Rakuten', 'qt', 'WebIS?qt={k}'),
 
@@ -837,6 +844,9 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'm.sm.cn'                        => array('sm.cn', 'q', 's?q={k}'),
         'm.sp.sm.cn'                     => array('sm.cn'),
 
+        // sm.de
+        'www.sm.de'                      => array('sm.de', 'q', '?q={k}'),
+
         // SmartAdressbar
         'search.smartaddressbar.com'     => array('SmartAddressbar', 's', '?s={k}'),
 
@@ -1029,11 +1039,11 @@ if (!isset($GLOBALS['Piwik_SearchEngines'])) {
         'ys.mirostart.com'               => array('Yahoo!', 'q'),
 
         // Yahoo! Directory
-        'search.yahoo.com/search/dir'    => array('Yahoo! Directory', 'p', '?p={k}'),
+        'search.yahoo.com/search/dir'    => array('Yahoo! Directory', 'p', '?p={k}',)
 //		'{}.dir.yahoo.com'			=> array('Yahoo! Directory'),
 
         // Yahoo! Images
-        'images.search.yahoo.com'        => array('Yahoo! Images', 'p', 'search/images?p={k}'),
+        'images.search.yahoo.com'        => array('Yahoo! Images', array('p', 'va'), 'search/images?p={k}'),
 //		'*.images.search.yahoo.com'=> array('Yahoo! Images'), // see built-in helper in Common.php
         '{}.images.yahoo.com'            => array('Yahoo! Images'),
         'cade.images.yahoo.com'          => array('Yahoo! Images'),