Updating golden XSS-test data file

1 files changed, 35 insertions, 33 deletions

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 5b43d1e5..5686bf9e 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -6,7 +6,7 @@ modules/comment/views/admin_block_recent_comments.html.php   10  DIRTY    galler
 modules/comment/views/admin_comments.html.php                42  DIRTY    $menu
 modules/comment/views/admin_comments.html.php                106 DIRTY    $comment->id
 modules/comment/views/admin_comments.html.php                106 DIRTY    ($i%2==0)?"gOddRow":"gEvenRow"
-modules/comment/views/admin_comments.html.php                122 DIRTY    $item->url()
+modules/comment/views/admin_comments.html.php                122 DIRTY_JS $item->url()
 modules/comment/views/admin_comments.html.php                124 DIRTY    $item->thumb_url()
 modules/comment/views/admin_comments.html.php                126 DIRTY    photo::img_dimensions($item->thumb_width,$item->thumb_height,75)
 modules/comment/views/admin_comments.html.php                134 DIRTY    gallery::date($comment->created)
@@ -19,9 +19,9 @@ modules/comment/views/admin_comments.html.php                183 DIRTY    $comme
 modules/comment/views/admin_comments.html.php                196 DIRTY    $pager
 modules/comment/views/comment.html.php                       2   DIRTY    $comment->id;
 modules/comment/views/comment.mrss.php                       10  DIRTY    $feed->uri
-modules/comment/views/comment.mrss.php                       13  DIRTY    $feed->uri
-modules/comment/views/comment.mrss.php                       16  DIRTY    $feed->previous_page_uri
-modules/comment/views/comment.mrss.php                       19  DIRTY    $feed->next_page_uri
+modules/comment/views/comment.mrss.php                       13  DIRTY_JS $feed->uri
+modules/comment/views/comment.mrss.php                       16  DIRTY_JS $feed->previous_page_uri
+modules/comment/views/comment.mrss.php                       19  DIRTY_JS $feed->next_page_uri
 modules/comment/views/comment.mrss.php                       21  DIRTY    $pub_date
 modules/comment/views/comment.mrss.php                       22  DIRTY    $pub_date
 modules/comment/views/comment.mrss.php                       28  DIRTY    $child->item_uri
@@ -41,7 +41,7 @@ modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY    log::s
 modules/gallery/views/admin_block_log_entries.html.php       6   DIRTY    gallery::date_time($entry->timestamp)
 modules/gallery/views/admin_block_log_entries.html.php       7   DIRTY    $entry->message
 modules/gallery/views/admin_block_log_entries.html.php       8   DIRTY    $entry->html
-modules/gallery/views/admin_block_news.html.php              5   DIRTY    $entry["link"]
+modules/gallery/views/admin_block_news.html.php              5   DIRTY_JS $entry["link"]
 modules/gallery/views/admin_block_news.html.php              5   DIRTY    $entry["title"]
 modules/gallery/views/admin_block_news.html.php              7   DIRTY    text::limit_words(strip_tags($entry["description"]),25);
 modules/gallery/views/admin_block_photo_stream.html.php      6   DIRTY    photo::img_dimensions($photo->width,$photo->height,72)
@@ -166,17 +166,17 @@ modules/gallery/views/upgrader.html.php                      44  DIRTY    $modul
 modules/gallery/views/upgrader.html.php                      45  DIRTY    $id
 modules/gallery/views/upgrader.html.php                      49  DIRTY    $module->version
 modules/gallery/views/upgrader.html.php                      52  DIRTY    $module->code_version
-modules/image_block/views/image_block_block.html.php         3   DIRTY    $item->url()
+modules/image_block/views/image_block_block.html.php         3   DIRTY_JS $item->url()
 modules/image_block/views/image_block_block.html.php         4   DIRTY    $item->thumb_img(array("class"=>"gThumbnail"))
 modules/info/views/info_block.html.php                       22  DIRTY    date("M j, Y H:i:s",$item->captured)
-modules/info/views/info_block.html.php                       29  DIRTY    $item->owner->url
-modules/notification/views/comment_published.html.php        28  DIRTY    $comment->item()->url(array(),true)
+modules/info/views/info_block.html.php                       29  DIRTY_JS $item->owner->url
+modules/notification/views/comment_published.html.php        28  DIRTY_JS $comment->item()->url(array(),true)
 modules/notification/views/comment_published.html.php        29  DIRTY    $comment->item()->url(array(),true)
-modules/notification/views/item_added.html.php               16  DIRTY    $item->url(array(),true)
+modules/notification/views/item_added.html.php               16  DIRTY_JS $item->url(array(),true)
 modules/notification/views/item_added.html.php               17  DIRTY    $item->url(array(),true)
-modules/notification/views/item_deleted.html.php             18  DIRTY    $item->parent()->url(array(),true)
+modules/notification/views/item_deleted.html.php             18  DIRTY_JS $item->parent()->url(array(),true)
 modules/notification/views/item_deleted.html.php             19  DIRTY    $item->parent()->url(array(),true)
