Added support to configure for selecting the kinds of auxiliary links which appear in search results, a=chris

diff --git a/configs/config.php b/configs/config.php
index f1c171a71..4567d0ac7 100755
--- a/configs/config.php
+++ b/configs/config.php
@@ -92,6 +92,10 @@ if(file_exists(WORK_DIRECTORY."/profile.php")) {
     define('DEFAULT_LOCALE', "en-US");
     define('AUTH_KEY', 0);
     define('USE_MEMCACHE', false);
+    define('CACHE_LINK', true);
+    define('SIMILAR_LINK', true);
+    define('IN_LINK', true);
+    define('IP_LINK', true);
 }

 if((DEBUG_LEVEL & ERROR_INFO) == ERROR_INFO) {
diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php
index ae90fe150..9b912ea3b 100755
--- a/controllers/admin_controller.php
+++ b/controllers/admin_controller.php
@@ -1474,7 +1474,8 @@ class AdminController extends Controller implements CrawlConstants
                     }
                     if(!isset($data[$field])) {
                         $data[$field] = "";
-                        if($field == "USE_MEMCACHE") {
+                        if(in_array($field, array('USE_MEMCACHE', 'IP_LINK',
+                            'CACHE_LINK', 'SIMILAR_LINK', 'IN_LINK'))) {
                             $profile[$field] = false;
                         }
                     }
diff --git a/data/default.db b/data/default.db
index ece99f8a9..f972dde50 100644
Binary files a/data/default.db and b/data/default.db differ
diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini
index c3243d4cc..7341daf77 100755
--- a/locale/ar/configure.ini
+++ b/locale/ar/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/de/configure.ini b/locale/de/configure.ini
index 2aad844a5..5a0ec1b10 100755
--- a/locale/de/configure.ini
+++ b/locale/de/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini
index 9cc2d360d..9a972dd4a 100755
--- a/locale/en-US/configure.ini
+++ b/locale/en-US/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = "Use Memcache:"
 ; configure_element.php line: 189
 configure_element_memcache_servers = "Memcache Servers"
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = "Search Auxiliary Links Displayed"
+;
+; configure_element.php line: 204
+configure_element_cache_link = "Cache"
+;
+; configure_element.php line: 209
+configure_element_similar_link = "Similar"
+;
+; configure_element.php line: 214
+configure_element_in_link = "Inlinks"
+;
+; configure_element.php line: 219
+configure_element_ip_link = "IP address"
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = "Crawl Robot Set-up"
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = "Crawl Robot Name:"
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = "Robot Description"
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = "Submit"
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/es/configure.ini b/locale/es/configure.ini
index 0a230ae63..ae51e0557 100755
--- a/locale/es/configure.ini
+++ b/locale/es/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini
index 6711b6a83..8595e2036 100755
--- a/locale/fr-FR/configure.ini
+++ b/locale/fr-FR/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/fr-FR/statistics.txt b/locale/fr-FR/statistics.txt
index 80636e031..8f6a89ac6 100755
--- a/locale/fr-FR/statistics.txt
+++ b/locale/fr-FR/statistics.txt
@@ -1 +1 @@
-d:14;
\ No newline at end of file
+d:13;
\ No newline at end of file
diff --git a/locale/he/configure.ini b/locale/he/configure.ini
index 3203dabe1..ec49de587 100755
--- a/locale/he/configure.ini
+++ b/locale/he/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini
index 71a66cd1d..eaa76a04e 100755
--- a/locale/in-ID/configure.ini
+++ b/locale/in-ID/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/it/configure.ini b/locale/it/configure.ini
index 1acf5c48c..cda233be8 100755
--- a/locale/it/configure.ini
+++ b/locale/it/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini
index 045d24b6d..b09a7258c 100755
--- a/locale/ja/configure.ini
+++ b/locale/ja/configure.ini
@@ -358,7 +358,7 @@ crawlstatus_view_resume = "再会"
 crawlstatus_view_set_index = "指数の設定する。"
 ;
 ; crawlstatus_view.php line: 162
-crawlstatus_view_search_index = "検索指数"
+crawlstatus_view_search_index = ""
 ;
 ; crawlstatus_view.php line: 169
 crawlstatus_view_delete = "削除"
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = "検索ロボット設定"
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = "ロボット名"
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = "ロボット説明"
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = "サブミット"
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/ja/statistics.txt b/locale/ja/statistics.txt
index 23fc7ec4f..2c43a0adb 100755
--- a/locale/ja/statistics.txt
+++ b/locale/ja/statistics.txt
@@ -1 +1 @@
-d:75;
\ No newline at end of file
+d:73;
\ No newline at end of file
diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini
index f09daea04..3e355fd94 100755
--- a/locale/ko/configure.ini
+++ b/locale/ko/configure.ini
@@ -358,7 +358,7 @@ crawlstatus_view_resume = "재개"
 crawlstatus_view_set_index = "인덱스로 정하기"
 ;
 ; crawlstatus_view.php line: 162
-crawlstatus_view_search_index = "검색 인덱스"
+crawlstatus_view_search_index = ""
 ;
 ; crawlstatus_view.php line: 169
 crawlstatus_view_delete = "삭제"
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = "크롤 로봇 설정"
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = "로봇 기술 "
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = "크롤 로봇 이름:"
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = "제출 "
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/ko/statistics.txt b/locale/ko/statistics.txt
index fec045de2..23fc7ec4f 100755
--- a/locale/ko/statistics.txt
+++ b/locale/ko/statistics.txt
@@ -1 +1 @@
-d:77;
\ No newline at end of file
+d:75;
\ No newline at end of file
diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini
index 8f0bc78a4..e3a01fb2f 100755
--- a/locale/pl/configure.ini
+++ b/locale/pl/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini
index d58ff7712..a86ee5e49 100755
--- a/locale/pt/configure.ini
+++ b/locale/pt/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini
index 53d6052d9..d1a985623 100755
--- a/locale/ru/configure.ini
+++ b/locale/ru/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/th/configure.ini b/locale/th/configure.ini
index 9dce4de2c..fc83e6e22 100755
--- a/locale/th/configure.ini
+++ b/locale/th/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini
index 07bd6dbba..a8262559b 100755
--- a/locale/vi-VN/configure.ini
+++ b/locale/vi-VN/configure.ini
@@ -358,7 +358,7 @@ crawlstatus_view_resume = "Bắt đầu trở lại"
 crawlstatus_view_set_index = "Cài làm mục lục"
 ;
 ; crawlstatus_view.php line: 162
-crawlstatus_view_search_index = "Tìm mục lục"
+crawlstatus_view_search_index = ""
 ;
 ; crawlstatus_view.php line: 169
 crawlstatus_view_delete = "Xoá"
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = "Mô tả rô-bốt"
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/vi-VN/statistics.txt b/locale/vi-VN/statistics.txt
index 9b45e4585..9602e5a6f 100755
--- a/locale/vi-VN/statistics.txt
+++ b/locale/vi-VN/statistics.txt
@@ -1 +1 @@
-d:55;
\ No newline at end of file
+d:53;
\ No newline at end of file
diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini
index 4530cf868..709186d4a 100755
--- a/locale/zh-CN/configure.ini
+++ b/locale/zh-CN/configure.ini
@@ -431,16 +431,31 @@ configure_element_use_memcache = ""
 ; configure_element.php line: 189
 configure_element_memcache_servers = ""
 ;
-; configure_element.php line: 198
+; configure_element.php line: 199
+configure_element_search_results = ""
+;
+; configure_element.php line: 204
+configure_element_cache_link = ""
+;
+; configure_element.php line: 209
+configure_element_similar_link = ""
+;
+; configure_element.php line: 214
+configure_element_in_link = ""
+;
+; configure_element.php line: 219
+configure_element_ip_link = ""
+;
+; configure_element.php line: 223
 configure_element_crawl_robot = ""
 ;
-; configure_element.php line: 200
+; configure_element.php line: 225
 configure_element_robot_name = ""
 ;
-; configure_element.php line: 207
+; configure_element.php line: 232
 configure_element_robot_description = ""
 ;
-; configure_element.php line: 216
+; configure_element.php line: 241
 configure_element_submit = ""
 ;
 ; crawloptions_element.php line: 62
diff --git a/locale/zh-CN/statistics.txt b/locale/zh-CN/statistics.txt
index 9a3fa5a61..b752bdd23 100755
--- a/locale/zh-CN/statistics.txt
+++ b/locale/zh-CN/statistics.txt
@@ -1 +1 @@
-d:29;
\ No newline at end of file
+d:28;
\ No newline at end of file
diff --git a/models/profile_model.php b/models/profile_model.php
index a8c568e0e..f603174f7 100644
--- a/models/profile_model.php
+++ b/models/profile_model.php
@@ -53,7 +53,8 @@ class ProfileModel extends Model
             'DEFAULT_LOCALE', 'DEBUG_LEVEL', 'DBMS','DB_URL',
             'DB_NAME', 'DB_USER', 'DB_PASSWORD',
             'QUEUE_SERVER', 'AUTH_KEY', "ROBOT_DESCRIPTION", 'WEB_URI',
-            'USE_MEMCACHE', 'MEMCACHE_SERVERS');
+            'USE_MEMCACHE', 'MEMCACHE_SERVERS', 'CACHE_LINK',
+            'SIMILAR_LINK', 'IN_LINK', 'IP_LINK');
     /**
      *  {@inheritdoc}
      */
