diff --git a/controllers/admin_controller.php b/controllers/admin_controller.php index 9b4200b70..bb913feaa 100755 --- a/controllers/admin_controller.php +++ b/controllers/admin_controller.php @@ -1878,6 +1878,10 @@ class AdminController extends Controller implements CrawlConstants $this->localeModel->getStaticPage( $_REQUEST['static_page'], $data['CURRENT_LOCALE_TAG']); + /*since page data can contain tags we clean it + htmlentities it just before displaying*/ + $data['PAGE_DATA'] = $this->clean($data['PAGE_DATA'], + "string"); break; } $data['SCRIPT'] .= "selectPage = elt('static-pages');". @@ -2298,6 +2302,10 @@ class AdminController extends Controller implements CrawlConstants strlen($data['ROBOT_DESCRIPTION']) == 0) { $data['ROBOT_DESCRIPTION'] = tl('admin_controller_describe_robot'); + } else { + //since the description might contain tags we apply htmlentities + $data['ROBOT_DESCRIPTION'] = + $this->clean($data['ROBOT_DESCRIPTION'], "string"); } if(!isset($data['MEMCACHE_SERVERS']) || strlen($data['MEMCACHE_SERVERS']) == 0) { diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index 187de78b9..9b78ace27 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/de/configure.ini b/locale/de/configure.ini index b8949b073..e1bdeb82f 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index 8fdd3630a..f3f9e4925 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "Search Index" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "Delete" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "No Previous Crawls" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/en-US/pages/bot.thtml b/locale/en-US/pages/bot.thtml index 388e861be..db29aa4e7 100755 --- a/locale/en-US/pages/bot.thtml +++ b/locale/en-US/pages/bot.thtml @@ -1 +1,5 @@ -Please describe your before you crawl. \ No newline at end of file +<h1>Hi there</h1> +& it's good to hear from you +<pre> +<p> +</pre> \ No newline at end of file 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 3646cb850..0c823e7d2 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 47d38926d..7f67658e6 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/he/configure.ini b/locale/he/configure.ini index ac0f07b8e..9788e67be 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "מחק" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index 4dedb2c03..44b32aa00 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index 800d12f9c..ec33a3fa4 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 046205e2e..b95abf028 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index 2d5d322b5..f84942f01 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "検索指数" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "削除" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "さっきの検索はありません" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index a46da73fe..3437068f0 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index ba4ebaae7..b72f9d571 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "검색 인덱스" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "삭제" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "전 크롤들이 없습니다." ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index 83be3f6f5..869028c86 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index 10ef0e44e..8accf905a 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index 5af0310e3..93f867efc 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 802f93837..842dd5d53 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index 52a9301a0..79629e94e 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index 3a1058b94..bca818e55 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "Tìm mục lục" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "Xoá" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index 8abbf3d74..33069019c 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -540,7 +540,7 @@ crawlstatus_view_search_index = "" ; crawlstatus_view.php line: 235 crawlstatus_view_delete = "" ; -; crawlstatus_view.php line: 242 +; crawlstatus_view.php line: 243 crawlstatus_view_no_previous_crawl = "" ; ; /Applications/XAMPP/xamppfiles/htdocs/git/yioop//views/elements diff --git a/views/crawlstatus_view.php b/views/crawlstatus_view.php index f21f06ad9..52df30fb8 100755 --- a/views/crawlstatus_view.php +++ b/views/crawlstatus_view.php @@ -240,7 +240,8 @@ class CrawlstatusView extends View ?></table> <?php } else { - e("<p class='red'>".tl('crawlstatus_view_no_previous_crawl')."</p>"); + e("<p class='red'>". + tl('crawlstatus_view_no_previous_crawl')."</p>"); } ?> <?php