Verified.

1 files changed, 49 insertions, 46 deletions

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index ef92970b..3eae3d07 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -122,50 +122,52 @@ modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info-
 modules/gallery/views/admin_themes.html.php                  78  DIRTY    $info->description
 modules/gallery/views/admin_themes_preview.html.php          8   DIRTY_ATTR $url
 modules/gallery/views/error_404.html.php                     14  DIRTY    $login_form
-modules/gallery/views/error_admin.html.php                   183 DIRTY    $type
-modules/gallery/views/error_admin.html.php                   183 DIRTY    $code
-modules/gallery/views/error_admin.html.php                   186 DIRTY    $message
-modules/gallery/views/error_admin.html.php                   189 DIRTY_ATTR $error_id
-modules/gallery/views/error_admin.html.php                   194 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   194 DIRTY    $line
-modules/gallery/views/error_admin.html.php                   199 DIRTY_ATTR ($num==$line)?"highlight":""
-modules/gallery/views/error_admin.html.php                   199 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   199 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   211 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   211 DIRTY_JS $source_id
-modules/gallery/views/error_admin.html.php                   211 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   211 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   213 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   213 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   220 DIRTY    $step["function"]
-modules/gallery/views/error_admin.html.php                   221 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   221 DIRTY_JS $args_id
-modules/gallery/views/error_admin.html.php                   225 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   230 DIRTY    $name
-modules/gallery/views/error_admin.html.php                   233 DIRTY    Kohana_Exception::safe_dump($arg,$name)
-modules/gallery/views/error_admin.html.php                   241 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   241 DIRTY_ATTR ($num==$step["line"])?"highlight":""
-modules/gallery/views/error_admin.html.php                   241 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   241 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   251 DIRTY_ATTR $env_id=$error_id."environment"
-modules/gallery/views/error_admin.html.php                   251 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   253 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   255 DIRTY_ATTR $env_id=$error_id."environment_included"
-modules/gallery/views/error_admin.html.php                   255 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   255 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   256 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   261 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   268 DIRTY_ATTR $env_id=$error_id."environment_loaded"
-modules/gallery/views/error_admin.html.php                   268 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   268 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   269 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   274 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   282 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
-modules/gallery/views/error_admin.html.php                   283 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   283 DIRTY    $var
-modules/gallery/views/error_admin.html.php                   284 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   290 DIRTY    $key
-modules/gallery/views/error_admin.html.php                   294 DIRTY    Kohana_Exception::safe_dump($value,$key)
+modules/gallery/views/error_admin.html.php                   178 DIRTY    @gallery_block::get("platform_info")
+modules/gallery/views/error_admin.html.php                   179 DIRTY    @gallery_block::get("stats")
+modules/gallery/views/error_admin.html.php                   184 DIRTY    $type
+modules/gallery/views/error_admin.html.php                   184 DIRTY    $code
+modules/gallery/views/error_admin.html.php                   187 DIRTY    $message
+modules/gallery/views/error_admin.html.php                   190 DIRTY_ATTR $error_id
+modules/gallery/views/error_admin.html.php                   195 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   195 DIRTY    $line
+modules/gallery/views/error_admin.html.php                   200 DIRTY_ATTR ($num==$line)?"highlight":""
+modules/gallery/views/error_admin.html.php                   200 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   200 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   212 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   212 DIRTY_JS $source_id
+modules/gallery/views/error_admin.html.php                   212 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   212 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   214 DIRTY    Kohana_Exception::debug_path($step["file"])
+modules/gallery/views/error_admin.html.php                   214 DIRTY    $step["line"]
+modules/gallery/views/error_admin.html.php                   221 DIRTY    $step["function"]
+modules/gallery/views/error_admin.html.php                   222 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   222 DIRTY_JS $args_id
+modules/gallery/views/error_admin.html.php                   226 DIRTY_ATTR $args_id
+modules/gallery/views/error_admin.html.php                   231 DIRTY    $name
+modules/gallery/views/error_admin.html.php                   234 DIRTY    Kohana_Exception::safe_dump($arg,$name)
+modules/gallery/views/error_admin.html.php                   242 DIRTY_ATTR $source_id
+modules/gallery/views/error_admin.html.php                   242 DIRTY_ATTR ($num==$step["line"])?"highlight":""
+modules/gallery/views/error_admin.html.php                   242 DIRTY    $num
+modules/gallery/views/error_admin.html.php                   242 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
+modules/gallery/views/error_admin.html.php                   252 DIRTY_ATTR $env_id=$error_id."environment"
+modules/gallery/views/error_admin.html.php                   252 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   254 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   256 DIRTY_ATTR $env_id=$error_id."environment_included"
+modules/gallery/views/error_admin.html.php                   256 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   256 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   257 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   262 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   269 DIRTY_ATTR $env_id=$error_id."environment_loaded"
+modules/gallery/views/error_admin.html.php                   269 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   269 DIRTY    count($included)
+modules/gallery/views/error_admin.html.php                   270 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   275 DIRTY    Kohana_Exception::debug_path($file)
+modules/gallery/views/error_admin.html.php                   283 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
+modules/gallery/views/error_admin.html.php                   284 DIRTY_JS $env_id
+modules/gallery/views/error_admin.html.php                   284 DIRTY    $var
+modules/gallery/views/error_admin.html.php                   285 DIRTY_ATTR $env_id
+modules/gallery/views/error_admin.html.php                   291 DIRTY    $key
+modules/gallery/views/error_admin.html.php                   295 DIRTY    Kohana_Exception::safe_dump($value,$key)
 modules/gallery/views/form_uploadify.html.php                9   DIRTY_JS url::file("lib/uploadify/uploadify.swf")
 modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("uploader/add_photo/{$album->id}")
 modules/gallery/views/form_uploadify.html.php                14  DIRTY_JS url::file("lib/uploadify/cancel.png")
@@ -294,6 +296,7 @@ modules/organize/views/organize_dialog.html.php              136 DIRTY_ATTR requ
 modules/recaptcha/views/admin_recaptcha.html.php             11  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY_JS $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY_JS $public_key
+modules/rest/views/reset_api_key_confirm.html.php            6   DIRTY    $form
 modules/rss/views/feed.mrss.php                              10  DIRTY    $feed->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
@@ -367,8 +370,8 @@ themes/admin_wind/views/admin.html.php                       61  DIRTY    $theme
 themes/admin_wind/views/admin.html.php                       68  DIRTY    $content
 themes/admin_wind/views/admin.html.php                       74  DIRTY    $sidebar
 themes/admin_wind/views/admin.html.php                       79  DIRTY    $theme->admin_footer()
-themes/admin_wind/views/admin.html.php                       81  DIRTY    $theme->admin_credits()
-themes/admin_wind/views/admin.html.php                       85  DIRTY    $theme->admin_page_bottom()
+themes/admin_wind/views/admin.html.php                       82  DIRTY    $theme->admin_credits()
+themes/admin_wind/views/admin.html.php                       87  DIRTY    $theme->admin_page_bottom()
 themes/admin_wind/views/block.html.php                       3   DIRTY_ATTR $anchor
 themes/admin_wind/views/block.html.php                       5   DIRTY    $id
 themes/admin_wind/views/block.html.php                       5   DIRTY_ATTR $css_id