diff --git a/configs/config.php b/configs/config.php index 92f3c2e41..3de22cf21 100755 --- a/configs/config.php +++ b/configs/config.php @@ -121,6 +121,7 @@ if(file_exists(WORK_DIRECTORY."/profile.php")) { define('DEFAULT_LOCALE', "en-US"); define('AUTH_KEY', 0); define('USE_MEMCACHE', false); + define('WORD_SUGGEST', true); define('CACHE_LINK', true); define('SIMILAR_LINK', true); define('IN_LINK', true); diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index 27ffef0c2..24e962dd2 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -2179,8 +2179,8 @@ class AdminController extends Controller implements CrawlConstants if(in_array($field, array( 'USE_FILECACHE', 'USE_MEMCACHE', 'IP_LINK', 'CACHE_LINK', 'SIMILAR_LINK', 'IN_LINK', - 'SIGNIN_LINK', "WEB_ACCESS", "RSS_ACCESS", - "API_ACCESS"))) { + 'SIGNIN_LINK', "WEB_ACCESS", 'RSS_ACCESS', + 'API_ACCESS', 'WORD_SUGGEST'))) { $profile[$field] = false; } } diff --git a/lib/index_bundle_iterators/network_iterator.php b/lib/index_bundle_iterators/network_iterator.php index 9625900f3..6ccee77d8 100644 --- a/lib/index_bundle_iterators/network_iterator.php +++ b/lib/index_bundle_iterators/network_iterator.php @@ -129,7 +129,7 @@ class NetworkIterator extends IndexBundleIterator $this->no_lookup = true; $this->results_per_block = ceil(self::MIN_FIND_RESULTS_PER_BLOCK); $this->base_query = "q=".urlencode($query). - "&f=serial&network=&raw=1&its=$timestamp"; + "&f=serial&network=&raw=2&its=$timestamp"; $this->queue_servers = $queue_servers; $this->limit = 0; $count = count($this->queue_servers); diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index ad3fd163e..cb34e979d 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/de/configure.ini b/locale/de/configure.ini index a2deab471..db27811ad 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index aa4da484c..5713e0c4a 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "Database User:" configure_element_databasepassword = "Database Password:" ; ; configure_element.php line: 189 -configure_element_search_results = "Search Auxiliary Links Displayed" +configure_element_search_page = "Search Page Elements and Links" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "Word Suggest" +; +; configure_element.php line: 200 configure_element_signin_link = "Signin" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "Cache" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "Similar" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "Inlinks" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "IP address" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "Name Server Set-up" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "Server Key:" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "Name Server URL:" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "Use Memcache:" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "Memcache Servers" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "Use Filecache:" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "Crawl Robot Set-up" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "Crawl Robot Name:" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "Robot Instance:" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "Robot Description" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "Submit" ; ; crawloptions_element.php line: 62 diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt index b6bef56f0..5a165df53 100755 --- a/locale/en-US/statistics.txt +++ b/locale/en-US/statistics.txt @@ -1 +1 @@ -d:99; \ No newline at end of file +d:100; \ No newline at end of file diff --git a/locale/es/configure.ini b/locale/es/configure.ini index a65529cca..e35b9eb9b 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 6ac3b446f..baa2d3d49 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 9cf855c1b..a85890d26 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "התחבר" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "שלח" ; ; crawloptions_element.php line: 62 diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index 01845249f..6f3ba1473 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index 15342fac0..dc261246d 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 14cd835c0..936c0fb6d 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 8db045565..64024ba91 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "データベースユーザー" configure_element_databasepassword = "データベースパスワード" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "検索ロボット設定" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "ロボット名" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "ロボット説明" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "サブミット" ; ; crawloptions_element.php line: 62 diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index f90465154..ced3147b9 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index 4f68fbdcc..9a3563359 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "데이터베이스 사용자:" configure_element_databasepassword = "데이터베이스 비밀번호:" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "크롤 로봇 설정" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "로봇 기술 " ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "크롤 로봇 이름:" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "제출 " ; ; crawloptions_element.php line: 62 diff --git a/locale/ko/statistics.txt b/locale/ko/statistics.txt index 2e3c64c6e..3bd9f6b04 100755 --- a/locale/ko/statistics.txt +++ b/locale/ko/statistics.txt @@ -1 +1 @@ -d:46; \ No newline at end of file +d:45; \ No newline at end of file diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index 491897bcd..dcf06a6c3 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index 9e10744cf..33ebfdb9f 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index 167549d69..4d8dfc859 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 0b54ad276..7004c4fb1 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index d31c3f55a..adc9051f7 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 9d362d0f0..93357c81f 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "Người sử dụng cơ sở dữ liệu:" configure_element_databasepassword = "Mật khẩu cơ sở dữ liệu:" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "Mô tả rô-bốt" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index e41ad4fbe..dae609a65 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -603,54 +603,57 @@ configure_element_databaseuser = "" configure_element_databasepassword = "" ; ; configure_element.php line: 189 -configure_element_search_results = "" +configure_element_search_page = "" ; -; configure_element.php line: 194 +; configure_element.php line: 195 +configure_element_wd_suggest = "" +; +; configure_element.php line: 200 configure_element_signin_link = "" ; -; configure_element.php line: 199 +; configure_element.php line: 205 configure_element_cache_link = "" ; -; configure_element.php line: 205 +; configure_element.php line: 211 configure_element_similar_link = "" ; -; configure_element.php line: 210 +; configure_element.php line: 216 configure_element_in_link = "" ; -; configure_element.php line: 215 +; configure_element.php line: 221 configure_element_ip_link = "" ; -; configure_element.php line: 219 +; configure_element.php line: 225 configure_element_name_server = "" ; -; configure_element.php line: 221 +; configure_element.php line: 227 configure_element_name_server_key = "" ; -; configure_element.php line: 227 +; configure_element.php line: 233 configure_element_name_server_url = "" ; -; configure_element.php line: 233 +; configure_element.php line: 239 configure_element_use_memcache = "" ; -; configure_element.php line: 240 +; configure_element.php line: 246 configure_element_memcache_servers = "" ; -; configure_element.php line: 248 +; configure_element.php line: 254 configure_element_use_filecache = "" ; -; configure_element.php line: 257 +; configure_element.php line: 263 configure_element_crawl_robot = "" ; -; configure_element.php line: 259 +; configure_element.php line: 265 configure_element_robot_name = "" ; -; configure_element.php line: 267 +; configure_element.php line: 273 configure_element_robot_instance = "" ; -; configure_element.php line: 274 +; configure_element.php line: 280 configure_element_robot_description = "" ; -; configure_element.php line: 283 +; configure_element.php line: 289 configure_element_submit = "" ; ; crawloptions_element.php line: 62 diff --git a/models/profile_model.php b/models/profile_model.php index d59af0d0f..e87c7f469 100644 --- a/models/profile_model.php +++ b/models/profile_model.php @@ -53,8 +53,9 @@ class ProfileModel extends Model 'DEFAULT_LOCALE', 'DEBUG_LEVEL', 'DBMS','DB_HOST', 'DB_NAME', 'DB_USER', 'DB_PASSWORD', 'NAME_SERVER', 'AUTH_KEY', "ROBOT_DESCRIPTION", 'WEB_URI', - 'USE_MEMCACHE', 'MEMCACHE_SERVERS', 'USE_FILECACHE', 'CACHE_LINK', - 'SIMILAR_LINK', 'IN_LINK', 'IP_LINK', 'SIGNIN_LINK', + 'USE_MEMCACHE', 'MEMCACHE_SERVERS', 'USE_FILECACHE', + 'WORD_SUGGEST', 'CACHE_LINK', 'SIMILAR_LINK', + 'IN_LINK', 'IP_LINK', 'SIGNIN_LINK', 'ROBOT_INSTANCE', "WEB_ACCESS", "RSS_ACCESS", "API_ACCESS", 'TITLE_WEIGHT','DESCRIPTION_WEIGHT','LINK_WEIGHT'); /** diff --git a/views/elements/configure_element.php b/views/elements/configure_element.php index d5b04a8bf..15ab7ae8a 100644 --- a/views/elements/configure_element.php +++ b/views/elements/configure_element.php @@ -187,7 +187,13 @@ class ConfigureElement extends Element </div> <div class="topmargin"> <fieldset><legend><?php - e(tl('configure_element_search_results'))?></legend> + e(tl('configure_element_search_page'))?></legend> + <label for="wd-suggest"><input id='wd-suggest' type="checkbox" + name="WORD_SUGGEST" value="true" + <?php if(isset($data['WORD_SUGGEST']) && + $data['WORD_SUGGEST']){ + e("checked='checked'");}?> + /><?php e(tl('configure_element_wd_suggest')); ?></label> <label for="signin-link"><input id='signin-link' type="checkbox" name="SIGNIN_LINK" value="true" <?php if(isset($data['SIGNIN_LINK']) && diff --git a/views/search_view.php b/views/search_view.php index 50b90c07e..0d80f846a 100755 --- a/views/search_view.php +++ b/views/search_view.php @@ -87,14 +87,14 @@ class SearchView extends View implements CrawlConstants } ?> <div class="searchbox"> - <form id="searchForm" method="get" action='?'> <p> <input type="hidden" name="YIOOP_TOKEN" value="<?php e($data['YIOOP_TOKEN']); ?>" /> <input type="hidden" name="its" value="<?php e($data['its']); ?>" /> - <input type="text" autocomplete="off" onpaste="askeyup(this)" - onkeyup="askeyup(this)" + <input type="text" <?php if(WORD_SUGGEST) { ?> + autocomplete="off" onkeyup="askeyup(this)" + <?php } ?> title="<?php e(tl('search_view_input_label')); ?>" id="search-name" name="q" value="<?php if(isset($data['QUERY'])) { e(urldecode($data['QUERY']));} ?>"