diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index c8a719b01..69988a4db 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -1820,6 +1820,12 @@ class AdminController extends Controller implements CrawlConstants } else { $data["time"] = 30; } + if(isset($_REQUEST["NO_REFRESH"])) { + $data["NO_REFRESH"] = $this->clean( + $_REQUEST["NO_REFRESH"], "bool"); + } else { + $data["NO_REFRESH"] = false; + } $data["ELEMENT"] = "machinelogElement"; $data["REFRESH_LOG"] = "&time=".$data["time"]; diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index 4d3bfdc0c..070f7e8e4 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "مماثلة" ; search_view.php line: 281 search_view_inlink = "Inlinks" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "رتبة: %s" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "ق Rel:%" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "ق Prox:%" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "نقاط: %s" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "مزيد من الإحصاءات" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "العودة" settings_view_save = "حفظ الإعدادات" ; ; settings_view.php line: 124 -setting_install_search_plugin = "تثبيت يوب! فتح بحث البرنامج المساعد " +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "تسجيل الدخول" diff --git a/locale/ar/statistics.txt b/locale/ar/statistics.txt index ed521f104..3e3765d1c 100755 --- a/locale/ar/statistics.txt +++ b/locale/ar/statistics.txt @@ -1 +1 @@ -d:95; \ No newline at end of file +d:94; \ No newline at end of file diff --git a/locale/de/configure.ini b/locale/de/configure.ini index fa4cc2ea7..60eba1ab1 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index fda259c65..3bf5b7f8e 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "Similar" ; search_view.php line: 281 search_view_inlink = "Inlinks" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "Rank:%s " ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "Rel:%s " ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "Prox:%s" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "Score:%s" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "More Statistics" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "Return" settings_view_save = "Save Settings" ; ; settings_view.php line: 124 -setting_install_search_plugin = "Install Yioop! Open Search Plugin" +settings_install_search_plugin = "Install Yioop! Open Search Plugin" ; ; signin_view.php line: 67 signin_view_signin = "Signin" diff --git a/locale/en-US/statistics.txt b/locale/en-US/statistics.txt index 5a165df53..b6bef56f0 100755 --- a/locale/en-US/statistics.txt +++ b/locale/en-US/statistics.txt @@ -1 +1 @@ -d:100; \ No newline at end of file +d:99; \ No newline at end of file diff --git a/locale/es/configure.ini b/locale/es/configure.ini index 212d04ecb..176fb2fe6 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini index 0a5f60639..c5fb49dbd 100755 --- a/locale/fa/configure.ini +++ b/locale/fa/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index e50612e4a..a71865441 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "Pages similaires" ; search_view.php line: 281 search_view_inlink = "Liens retour" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "Rang: %s" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "Pertinence: %s" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "Proximité: %s" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "Total: %s" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "Retourner à Yioop" settings_view_save = "Enregistrer les préférences" ; ; settings_view.php line: 124 -setting_install_search_plugin = "Installer le Yioop! plugin de rechercher" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "Connexion" diff --git a/locale/he/configure.ini b/locale/he/configure.ini index 918122eef..0f6bcbca8 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index db390384e..234324bc2 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "Yioop! पर लौटें " settings_view_save = "परिवर्तन सहेजें " ; ; settings_view.php line: 124 -setting_install_search_plugin = "Yioop! खोज प्लगइन इन्स्टाल करें" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "साइन इन" diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index cd7d13437..5de118ff7 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "Urutan" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 52453f06f..ca3669c93 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "Simile" ; search_view.php line: 281 search_view_inlink = "Inlink" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "Pos.: %s " ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "Rel: %s " ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "Pros: %s" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "Punteggio %s" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "Altre statistiche" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "Ritorna a Yioop!" settings_view_save = "Salva impostazioni" ; ; settings_view.php line: 124 -setting_install_search_plugin = "Installa Plugin Open Search di Yioop!" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "Accedi" diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 54d1c6058..844c96165 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "同じビュー" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "ランク：%s" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "関連：%s" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "近さ: %s" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "スコア %s" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "ウィオップ！に戻る" settings_view_save = "設定の保存" ; ; settings_view.php line: 124 -setting_install_search_plugin = "インストールウィオップ！オプン検索プラグイン" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "サインイン" diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index 08108ef1f..92fc855e2 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "ಸಮಾನರೂಪದ" ; search_view.php line: 281 search_view_inlink = "ಒಳ ಕೊಂಡಿ" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "ಸ್ಥಾನ: %s" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "ಪ್ರಾಸ್ತಾವಿಕ: %s" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "ಸಾನಿಧ್ಯ: %s" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "ಅಂಕ: %s " ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "ಯೂಪ್'ಗೆ ಮರಳಿರಿ" settings_view_save = "ಈ ಹೊಂದಾಣಿಕೆಯನ್ನು ಉಳಿಸಿ" ; ; settings_view.php line: 124 -setting_install_search_plugin = "ಯೂಪ್ ನನ್ನು ಅನುಸ್ಟಾಪಿಸಿ. ಯೂಪ್, ಒಂದು ಪ್ರಕಟ ಶೋಧನಾ ಒಳ-ಸೇರಿಕೆ" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "ಒಳಪ್ರವೇಶಿಸಿ" diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index 413e62392..647a7eb53 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "유사성" ; search_view.php line: 281 search_view_inlink = "인링크" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "랭크: %s" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "관련성: %s " ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "점수 %s" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "Yioop 으로 돌아가기!" settings_view_save = "세팅 저장" ; ; settings_view.php line: 124 -setting_install_search_plugin = "Yioop 오픈 서치 플러그인 인스톨 " +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "사인인" diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index a814f2697..eafae4ec9 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index d025afe51..8b891b9c8 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index 53c1ee9a7..912cc6570 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/te/configure.ini b/locale/te/configure.ini index b5dcb64e6..4eb9721c4 100755 --- a/locale/te/configure.ini +++ b/locale/te/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/th/configure.ini b/locale/th/configure.ini index ff5c5857e..6a05cacc3 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index 0a38c15b1..fda03243f 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "" settings_view_save = "" ; ; settings_view.php line: 124 -setting_install_search_plugin = "" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "" diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 275586a93..85bf5cfef 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "Tương Tự" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "Thứ Tự: %s" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "Thích hợp: %s" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "Gần: %s" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "Điểm: %s" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "Trở lại trang Yioop" settings_view_save = "Giữ sự sắp đặt" ; ; settings_view.php line: 124 -setting_install_search_plugin = "Cài đặt Yioop! Mở tìm kiếm" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "Đăng nhập" diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index ab98af9f3..0695c3a9d 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -1437,19 +1437,19 @@ search_view_similar = "相似" ; search_view.php line: 281 search_view_inlink = "" ; -; search_view.php line: 301 +; search_view.php line: 300 search_view_rank = "排名: %s 名" ; -; search_view.php line: 303 +; search_view.php line: 302 search_view_relevancy = "關聯度: %s 趴" ; -; search_view.php line: 305 +; search_view.php line: 304 search_view_proximity = "" ; -; search_view.php line: 307 +; search_view.php line: 306 search_view_score = "分數" ; -; search_view.php line: 331 +; search_view.php line: 330 search_view_more_statistics = "" ; ; settings_view.php line: 80 @@ -1474,7 +1474,7 @@ settings_view_return_yioop = "回到首頁" settings_view_save = "儲存" ; ; settings_view.php line: 124 -setting_install_search_plugin = "安裝Yioop!插件" +settings_install_search_plugin = "" ; ; signin_view.php line: 67 signin_view_signin = "登入" diff --git a/tests/it_stemmer_test.php b/tests/it_stemmer_test.php index 85f33b0a7..a3475782e 100644 --- a/tests/it_stemmer_test.php +++ b/tests/it_stemmer_test.php @@ -55,7 +55,8 @@ require_once BASE_DIR.'lib/unit_test.php'; */ class ItStemmerTest extends UnitTest -{ function setUp() +{ + function setUp() { $this->test_objects['FILE1'] = new ItStemmer(); } @@ -97,4 +98,4 @@ class ItStemmerTest extends UnitTest } } } -?> \ No newline at end of file +?> diff --git a/views/elements/machinelog_element.php b/views/elements/machinelog_element.php index d0b3d4a39..ffbb7f03c 100644 --- a/views/elements/machinelog_element.php +++ b/views/elements/machinelog_element.php @@ -61,7 +61,7 @@ class MachinelogElement extends Element ><?php e(tl('machinelog_element_back_to_manage'))?></a> </div> <h2><?php e(tl('machinelog_element_log_file',$data['LOG_TYPE']));?></h2> - <?php if(!isset($_REQUEST['NO_REFRESH']) ) {?> + <?php if(!$data['NO_REFRESH']) {?> <p>[<a href="?c=admin&<?php e(CSRF_TOKEN."=".$data[CSRF_TOKEN]);?>&a=manageMachines<?php e($data['REFRESH_LOG']); ?>&NO_REFRESH=true" ><?php @@ -75,7 +75,7 @@ class MachinelogElement extends Element <pre><?php e(htmlentities(wordwrap($data["LOG_FILE_DATA"], 60, "\n", true))); ?></pre> - <?php if(!isset($_REQUEST['NO_REFRESH'])) {?> + <?php if(!$data['NO_REFRESH']) {?> <script type="text/javascript" > var updateId; function logUpdate() @@ -100,4 +100,4 @@ class MachinelogElement extends Element <?php } } -?> \ No newline at end of file +?> diff --git a/views/settings_view.php b/views/settings_view.php index 01fb9b63e..edc4be910 100755 --- a/views/settings_view.php +++ b/views/settings_view.php @@ -78,7 +78,8 @@ class SettingsView extends View e(CSRF_TOKEN."=".$data[CSRF_TOKEN])?>&its=<?php e($data['its'])?>"><img src="<?php e($logo); ?>" alt="Yioop!" /></a><span> - <?php - e(tl('settings_view_settings')); ?></span></h1> + e(tl('settings_view_settings')); ?></span> +</h1> <div class="settings"> <form class="user_settings" method="get" action="."> <table> @@ -89,6 +90,7 @@ class SettingsView extends View class="table-input"><?php $this->optionsHelper->render( "per-page", "perpage", $data['PER_PAGE'], $data['PER_PAGE_SELECTED']); ?> </td></tr> +<tr> <td class="table-label"><label for="open-in-tabs"><b><?php e(tl('settings_view_open_in_tabs')); ?></b></label></td><td class="table-input"><input type="checkbox" id="open-in-tabs" @@ -120,13 +122,13 @@ class SettingsView extends View </form> </div> <div class="setting-footer"><a - href="javascript:window.external.AddSearchProvider('<?php - e(NAME_SERVER."yioopbar.xml");?>')"><?php - e(tl('setting_install_search_plugin')); + href="javascript:window.external.AddSearchProvider('<?php + e(NAME_SERVER."yioopbar.xml");?>')"><?php + e(tl('settings_install_search_plugin')); ?></a>.</div> </div> <div class='landing-spacer'></div> <?php } } -?> \ No newline at end of file +?>