-modules/notification/views/item_updated.html.php             20  DIRTY    $item->url(array(),true)
+modules/notification/views/item_updated.html.php             20  DIRTY_JS $item->url(array(),true)
 modules/notification/views/item_updated.html.php             20  DIRTY    $item->url(array(),true)
 modules/organize/views/organize_dialog.html.php              22  DIRTY    $album_tree
 modules/organize/views/organize_dialog.html.php              29  DIRTY    $micro_thumb_grid
@@ -198,9 +198,9 @@ modules/recaptcha/views/admin_recaptcha.html.php             10  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY    $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY    $public_key
 modules/rss/views/feed.mrss.php                              10  DIRTY    $feed->uri
-modules/rss/views/feed.mrss.php                              13  DIRTY    $feed->uri
-modules/rss/views/feed.mrss.php                              16  DIRTY    $feed->previous_page_uri
-modules/rss/views/feed.mrss.php                              19  DIRTY    $feed->next_page_uri
+modules/rss/views/feed.mrss.php                              13  DIRTY_JS $feed->uri
+modules/rss/views/feed.mrss.php                              16  DIRTY_JS $feed->previous_page_uri
+modules/rss/views/feed.mrss.php                              19  DIRTY_JS $feed->next_page_uri
 modules/rss/views/feed.mrss.php                              21  DIRTY    $pub_date
 modules/rss/views/feed.mrss.php                              22  DIRTY    $pub_date
 modules/rss/views/feed.mrss.php                              28  DIRTY    date("D, d M Y H:i:s T",$child->created);
@@ -229,14 +229,13 @@ modules/rss/views/feed.mrss.php                              71  DIRTY    @files
 modules/rss/views/feed.mrss.php                              72  DIRTY    $child->height
 modules/rss/views/feed.mrss.php                              73  DIRTY    $child->width
 modules/rss/views/feed.mrss.php                              74  DIRTY    $child->mime_type
-modules/rss/views/rss_block.html.php                         6   DIRTY    rss::url($url)
+modules/rss/views/rss_block.html.php                         6   DIRTY_JS rss::url($url)
 modules/search/views/search.html.php                         30  DIRTY    $item_class
 modules/search/views/search.html.php                         32  DIRTY    $item->thumb_img()
 modules/server_add/views/admin_server_add.html.php           15  DIRTY    $id
 modules/server_add/views/admin_server_add.html.php           24  DIRTY    $form
-modules/server_add/views/server_add_tree.html.php            12  DIRTY    $dir
+modules/server_add/views/server_add_tree.html.php            12  DIRTY    html::js_string($dir)
 modules/server_add/views/server_add_tree.html.php            20  DIRTY    is_dir($file)?"ui-icon-folder-collapsed":"ui-icon-document"
-modules/server_add/views/server_add_tree.html.php            25  DIRTY    strtr($file,array('"'=>'\\"'))
 modules/server_add/views/server_add_tree_dialog.html.php     23  DIRTY    $tree
 modules/tag/views/admin_tags.html.php                        13  DIRTY    $csrf
 modules/tag/views/admin_tags.html.php                        50  DIRTY    $tag->id
@@ -259,6 +258,7 @@ modules/user/views/login_ajax.html.php                       37  DIRTY    $form
 modules/watermark/views/admin_watermarks.html.php            19  DIRTY    $width
 modules/watermark/views/admin_watermarks.html.php            19  DIRTY    $height
 modules/watermark/views/admin_watermarks.html.php            19  DIRTY    $url
+themes/admin_default/views/admin.html.php                    16  DIRTY_JS $theme->url()
 themes/admin_default/views/admin.html.php                    34  DIRTY    $theme->admin_head()
 themes/admin_default/views/admin.html.php                    38  DIRTY    $theme->admin_page_top()
 themes/admin_default/views/admin.html.php                    46  DIRTY    $theme->admin_header_top()
@@ -273,32 +273,34 @@ themes/admin_default/views/block.html.php                    2   DIRTY    $id
 themes/admin_default/views/block.html.php                    2   DIRTY    $css_id
 themes/admin_default/views/block.html.php                    10  DIRTY    $title
 themes/admin_default/views/block.html.php                    13  DIRTY    $content
-themes/admin_default/views/pager.html.php                    13  DIRTY    str_replace('{page}',1,$url)
-themes/admin_default/views/pager.html.php                    20  DIRTY    str_replace('{page}',$previous_page,$url)
+themes/admin_default/views/pager.html.php                    13  DIRTY_JS str_replace('{page}',1,$url)
+themes/admin_default/views/pager.html.php                    20  DIRTY_JS str_replace('{page}',$previous_page,$url)
 themes/admin_default/views/pager.html.php                    27  DIRTY    $from_to_msg
