From d4bf0926fa2d057edfedfe28e32394d0d29d6516 Mon Sep 17 00:00:00 2001
From: sgiehl <stefangiehl@gmail.com>
Date: Thu, 24 Jun 2010 13:28:43 +0000
Subject: [PATCH] fixes #1401 changes to several search engines
git-svn-id: http://dev.piwik.org/svn/trunk@2373 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
core/DataFiles/SearchEngines.php | 38 ++++++++++++++----
...www.excite.it.png => search.excite.it.png} | Bin
...e.tiscali.fr.png => search.tiscali.it.png} | Bin
.../searchEngines/www.walhello.info.png | Bin 0 -> 597 bytes
4 files changed, 30 insertions(+), 8 deletions(-)
rename plugins/Referers/images/searchEngines/{www.excite.it.png => search.excite.it.png} (100%)
rename plugins/Referers/images/searchEngines/{rechercher.nomade.tiscali.fr.png => search.tiscali.it.png} (100%)
create mode 100644 plugins/Referers/images/searchEngines/www.walhello.info.png
diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index 6d467076df..cb47bc9270 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -107,7 +107,7 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
'ch.altavista.com' => array('AltaVista', 'q'),
// Apollo Latvia
- 'apollo.lv/portal/search/' => array('Apollo lv', 'q'),
+ 'apollo.lv/portal/search/' => array('Apollo lv', 'q', '?cof=FORID%3A11&q={k}&search_where=www'),
// APOLLO7
'www.apollo7.de' => array('Apollo7', 'query'),
@@ -317,9 +317,14 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
'www.everyclick.com' => array('Everyclick', 'keyword'),
// Excite
- 'www.excite.it' => array('Excite', 'q'),
+ 'search.excite.it' => array('Excite', 'q', 'web/?q={k}'),
'msxml.excite.com' => array('Excite', 'qkw'),
- 'www.excite.fr' => array('Excite', 'search'),
+ 'search.excite.fr' => array('Excite', 'q', 'web/?q={k}'),
+ 'search.excite.de' => array('Excite', 'q', 'web/?q={k}'),
+ 'search.excite.co.uk' => array('Excite', 'q', 'web/?q={k}'),
+ 'search.excite.es' => array('Excite', 'q', 'web/?q={k}'),
+ 'search.excite.nl' => array('Excite', 'q', 'web/?q={k}'),
+ 'www.excite.co.jp' => array('Excite', 'search', 'search.gw?search={k}'),
// Exalead
'www.exalead.fr' => array('Exalead', 'q', 'search/results?q={k}'),
@@ -383,6 +388,10 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
// GAIS
'gais.cs.ccu.edu.tw' => array('GAIS', 'query'),
+ // Geona
+ 'geona.net' => array('Geona', 'q', 'search?q={k}'),
+ 'www.geona.net' => array('Geona', 'q', 'search?q={k}'),
+
// Gigablast
'www.gigablast.com' => array('Gigablast', 'q'),
'blogs.gigablast.com' => array('Gigablast (Blogs)', 'q'),
@@ -1113,6 +1122,16 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
'sv.setooz.com' => array('Setooz', 'query'),
'tr.setooz.com' => array('Setooz', 'query'),
'uk.setooz.com' => array('Setooz', 'query'),
+ 'ar.setooz.com' => array('Setooz', 'query'),
+ 'bs.setooz.com' => array('Setooz', 'query'),
+ 'cs.setooz.com' => array('Setooz', 'query'),
+ 'da.setooz.com' => array('Setooz', 'query'),
+ 'hr.setooz.com' => array('Setooz', 'query'),
+ 'nl.setooz.com' => array('Setooz', 'query'),
+ 'fa.setooz.com' => array('Setooz', 'query'),
+ 'ro.setooz.com' => array('Setooz', 'query'),
+ 'sr.setooz.com' => array('Setooz', 'query'),
+ 'ur.setooz.com' => array('Setooz', 'query'),
// Seznam
'search.seznam.cz' => array('Seznam', 'q'),
@@ -1163,10 +1182,8 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
'www.teoma.com' => array('Teoma', 't'),
// Tiscali
- 'rechercher.nomade.tiscali.fr'=> array('Tiscali', 's'),
+ 'search.tiscali.it' => array('Tiscali', 'key'),
'search-dyn.tiscali.it' => array('Tiscali', 'key'),
- 'www.tiscali.co.uk' => array('Tiscali', 'query'),
- 'search-dyn.tiscali.de' => array('Tiscali', 'key'),
'hledani.tiscali.cz' => array('Tiscali', 'query', false, 'windows-1250'),
// Tixuma
@@ -1212,6 +1229,12 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
'volny.zlatestranky.cz' => array('Volny', 'search', 'fulltext/?search={k}', 'windows-1250'),
'web.volny.cz' => array('Volny', 'search', false, 'windows-1250'),
+ // Walhello
+ 'www.walhello.info' => array('Walhello', 'key', 'search?key={k}'),
+ 'www.walhello.com' => array('Walhello', 'key', 'search?key={k}'),
+ 'www.walhello.de' => array('Walhello', 'key', 'search?key={k}'),
+ 'www.walhello.nl' => array('Walhello', 'key', 'search?key={k}'),
+
// Wanadoo
'search.ke.wanadoo.fr' => array('Wanadoo', 'kw'),
'busca.wanadoo.es' => array('Wanadoo', 'buscar'),
@@ -1227,8 +1250,7 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
'www.weborama.fr' => array('weborama', 'query'),
// WebSearch
- 'is1.websearch.com' => array('WebSearch', 'qkw'),
- 'www.websearch.com' => array('WebSearch', 'qkw'),
+ 'www.websearch.com' => array('WebSearch', array('qkw', 'q'), 'search/results2.aspx?q={k}'),
// Webtip
'www.webtip.de' => array('Webtip', 'keyword'),
diff --git a/plugins/Referers/images/searchEngines/www.excite.it.png b/plugins/Referers/images/searchEngines/search.excite.it.png
similarity index 100%
rename from plugins/Referers/images/searchEngines/www.excite.it.png
rename to plugins/Referers/images/searchEngines/search.excite.it.png
diff --git a/plugins/Referers/images/searchEngines/rechercher.nomade.tiscali.fr.png b/plugins/Referers/images/searchEngines/search.tiscali.it.png
similarity index 100%
rename from plugins/Referers/images/searchEngines/rechercher.nomade.tiscali.fr.png
rename to plugins/Referers/images/searchEngines/search.tiscali.it.png
diff --git a/plugins/Referers/images/searchEngines/www.walhello.info.png b/plugins/Referers/images/searchEngines/www.walhello.info.png
new file mode 100644
index 0000000000000000000000000000000000000000..2330cd6b85ace4681dc7b37d55bf22764710b7e5
GIT binary patch
literal 597
zcmV-b0;>IqP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&0qRLaK~y+TZBkoL
z+F%&&-`OwOy~!?ixqsl*lFf_VxXc*T7>Nlk#%<^b8smXz1Cf(Jshu1IN;Q><!W1?R
zc0Jfq+WLO|fE2bTUz+!O`abXXo(R(kYZ7CB?F(THVOka(Ly~$q{>e)zi$VROf|zj-
zgBX^j`hxO@9eH+N-DdQB#ptw^mE&Hlhypn<6aZzvFgiFn<?VNDm_wCA;0OaAtxCI^
zZ{AOD6ps0e?IPrbWBo?}-lfCx&t&y?{jcab>i$uhe2ZRVfY*-bfnd}fJ2fk|ki?9%
zLkkBbt0m?Fmj;>X#fwOQq_TFpm~51r*spL<hOd~qkv@mPP_wo3J<d2}4E>3KdoBCx
zWHt)M-H&=|l?H<i@oKK7)w`YD0t%O}X9HJ?Ct@lh@xV52=-c&|UzT1hL!#|!2i{@6
zW}!lX<OFwE^(M5l>ucAEGV=|@MEFxoXo%$dP{N(|PHh2|*~%C9*-=$}t}1!Y*wvVh
zyF|VV%3V1+e@eO2zSn+^ym}}#E<-%(y<MN0sabkIwSL~$`!Eeu!{#erPty}CRC<kp
zd?*j<pzUn}ANm-LFH?M^f=MI*_}}cpXddr{s4Fq>#&bkj41fu=e3*#L#n}Ldy(bpV
jd7T{GSonXJ+ccj6I<&iP!yw~H00000NkvXXu0mjf6=e_O
literal 0
HcmV?d00001
--
GitLab