diff --git a/views/crawlstatus_view.php b/views/crawlstatus_view.php
index 1f03a84e8..b193cec43 100755
--- a/views/crawlstatus_view.php
+++ b/views/crawlstatus_view.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/**
  *  SeekQuarry/Yioop --
  *  Open Source Pure PHP Search Engine, Crawler, and Indexer
  *
@@ -40,32 +40,32 @@ if(!defined('BASE_DIR')) {echo "BAD REQUEST"; exit();}
  * @author Chris Pollett
  * @package seek_quarry
  * @subpackage view
- */
+ */

 class CrawlstatusView extends View
 {

     /**
-     * An Ajax call from the Manage Crawl Element in Admin View triggers
+     * An Ajax call from the Manage Crawl Element in Admin View triggers
      * this view to be instantiated. The renderView method then draws statistics
      * about the currently active crawl.The $data is supplied by the crawlStatus
      * method of the AdminController.
      *
      * @param array $data   info about the current crawl status
-     */
+     */
     public function renderView($data) {
         $base_url = "?c=admin&a=manageCrawls&YIOOP_TOKEN=".
             $data['YIOOP_TOKEN']."&arg=";
         ?>

         <h2><?php e(tl('crawlstatus_view_currently_processing')); ?></h2>
-        <p><b><?php e(tl('crawlstatus_view_description')); ?></b> <?php
+        <p><b><?php e(tl('crawlstatus_view_description')); ?></b> <?php
         if(isset($data['DESCRIPTION'])) {
             e($data['DESCRIPTION']);
             ?>&nbsp;&nbsp;
-            <button class="buttonbox" type="button"
-                onclick="javascript:document.location = '<?php
-                e($base_url); ?>stop'" ><?php
+            <button class="buttonbox" type="button"
+                onclick="javascript:document.location = '<?php
+                e($base_url); ?>stop'" ><?php
                 e(tl('managecrawls_element_stop_crawl'))?></button>
             <?php
         } else {
@@ -73,13 +73,13 @@ class CrawlstatusView extends View
         }
         ?></p>
         <p><b><?php e(tl('crawlstatus_view_time_started')); ?></b>
-        <?php
-        if(isset($data['CRAWL_TIME'])) {  e(date("r",$data['CRAWL_TIME'])); }
+        <?php
+        if(isset($data['CRAWL_TIME'])) {  e(date("r",$data['CRAWL_TIME'])); }
             else {e(tl('crawlstatus_view_no_crawl_time'));} ?></p>
         <p><b><?php e(tl('crawlstatus_view_queue_memory')); ?></b>
         <?php
         if(isset($data['QUEUE_PEAK_MEMORY'])) {
-            e($data['QUEUE_PEAK_MEMORY']);
+            e($data['QUEUE_PEAK_MEMORY']);
         } else {
             e(tl('crawlstatus_view_no_mem_data'));
         } ?>
@@ -87,7 +87,7 @@ class CrawlstatusView extends View
         <p><b><?php e(tl('crawlstatus_view_fetcher_memory')); ?></b>
         <?php
         if(isset($data['FETCHER_PEAK_MEMORY'])) {
-            e($data['FETCHER_PEAK_MEMORY']);
+            e($data['FETCHER_PEAK_MEMORY']);
         } else {
             e(tl('crawlstatus_view_no_mem_data'));
         } ?>
@@ -95,47 +95,47 @@ class CrawlstatusView extends View
         <p><b><?php e(tl('crawlstatus_view_webapp_memory')); ?></b>
         <?php
         if(isset($data['WEBAPP_PEAK_MEMORY'])) {
-            e($data['WEBAPP_PEAK_MEMORY']);
+            e($data['WEBAPP_PEAK_MEMORY']);
         } else {
             e(tl('crawlstatus_view_no_mem_data'));
         } ?>
         </p>
-        <p><b><?php e(tl('crawlstatus_view_visited_urls')); ?></b> <?php
-            if(isset($data['VISITED_URLS_COUNT'])) {
-                e($data['VISITED_URLS_COUNT']); } else {e("0");}
+        <p><b><?php e(tl('crawlstatus_view_visited_urls')); ?></b> <?php
+            if(isset($data['VISITED_URLS_COUNT'])) {
+                e($data['VISITED_URLS_COUNT']); } else {e("0");}
             ?></p>
-        <p><b><?php e(tl('crawlstatus_view_total_urls')); ?></b> <?php
-            if(isset($data['COUNT'])) { e($data['COUNT']); } else {e("0");}
+        <p><b><?php e(tl('crawlstatus_view_total_urls')); ?></b> <?php
+            if(isset($data['COUNT'])) { e($data['COUNT']); } else {e("0");}
             ?></p>
         <p><b><?php e(tl('crawlstatus_view_most_recent_fetcher')); ?></b>

         <?php
         if(isset($data['MOST_RECENT_FETCHER'])) {
-            e($data['MOST_RECENT_FETCHER']);
+            e($data['MOST_RECENT_FETCHER']);
         } else {
             e(tl('crawlstatus_view_no_fetcher'));
         }
         ?></p>

         <h2><?php e(tl('crawlstatus_view_most_recent_urls')); ?></h2>
-        <?php
-        if(isset($data['MOST_RECENT_URLS_SEEN']) &&
-            count($data['MOST_RECENT_URLS_SEEN']) > 0) {
+        <?php
+        if(isset($data['MOST_RECENT_URLS_SEEN']) &&
+            count($data['MOST_RECENT_URLS_SEEN']) > 0) {
             foreach($data['MOST_RECENT_URLS_SEEN'] as $url) {
                 e("<p>$url</p>");
             }
         } else {
             e("<p>".tl('crawlstatus_view_no_recent_urls')."</p>");
-        }
+        }
         ?>

         <h2><?php e(tl('crawlstatus_view_previous_crawls'))?></h2>
-        <?php
+        <?php
         if(isset($data['RECENT_CRAWLS']) && count($data['RECENT_CRAWLS']) > 0) {
             ?>

             <table class="crawlstable">
-            <tr><th><?php e(tl('crawlstatus_view_description'));?></th><th><?php
+            <tr><th><?php e(tl('crawlstatus_view_description'));?></th><th><?php
                 e(tl('crawlstatus_view_timestamp')); ?></th>
             <th><?php e(tl('crawlstatus_view_url_counts'));?></th>
             <th colspan="3"><?php e(tl('crawlstatus_view_actions'));?></th></tr>
@@ -146,27 +146,27 @@ class CrawlstatusView extends View
                     e("<b>{$crawl['CRAWL_TIME']}</b><br />");
                     e("<small>".date("r", $crawl['CRAWL_TIME']).
                         "</small>"); ?></td>
-                <td> <?php e( (isset($crawl["VISITED_URLS_COUNT"]) ?
+                <td> <?php e( (isset($crawl["VISITED_URLS_COUNT"]) ?
                     $crawl['VISITED_URLS_COUNT'] : 0) ."/".
                     $crawl['COUNT']); ?></td>
-                <td><a href="<?php e($base_url); ?>resume&timestamp=<?php
-                    e($crawl['CRAWL_TIME']); ?>"><?php
+                <td><a href="<?php e($base_url); ?>resume&timestamp=<?php
+                    e($crawl['CRAWL_TIME']); ?>"><?php
                     e(tl('crawlstatus_view_resume'));?></a></td>
                 <td>
-                <?php
+                <?php
                 if( $crawl['CRAWL_TIME'] != $data['CURRENT_INDEX']) { ?>
-                    <a href="<?php e($base_url); ?>index&timestamp=<?php
-                        e($crawl['CRAWL_TIME']); ?>"><?php
+                    <a href="<?php e($base_url); ?>index&timestamp=<?php
+                        e($crawl['CRAWL_TIME']); ?>"><?php
                         e(tl('crawlstatus_view_set_index')); ?></a>
-                <?php
+                <?php
                 } else { ?>
                     <?php e(tl('crawlstatus_view_search_index')); ?>
                 <?php
                 }
                 ?>
                 </td>
-                <td><a href="<?php e($base_url);
-                    ?>delete&timestamp=<?php e($crawl['CRAWL_TIME']);
+                <td><a href="<?php e($base_url);
+                    ?>delete&timestamp=<?php e($crawl['CRAWL_TIME']);
                     ?>"><?php e(tl('crawlstatus_view_delete')); ?></a></td>
                 </tr>
             <?php
@@ -177,7 +177,7 @@ class CrawlstatusView extends View
             e("<p class='red'>".tl('crawlstatus_view_no_previous_crawl')."</p>");
         }
         ?>
-    <?php
+    <?php
     }
 }
 ?>
diff --git a/views/elements/configure_element.php b/views/elements/configure_element.php
index 5a8549f71..783290793 100644
--- a/views/elements/configure_element.php
+++ b/views/elements/configure_element.php
@@ -195,6 +195,32 @@ class ConfigureElement extends Element
                 </div>
             </fieldset>
             </div>
+            <div class="topmargin">
+            <fieldset class="extrawidefield"><legend><?php
+                e(tl('configure_element_search_results'))?></legend>
+                <label for="cache-link"><input id='cache-link' type="checkbox"
+                    name="CACHE_LINK" value="true"
+                    <?php if(isset($data['CACHE_LINK']) && $data['CACHE_LINK']){
+                        e("checked='checked'");}?>
+                    /><?php e(tl('configure_element_cache_link')); ?></label>
+              <label for="similar-link"><input id='similar-link' type="checkbox"
+                    name="SIMILAR_LINK" value="true"
+                    <?php if(isset($data['SIMILAR_LINK']) &&
+                        $data['SIMILAR_LINK']){
+                        e("checked='checked'");}?>
+                    /><?php e(tl('configure_element_similar_link')); ?></label>
+                <label for="in-link"><input id='in-link' type="checkbox"
+                    name="IN_LINK" value="true"
+                    <?php if(isset($data['IN_LINK']) && $data['IN_LINK']){
+                        e("checked='checked'");}?>
+                    /><?php e(tl('configure_element_in_link')); ?></label>
+                <label for="ip-link"><input id='ip-link' type="checkbox"
+                    name="IP_LINK" value="true"
+                    <?php if(isset($data['IP_LINK']) && $data['IP_LINK']){
+                        e("checked='checked'");}?>
+                    /><?php e(tl('configure_element_ip_link')); ?></label>
+            </fieldset>
+            </div>
             <div class="topmargin"><fieldset><legend><?php
                 e(tl('configure_element_crawl_robot'))?></legend>
                 <div><b><label for="crawl-robot-name"><?php
diff --git a/views/search_view.php b/views/search_view.php
index 571912fcd..6792dff25 100755
--- a/views/search_view.php
+++ b/views/search_view.php
@@ -145,43 +145,60 @@ class SearchView extends View implements CrawlConstants
                         number_format($page[self::RELEVANCE], 2) ));
                     e(tl('search_view_score', $page[self::SCORE]));
                 if(isset($page[self::TYPE]) && $page[self::TYPE] != "link") {
-                ?>
-                    <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
-                        ?>&amp;c=search&amp;a=cache&amp;q=<?php
-                        e($data['QUERY']); ?>&amp;arg=<?php
-                        e(urlencode($page[self::URL]));
-                        ?>&amp;so=<?php  e($page[self::SUMMARY_OFFSET]);
-                        ?>&amp;g=<?php  e($page[self::CACHE_PAGE_PARTITION]);
-                        ?>&amp;its=<?php e($data['its']); ?>" >
-                    <?php
-                    if($page[self::TYPE] == "text/html" ||
-                        stristr($page[self::TYPE], "image")) {
-                        e(tl('search_view_cache'));
+                    if(CACHE_LINK) {
+                    ?>
+                        <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
+                            ?>&amp;c=search&amp;a=cache&amp;q=<?php
+                            e($data['QUERY']); ?>&amp;arg=<?php
+                            e(urlencode($page[self::URL]));
+                            ?>&amp;so=<?php  e($page[self::SUMMARY_OFFSET]);
+                            ?>&amp;g=<?php e($page[self::CACHE_PAGE_PARTITION]);
+                            ?>&amp;its=<?php e($data['its']); ?>" >
+                        <?php
+                        if($page[self::TYPE] == "text/html" ||
+                            stristr($page[self::TYPE], "image")) {
+                            e(tl('search_view_cache'));

-                    } else {
-                        e(tl('search_view_as_text'));
+                        } else {
+                            e(tl('search_view_as_text'));
+                        }
+                        ?></a>.
+                    <?php
                     }
-                    ?></a>. <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
+                    if(SIMILAR_LINK) {
+                    ?>
+                    <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
                         ?>&amp;c=search&amp;a=related&amp;arg=<?php
                         e(urlencode($page[self::URL])); ?>&amp;so=<?php
                         e($page[self::SUMMARY_OFFSET]);
                         ?>&amp;its=<?php e($data['its']); ?>" ><?php
                         e(tl('search_view_similar'));
-                    ?></a>. <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
+                    ?></a>.
+                    <?php
+                    }
+                    if(IN_LINK) {
+                    ?>
+                        <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
                         ?>&amp;c=search&amp;q=<?php
                         e("link:".urlencode($page[self::URL])); ?>&amp;
                         its=<?php e($data['its']); ?>" ><?php
                         e(tl('search_view_inlink'));
-                    ?></a>. <?php if(isset($page[self::IP_ADDRESSES])){
-                      foreach($page[self::IP_ADDRESSES] as $address) {?>
-                          <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
-                            ?>&amp;c=search&amp;q=<?php
-                            e('ip:'.$address);?>&amp;
-                            its=<?php e($data['its']); ?>" >IP:<?php
-                            e("$address");?></a>. <?php
-                      }
-                   }?></p>
+                    ?></a>.
+                    <?php
+                    }
+                    if(IP_LINK) {
+                    ?>
+                    <?php if(isset($page[self::IP_ADDRESSES])){
+                          foreach($page[self::IP_ADDRESSES] as $address) {?>
+                            <a href="?YIOOP_TOKEN=<?php e($data['YIOOP_TOKEN']);
+                                ?>&amp;c=search&amp;q=<?php
+                                e('ip:'.$address);?>&amp;
+                                its=<?php e($data['its']); ?>" >IP:<?php
+                                e("$address");?></a>. <?php
+                          }
+                        }?></p>
                 <?php
+                    }
                 } ?>
                 </div>