-themes/admin_default/views/pager.html.php                    30  DIRTY    str_replace('{page}',$next_page,$url)
-themes/admin_default/views/pager.html.php                    37  DIRTY    str_replace('{page}',$last_page,$url)
+themes/admin_default/views/pager.html.php                    30  DIRTY_JS str_replace('{page}',$next_page,$url)
+themes/admin_default/views/pager.html.php                    37  DIRTY_JS str_replace('{page}',$last_page,$url)
 themes/default/views/album.html.php                          16  DIRTY    $child->id
 themes/default/views/album.html.php                          16  DIRTY    $item_class
-themes/default/views/album.html.php                          18  DIRTY    $child->url()
+themes/default/views/album.html.php                          18  DIRTY_JS $child->url()
 themes/default/views/album.html.php                          19  DIRTY    $child->thumb_img(array("class"=>"gThumbnail"))
-themes/default/views/album.html.php                          23  DIRTY    $child->url()
+themes/default/views/album.html.php                          23  DIRTY_JS $child->url()
 themes/default/views/block.html.php                          2   DIRTY    $anchor
 themes/default/views/block.html.php                          3   DIRTY    $css_id
 themes/default/views/block.html.php                          4   DIRTY    $title
 themes/default/views/block.html.php                          6   DIRTY    $content
 themes/default/views/dynamic.html.php                        11  DIRTY    $child->is_album()?"gAlbum":""
-themes/default/views/dynamic.html.php                        13  DIRTY    $child->url()
+themes/default/views/dynamic.html.php                        13  DIRTY_JS $child->url()
 themes/default/views/dynamic.html.php                        14  DIRTY    $child->id
 themes/default/views/dynamic.html.php                        15  DIRTY    $child->thumb_url()
 themes/default/views/dynamic.html.php                        16  DIRTY    $child->thumb_width
 themes/default/views/dynamic.html.php                        17  DIRTY    $child->thumb_height
 themes/default/views/footer.html.php                         4   DIRTY    $footer_text
 themes/default/views/header.html.php                         5   DIRTY    $header_text
-themes/default/views/movie.html.php                          8   DIRTY    $previous_item->url()
-themes/default/views/movie.html.php                          18  DIRTY    $next_item->url()
+themes/default/views/movie.html.php                          8   DIRTY_JS $previous_item->url()
+themes/default/views/movie.html.php                          18  DIRTY_JS $next_item->url()
 themes/default/views/movie.html.php                          28  DIRTY    $item->movie_img(array("class"=>"gMovie","id"=>"gMovieId-{$item->id}"))
 themes/default/views/page.html.php                           9   DIRTY    $page_title
+themes/default/views/page.html.php                           26  DIRTY_JS $theme->url()
+themes/default/views/page.html.php                           32  DIRTY_JS $theme->url()
 themes/default/views/page.html.php                           41  DIRTY    $new_width
 themes/default/views/page.html.php                           42  DIRTY    $new_height
 themes/default/views/page.html.php                           43  DIRTY    $thumb_proportion
@@ -306,14 +308,14 @@ themes/default/views/page.html.php                           79  DIRTY    newVie
 themes/default/views/page.html.php                           86  DIRTY    $content
 themes/default/views/page.html.php                           92  DIRTY    newView("sidebar.html")
 themes/default/views/page.html.php                           97  DIRTY    newView("footer.html")
-themes/default/views/pager.html.php                          13  DIRTY    str_replace('{page}',1,$url)
-themes/default/views/pager.html.php                          20  DIRTY    str_replace('{page}',$previous_page,$url)
+themes/default/views/pager.html.php                          13  DIRTY_JS str_replace('{page}',1,$url)
+themes/default/views/pager.html.php                          20  DIRTY_JS str_replace('{page}',$previous_page,$url)
 themes/default/views/pager.html.php                          27  DIRTY    $from_to_msg
-themes/default/views/pager.html.php                          30  DIRTY    str_replace('{page}',$next_page,$url)
-themes/default/views/pager.html.php                          37  DIRTY    str_replace('{page}',$last_page,$url)
+themes/default/views/pager.html.php                          30  DIRTY_JS str_replace('{page}',$next_page,$url)
+themes/default/views/pager.html.php                          37  DIRTY_JS str_replace('{page}',$last_page,$url)
 themes/default/views/photo.html.php                          8   DIRTY_JS $theme->item()->width
 themes/default/views/photo.html.php                          8   DIRTY_JS $theme->item()->height
-themes/default/views/photo.html.php                          21  DIRTY    $previous_item->url()
-themes/default/views/photo.html.php                          31  DIRTY    $next_item->url()
-themes/default/views/photo.html.php                          43  DIRTY    $item->file_url()
+themes/default/views/photo.html.php                          21  DIRTY_JS $previous_item->url()
+themes/default/views/photo.html.php                          31  DIRTY_JS $next_item->url()
+themes/default/views/photo.html.php                          43  DIRTY_JS $item->file_url()
 themes/default/views/photo.html.php                          45  DIRTY    $item->resize_img(array("id"=>"gPhotoId-{$item->id}","class"=>"gResize"))