restrict queries impressions recorded, a=chris

Chris Pollett [2022-11-12 00:Nov:th]
restrict queries impressions recorded, a=chris
Filename
src/configs/Config.php
src/configs/PublicHelpPages.php
src/controllers/SearchController.php
src/controllers/components/CrawlComponent.php
src/locale/ar/configure.ini
src/locale/bn/configure.ini
src/locale/de/configure.ini
src/locale/el_GR/configure.ini
src/locale/en_US/configure.ini
src/locale/es/configure.ini
src/locale/fa/configure.ini
src/locale/fr_FR/configure.ini
src/locale/he/configure.ini
src/locale/hi/configure.ini
src/locale/id/configure.ini
src/locale/it/configure.ini
src/locale/ja/configure.ini
src/locale/kn/configure.ini
src/locale/ko/configure.ini
src/locale/nl/configure.ini
src/locale/pl/configure.ini
src/locale/pt/configure.ini
src/locale/ru/configure.ini
src/locale/te/configure.ini
src/locale/th/configure.ini
src/locale/tl/configure.ini
src/locale/tr/configure.ini
src/locale/vi_VN/configure.ini
src/locale/zh_CN/configure.ini
src/models/ProfileModel.php
src/views/elements/PageoptionsElement.php
src/views/elements/SearchElement.php
diff --git a/src/configs/Config.php b/src/configs/Config.php
index b58d3e884..0a0135034 100755
--- a/src/configs/Config.php
+++ b/src/configs/Config.php
@@ -505,6 +505,7 @@ if (file_exists(WORK_DIRECTORY . PROFILE_FILE_NAME)) {
     nsdefine('IN_LINK', true);
     nsdefine('IP_LINK', true);
     nsdefine('RESULT_SCORE', true);
+    nsdefine('SERP_FAVICONS', true);
     nsdefine('SIGNIN_LINK', true);
     nsdefine('SUBSEARCH_LINK', true);
     /**
diff --git a/src/configs/PublicHelpPages.php b/src/configs/PublicHelpPages.php
index 8adf5b168..a81f309b4 100644
--- a/src/configs/PublicHelpPages.php
+++ b/src/configs/PublicHelpPages.php
@@ -43773,8 +43773,12 @@ page_header=

 page_footer=

+page_theme=
+
 page_type=standard

+properties=
+
 robots=

 share_expires=-2
@@ -43785,6 +43789,8 @@ toc=true

 url_shortener=

+update_desc=
+
 END_HEAD_VARSThese checkboxes control whether various links and drop downs on the search result and landing
 pages appear or not.

@@ -43792,6 +43798,7 @@ pages appear or not.
 ; '''Subsearch''' : Controls whether the links to subsearches such as Image, Video, and News search appear at the top of all search pages
 ; '''Signin''' : Controls whether the '''Sign In''' link appears at the top of the Yioop landing and search result pages.
 ; '''Continuous Scroll''' : Controls where continuous scroll versus pagination results are the default way search results are presented.
+; '''SERP Favicons''' : Controls whether next to the url in the search engine results for a web page an attempt is made to display the favicon for that web site or not.
 ; '''More Result Info''' : Controls whether the "..." link to toggle additional information about the given search result should appear or not.
 ; '''Word Cloud''', '''Cache''', '''Similar''', '''Inlinks''', '''IP Address''', '''Result Score''': Controls whether the corresponding links appear after each search result item when More Result Info has been toggled.

diff --git a/src/controllers/SearchController.php b/src/controllers/SearchController.php
index f465fd7e9..776228582 100755
--- a/src/controllers/SearchController.php
+++ b/src/controllers/SearchController.php
@@ -1421,7 +1421,8 @@ EOD;
         $data['LIMIT'] = $limit;
         $data['RESULTS_PER_PAGE'] = $results_per_page;
         if ($add_query_impression && !empty($data['QUERY'])
-            && (empty($_REQUEST['f']) || strtolower($_REQUEST['f']) != 'api')) {
+            && (empty($_REQUEST['f']) || strtolower($_REQUEST['f']) != 'api')
+            && !preg_match("/^(related|ip|link)(:|%3A)/i", $data['QUERY'])) {
             $this->model("impression")->addQueryImpression($data['QUERY']);
         }
     }
diff --git a/src/controllers/components/CrawlComponent.php b/src/controllers/components/CrawlComponent.php
index e1a822fab..b6224452a 100644
--- a/src/controllers/components/CrawlComponent.php
+++ b/src/controllers/components/CrawlComponent.php
@@ -1701,7 +1701,8 @@ class CrawlComponent extends Component implements CrawlConstants
             $parent->updateProfileFields($data, $profile,
                 ['DEFAULT_CONTINUOUS_SCROLL', 'IP_LINK','CACHE_LINK',
                 'SIMILAR_LINK', 'IN_LINK',  'MORE_RESULT', 'RESULT_SCORE',
-                'SIGNIN_LINK', 'SUBSEARCH_LINK', 'WORD_CLOUD', 'WORD_SUGGEST']);
+                'SERP_FAVICONS','SIGNIN_LINK', 'SUBSEARCH_LINK', 'WORD_CLOUD',
+                'WORD_SUGGEST']);
         }
         $bonuses = ['HOST_KEYWORD_BONUS' => 6,
             'TITLE_BONUS' => 5, 'PATH_KEYWORD_BONUS' => 3,
diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini
index e376fb589..f0e939cbc 100755
--- a/src/locale/ar/configure.ini
+++ b/src/locale/ar/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "تشير إلى كلمة"
 pageoptions_element_subsearch_link = "سوبسيرتش"
 pageoptions_element_signin_link = "تسجيل الدخول"
 pageoptions_element_continuous_scroll = "التمرير المستمر"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "مزيد من المعلومات نتيجة"
 pageoptions_element_wd_cloud = "كلمة سحابة"
 pageoptions_element_cache_link = "ذاكرة التخزين المؤقت"
diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini
index b698b9110..5017a668f 100755
--- a/src/locale/bn/configure.ini
+++ b/src/locale/bn/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "শব্দ সুপারিশ"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "সাইন ইন"
 pageoptions_element_continuous_scroll = "ক্রমাগত স্ক্রোল"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "আরো ফলাফল তথ্য"
 pageoptions_element_wd_cloud = "শব্দ মেঘ"
 pageoptions_element_cache_link = "ক্যাশে"
diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini
index 1e7255d6c..a656c24c8 100755
--- a/src/locale/de/configure.ini
+++ b/src/locale/de/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Wort Vorschlagen"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "Kontinuierlicher Bildlauf"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Mehr Ergebnisinfo"
 pageoptions_element_wd_cloud = "Wortwolke"
 pageoptions_element_cache_link = "Cache"
diff --git a/src/locale/el_GR/configure.ini b/src/locale/el_GR/configure.ini
index 769043cc6..897d2781a 100644
--- a/src/locale/el_GR/configure.ini
+++ b/src/locale/el_GR/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Λέξη Πρόταση"
 pageoptions_element_subsearch_link = "Υποαναζήτηση"
 pageoptions_element_signin_link = "Συνδεθείτε"
 pageoptions_element_continuous_scroll = "Συνεχής Κύλιση"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Περισσότερες Πληροφορίες Αποτελεσμάτων"
 pageoptions_element_wd_cloud = "Σύννεφο Λέξεων"
 pageoptions_element_cache_link = "Κρύπτη"
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index c7b3e51c7..1f87ccc45 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Word Suggest"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "Continuous Scroll"
+pageoptions_element_serp_favicons = "SERP Favicons"
 pageoptions_element_more_result = "More Result Info"
 pageoptions_element_wd_cloud = "Word Cloud"
 pageoptions_element_cache_link = "Cache"
diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini
index 084b0328a..1ad409a85 100755
--- a/src/locale/es/configure.ini
+++ b/src/locale/es/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Sugerencia de Palabra"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Inicia sesión"
 pageoptions_element_continuous_scroll = "Desplazamiento Continuo"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Más Info"
 pageoptions_element_wd_cloud = "Nube de Palabras"
 pageoptions_element_cache_link = "Caché"
diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini
index 7ea152bc9..74119f0a7 100755
--- a/src/locale/fa/configure.ini
+++ b/src/locale/fa/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "پیشنهاد کلمه"
 pageoptions_element_subsearch_link = "زیرجستجو"
 pageoptions_element_signin_link = "ورود"
 pageoptions_element_continuous_scroll = "پیمایش مداوم"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "اطلاعات بیشتر نتیجه"
 pageoptions_element_wd_cloud = "کلمه ابر"
 pageoptions_element_cache_link = "کش"
diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini
index 151a6ecdf..6123cb6ca 100755
--- a/src/locale/fr_FR/configure.ini
+++ b/src/locale/fr_FR/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Mot suggèrent"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "Défilement Continu"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Plus D'Informations Sur Les Résultats"
 pageoptions_element_wd_cloud = "Nuage de Mots"
 pageoptions_element_cache_link = "Cache"
diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini
index 9b766f7f4..501bf8ac2 100755
--- a/src/locale/he/configure.ini
+++ b/src/locale/he/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "המילה מציע"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "גלילה רציפה"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "מידע נוסף על תוצאות"
 pageoptions_element_wd_cloud = "ענן מילים"
 pageoptions_element_cache_link = "מטמון"
diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini
index 2484b2a0d..322655b24 100755
--- a/src/locale/hi/configure.ini
+++ b/src/locale/hi/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "शब्द का सुझाव"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "साइन इन"
 pageoptions_element_continuous_scroll = "निरंतर स्क्रॉल"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "अधिक परिणाम जानकारी"
 pageoptions_element_wd_cloud = "वर्ड क्लाउड"
 pageoptions_element_cache_link = "कैश"
diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini
index d88934845..ee6dd221b 100755
--- a/src/locale/id/configure.ini
+++ b/src/locale/id/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Kata Menyarankan"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "Gulir Terus Menerus"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Info Hasil Lebih Lanjut"
 pageoptions_element_wd_cloud = "Word Cloud"
 pageoptions_element_cache_link = "Cache"
diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini
index b9182f021..67d4c7081 100755
--- a/src/locale/it/configure.ini
+++ b/src/locale/it/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Suggerimento parola"
 pageoptions_element_subsearch_link = "Sotto-ricerca"
 pageoptions_element_signin_link = "Accesso"
 pageoptions_element_continuous_scroll = "Scorrimento continuo"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Ulteriori informazioni sui risultati"
 pageoptions_element_wd_cloud = "Nuvola di parole"
 pageoptions_element_cache_link = "Archivio"
diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini
index 6e6d3920a..711a84cb8 100755
--- a/src/locale/ja/configure.ini
+++ b/src/locale/ja/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "単語提案"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "連続スクロール"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "より多くの結果情報"
 pageoptions_element_wd_cloud = "ワード-クラウド"
 pageoptions_element_cache_link = "キャッシュ"
diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini
index 8c57d8e17..98d9de6b1 100755
--- a/src/locale/kn/configure.ini
+++ b/src/locale/kn/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "ಪದ ಸೂಚಿಸುತ್ತದೆ"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "ಸೈನ್ ಇನ್"
 pageoptions_element_continuous_scroll = "ನಿರಂತರ ಸ್ಕ್ರಾಲ್"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "ಹೆಚ್ಚಿನ ಫಲಿತಾಂಶ ಮಾಹಿತಿ"
 pageoptions_element_wd_cloud = "ಪದ ಮೋಡ"
 pageoptions_element_cache_link = "ಸಂಗ್ರಹ"
diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini
index fc6ef735c..360519160 100755
--- a/src/locale/ko/configure.ini
+++ b/src/locale/ko/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "제출"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "로그인"
 pageoptions_element_continuous_scroll = "연속 스크롤"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "더 많은 결과 정보"
 pageoptions_element_wd_cloud = "단어 구름"
 pageoptions_element_cache_link = "캐시"
diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini
index 6f2da4390..0cad2b0d8 100644
--- a/src/locale/nl/configure.ini
+++ b/src/locale/nl/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Word Suggestie"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Aanmelden"
 pageoptions_element_continuous_scroll = "Doorlopend Schuiven"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Meer Resultaat Info"
 pageoptions_element_wd_cloud = "Word Cloud"
 pageoptions_element_cache_link = "cache"
diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini
index 633d20167..57011b176 100755
--- a/src/locale/pl/configure.ini
+++ b/src/locale/pl/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Słowo Polecić"
 pageoptions_element_subsearch_link = "Wyszukiwanie może"
 pageoptions_element_signin_link = "Zalogować się"
 pageoptions_element_continuous_scroll = "Przewijanie Ciągłe"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Więcej Informacji O Wynikach"
 pageoptions_element_wd_cloud = "Chmura Słów"
 pageoptions_element_cache_link = "Cache"
diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini
index c1d91561c..909712daa 100755
--- a/src/locale/pt/configure.ini
+++ b/src/locale/pt/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Palavra Sugerir"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "Rolagem Contínua"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Mais Informações Do Resultado"
 pageoptions_element_wd_cloud = "Nuvem De Palavras"
 pageoptions_element_cache_link = "Cache"
diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini
index c83720d24..d38a5bc2e 100755
--- a/src/locale/ru/configure.ini
+++ b/src/locale/ru/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Слово Рекомендовать"
 pageoptions_element_subsearch_link = "Поиск может"
 pageoptions_element_signin_link = "Авторизоваться"
 pageoptions_element_continuous_scroll = "Непрерывная прокрутка"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Дополнительная Информация О Результатах"
 pageoptions_element_wd_cloud = "Облако слов"
 pageoptions_element_cache_link = "Кэш"
diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini
index 7c30cfce7..76d5ccb87 100644
--- a/src/locale/te/configure.ini
+++ b/src/locale/te/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "పదం సూచించండి"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "సైన్ఇన్"
 pageoptions_element_continuous_scroll = "నిరంతర స్క్రోల్"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "మరిన్ని ఫలితంగా సమాచారం"
 pageoptions_element_wd_cloud = "వర్డ్ క్లౌడ్"
 pageoptions_element_cache_link = "కాష్"
diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini
index 6695c9578..31e219c4f 100755
--- a/src/locale/th/configure.ini
+++ b/src/locale/th/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "คำแนะนำให้"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Signin"
 pageoptions_element_continuous_scroll = "เลื่อนต่อเนื่อง"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "ข้อมูลผลลัพธ์เพิ่มเติม"
 pageoptions_element_wd_cloud = "เมฆคำ"
 pageoptions_element_cache_link = "แคช"
diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini
index c8bc5c6d3..8bf771495 100644
--- a/src/locale/tl/configure.ini
+++ b/src/locale/tl/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Magmungkahi Ng Mga Salita"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Pag-Signin"
 pageoptions_element_continuous_scroll = "Patuloy Na Scroll"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Higit Pang Impormasyon Ng Resulta"
 pageoptions_element_wd_cloud = "Ulap Ng Salita"
 pageoptions_element_cache_link = "Cache"
diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini
index 7fe4a4c8e..82a2b4801 100755
--- a/src/locale/tr/configure.ini
+++ b/src/locale/tr/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Kelime Öner"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "İmzalıyorum"
 pageoptions_element_continuous_scroll = "Sürekli Kaydırma"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Daha Fazla Sonuç Bilgisi"
 pageoptions_element_wd_cloud = "Kelime Bulutu"
 pageoptions_element_cache_link = "Önbellek"
diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini
index 6b8f1bb65..1f7b95808 100755
--- a/src/locale/vi_VN/configure.ini
+++ b/src/locale/vi_VN/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "Lời Đề Nghị"
 pageoptions_element_subsearch_link = "Subsearch"
 pageoptions_element_signin_link = "Đăng nhập"
 pageoptions_element_continuous_scroll = "Di Chuyển Liên Tục"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "Kết Quả Hơn Thông Tin"
 pageoptions_element_wd_cloud = "Từ Đám Mây"
 pageoptions_element_cache_link = "Nhớ tạm"
diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini
index 6a9c14832..0c7f3dbd4 100755
--- a/src/locale/zh_CN/configure.ini
+++ b/src/locale/zh_CN/configure.ini
@@ -1401,6 +1401,7 @@ pageoptions_element_wd_suggest = "词的建议"
 pageoptions_element_subsearch_link = "二次检索"
 pageoptions_element_signin_link = "签到"
 pageoptions_element_continuous_scroll = "连续滚动"
+pageoptions_element_serp_favicons = ""
 pageoptions_element_more_result = "更多结果信息"
 pageoptions_element_wd_cloud = "字云"
 pageoptions_element_cache_link = "高速缓存"
diff --git a/src/models/ProfileModel.php b/src/models/ProfileModel.php
index f239ee28d..82e3235f2 100755
--- a/src/models/ProfileModel.php
+++ b/src/models/ProfileModel.php
@@ -66,7 +66,7 @@ class ProfileModel extends Model
         'PRIVATE_DB_PASSWORD', 'PRIVATE_DB_USER', 'PROXY_SERVERS',
         'PROXIMITY_BONUS', 'RECOVERY_MODE', 'REGISTRATION_TYPE', 'RESULT_SCORE',
         'ROBOT_INSTANCE','RSS_ACCESS', 'SEARCH_ANALYTICS_MODE',
-        'SEARCHBAR_PATH', 'SEND_MAIL_MEDIA_UPDATER',
+        'SEARCHBAR_PATH', 'SEND_MAIL_MEDIA_UPDATER', 'SERP_FAVICONS',
         'SESSION_NAME', 'SIDE_ADSCRIPT', 'SIDEBAR_COLOR', 'SIGNIN_LINK',
         'SIMILAR_LINK', 'SUBSEARCH_LINK', 'TITLE_BONUS', 'TIMEZONE',
         'TOPBAR_COLOR', 'TOP_ADSCRIPT','TOR_PROXY', 'USE_FILECACHE',
diff --git a/src/views/elements/PageoptionsElement.php b/src/views/elements/PageoptionsElement.php
index 453b69502..c771603ba 100644
--- a/src/views/elements/PageoptionsElement.php
+++ b/src/views/elements/PageoptionsElement.php
@@ -453,6 +453,15 @@ class PageOptionsElement extends Element
                 e("checked='checked'");}?>
             /></td>
         </tr>
+        <tr><td><label for="serp-favicons"><?=
+            tl('pageoptions_element_serp_favicons') ?></label></td>
+        <td><input id='serp-favicons' type="checkbox"
+            name="SERP_FAVICONS" value="true"
+            <?php if (isset($data['SERP_FAVICONS'])
+                && $data['SERP_FAVICONS']){
+                e("checked='checked'");}?>
+            /></td>
+        </tr>
         <tr>
         <td><label for="more-result"><?=
             tl('pageoptions_element_more_result') ?></label></td>
@@ -462,6 +471,8 @@ class PageOptionsElement extends Element
                 $data['MORE_RESULT']) {
                 e("checked='checked'");}?>
             /></td></tr>
+        </table></td>
+        <td><table class="search-page-table">
         <tr>
         <td><label for="wd-cloud"><?=
             tl('pageoptions_element_wd_cloud') ?></label></td>
@@ -471,8 +482,6 @@ class PageOptionsElement extends Element
                 $data['WORD_CLOUD']) {
                 e("checked='checked'");}?>
             /></td></tr>
-        </table></td>
-        <td><table class="search-page-table">
         <tr><td><label for="cache-link"><?=
             tl('pageoptions_element_cache_link') ?></label>
         </td><td><input id='cache-link' type="checkbox"
diff --git a/src/views/elements/SearchElement.php b/src/views/elements/SearchElement.php
index 8f5c1290d..7b8ee66df 100644
--- a/src/views/elements/SearchElement.php
+++ b/src/views/elements/SearchElement.php
@@ -236,7 +236,8 @@ class SearchElement extends Element implements CrawlConstants
             }
             ?><div class='result'>
             <div class="result-details"><?php
-            if (!empty($page[self::FAVICON_URL])) {
+            if (C\nsdefined("SERP_FAVICONS") && C\SERP_FAVICONS &&
+                !empty($page[self::FAVICON_URL])) {
                 ?><img class="result-fav" src="<?=B\serpIconUrl(
                     $page[self::FAVICON_URL], $page[self::CRAWL_TIME]);
                 ?>" /><?php
ViewGit