Verified.

1 files changed, 61 insertions, 62 deletions

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 02483865..f135c522 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -77,23 +77,23 @@ modules/gallery/views/admin_languages.html.php               62  DIRTY    form::
 modules/gallery/views/admin_languages.html.php               63  DIRTY    $display_name
 modules/gallery/views/admin_languages.html.php               65  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
 modules/gallery/views/admin_languages.html.php               113 DIRTY    $share_translations_form
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
-modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR log::severity_class($task->severity)
-modules/gallery/views/admin_maintenance.html.php             26  DIRTY    $task->name
-modules/gallery/views/admin_maintenance.html.php             29  DIRTY    $task->description
-modules/gallery/views/admin_maintenance.html.php             70  DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/gallery/views/admin_maintenance.html.php             70  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
-modules/gallery/views/admin_maintenance.html.php             71  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
-modules/gallery/views/admin_maintenance.html.php             72  DIRTY    gallery::date_time($task->updated)
-modules/gallery/views/admin_maintenance.html.php             75  DIRTY    $task->name
-modules/gallery/views/admin_maintenance.html.php             90  DIRTY    $task->status
-modules/gallery/views/admin_maintenance.html.php             141 DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/gallery/views/admin_maintenance.html.php             141 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php             142 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
-modules/gallery/views/admin_maintenance.html.php             143 DIRTY    gallery::date_time($task->updated)
-modules/gallery/views/admin_maintenance.html.php             146 DIRTY    $task->name
-modules/gallery/views/admin_maintenance.html.php             158 DIRTY    $task->status
+modules/gallery/views/admin_maintenance.html.php             40  DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php             40  DIRTY_ATTR log::severity_class($task->severity)
+modules/gallery/views/admin_maintenance.html.php             41  DIRTY_ATTR log::severity_class($task->severity)
+modules/gallery/views/admin_maintenance.html.php             42  DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             45  DIRTY    $task->description
+modules/gallery/views/admin_maintenance.html.php             86  DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php             86  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php             87  DIRTY_ATTR $task->state=="stalled"?"g-warning":""
+modules/gallery/views/admin_maintenance.html.php             88  DIRTY    gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php             91  DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             106 DIRTY    $task->status
+modules/gallery/views/admin_maintenance.html.php             157 DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/gallery/views/admin_maintenance.html.php             157 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             158 DIRTY_ATTR $task->state=="success"?"g-success":"g-error"
+modules/gallery/views/admin_maintenance.html.php             159 DIRTY    gallery::date_time($task->updated)
+modules/gallery/views/admin_maintenance.html.php             162 DIRTY    $task->name
+modules/gallery/views/admin_maintenance.html.php             174 DIRTY    $task->status
 modules/gallery/views/admin_maintenance_show_log.html.php    8   DIRTY_JS url::site("admin/maintenance/save_log/$task->id?csrf=$csrf")
 modules/gallery/views/admin_maintenance_show_log.html.php    13  DIRTY    $task->name
 modules/gallery/views/admin_maintenance_task.html.php        55  DIRTY    $task->name
@@ -122,50 +122,50 @@ 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                   150 DIRTY    $type
-modules/gallery/views/error_admin.html.php                   150 DIRTY    $code
-modules/gallery/views/error_admin.html.php                   153 DIRTY    $message
-modules/gallery/views/error_admin.html.php                   156 DIRTY_ATTR $error_id
-modules/gallery/views/error_admin.html.php                   161 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   161 DIRTY    $line
-modules/gallery/views/error_admin.html.php                   166 DIRTY_ATTR ($num==$line)?"highlight":""
-modules/gallery/views/error_admin.html.php                   166 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   166 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   178 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   178 DIRTY_JS $source_id
-modules/gallery/views/error_admin.html.php                   178 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   178 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   180 DIRTY    Kohana_Exception::debug_path($step["file"])
-modules/gallery/views/error_admin.html.php                   180 DIRTY    $step["line"]
-modules/gallery/views/error_admin.html.php                   187 DIRTY    $step["function"]
-modules/gallery/views/error_admin.html.php                   188 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   188 DIRTY_JS $args_id
-modules/gallery/views/error_admin.html.php                   192 DIRTY_ATTR $args_id
-modules/gallery/views/error_admin.html.php                   197 DIRTY    $name
-modules/gallery/views/error_admin.html.php                   200 DIRTY    Kohana_Exception::safe_dump($arg,$name)
-modules/gallery/views/error_admin.html.php                   208 DIRTY_ATTR $source_id
-modules/gallery/views/error_admin.html.php                   208 DIRTY_ATTR ($num==$step["line"])?"highlight":""
-modules/gallery/views/error_admin.html.php                   208 DIRTY    $num
-modules/gallery/views/error_admin.html.php                   208 DIRTY    htmlspecialchars($row,ENT_NOQUOTES,Kohana::CHARSET)
-modules/gallery/views/error_admin.html.php                   218 DIRTY_ATTR $env_id=$error_id."environment"
-modules/gallery/views/error_admin.html.php                   218 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   220 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   222 DIRTY_ATTR $env_id=$error_id."environment_included"
-modules/gallery/views/error_admin.html.php                   222 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   222 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   223 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   228 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   235 DIRTY_ATTR $env_id=$error_id."environment_loaded"
-modules/gallery/views/error_admin.html.php                   235 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   235 DIRTY    count($included)
-modules/gallery/views/error_admin.html.php                   236 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   241 DIRTY    Kohana_Exception::debug_path($file)
-modules/gallery/views/error_admin.html.php                   249 DIRTY_ATTR $env_id="$error_id.environment".strtolower($var)
-modules/gallery/views/error_admin.html.php                   250 DIRTY_JS $env_id
-modules/gallery/views/error_admin.html.php                   250 DIRTY    $var
-modules/gallery/views/error_admin.html.php                   251 DIRTY_ATTR $env_id
-modules/gallery/views/error_admin.html.php                   257 DIRTY    $key
-modules/gallery/views/error_admin.html.php                   261 DIRTY    Kohana_Exception::safe_dump($value,$key)
+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/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")
@@ -191,7 +191,6 @@ modules/gallery/views/l10n_client.html.php                   62  DIRTY    form::
 modules/gallery/views/l10n_client.html.php                   67  DIRTY    form::textarea("l10n-edit-plural-translation-other","",' rows="2"')
 modules/gallery/views/login_ajax.html.php                    6   DIRTY_JS url::site("password/reset")
 modules/gallery/views/login_ajax.html.php                    44  DIRTY    $form
-modules/gallery/views/maintenance.html.php                   46  DIRTY    auth::get_login_form("login/auth_html")
 modules/gallery/views/menu.html.php                          4   DIRTY    $menu->css_id?"id='$menu->css_id'":""
 modules/gallery/views/menu.html.php                          4   DIRTY_ATTR $menu->css_class
 modules/gallery/views/menu.html.php                          6   DIRTY    $element->render()