Verified.

1 files changed, 20 insertions, 17 deletions

diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 8d26092b..6821c963 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -42,7 +42,7 @@ modules/digibug/views/digibug_form.html.php                  4   DIRTY    form::
 modules/digibug/views/digibug_form.html.php                  6   DIRTY    form::hidden($key,$value)
 modules/exif/views/exif_dialog.html.php                      14  DIRTY    $details[$i]["caption"]
 modules/exif/views/exif_dialog.html.php                      21  DIRTY    $details[$i]["caption"]
-modules/g2_import/views/admin_g2_import.html.php             30  DIRTY    $form
+modules/g2_import/views/admin_g2_import.html.php             9   DIRTY    $form
 modules/gallery/views/admin_advanced_settings.html.php       21  DIRTY_ATTR text::alternate("g-odd","g-even")
 modules/gallery/views/admin_advanced_settings.html.php       22  DIRTY    $var->module_name
 modules/gallery/views/admin_block_log_entries.html.php       4   DIRTY_ATTR log::severity_class($entry->severity)
@@ -248,14 +248,15 @@ modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $permi
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $item->id
 modules/gallery/views/quick_delete_confirm.html.php          11  DIRTY    $form
 modules/gallery/views/reauthenticate.html.php                9   DIRTY    $form
-modules/gallery/views/upgrader.html.php                      59  DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      63  DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      71  DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
-modules/gallery/views/upgrader.html.php                      72  DIRTY_ATTR $id
-modules/gallery/views/upgrader.html.php                      76  DIRTY    $module->version
-modules/gallery/views/upgrader.html.php                      79  DIRTY    $module->code_version
-modules/gallery/views/upgrader.html.php                      101 DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      104 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      76  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      94  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      102 DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
+modules/gallery/views/upgrader.html.php                      102 DIRTY_ATTR in_array($id,$failed)?"failed":""
+modules/gallery/views/upgrader.html.php                      103 DIRTY_ATTR $id
+modules/gallery/views/upgrader.html.php                      107 DIRTY    $module->version
+modules/gallery/views/upgrader.html.php                      110 DIRTY    $module->code_version
+modules/gallery/views/upgrader.html.php                      120 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      123 DIRTY_ATTR $done?"muted":""
 modules/gallery/views/user_languages_block.html.php          2   DIRTY    form::dropdown("g-select-session-locale",$installed_locales,$selected)
 modules/gallery/views/user_profile.html.php                  34  DIRTY_ATTR $user->avatar_url(40,$theme->url(,true))
 modules/gallery/views/user_profile.html.php                  43  DIRTY    $info->view
@@ -338,15 +339,17 @@ modules/tag/views/tag_cloud.html.php                         6   DIRTY_JS $tag->
 modules/user/views/admin_users.html.php                      3   DIRTY_JS url::site("admin/users/add_user_to_group/__USERID__/__GROUPID__?csrf=$csrf")
 modules/user/views/admin_users.html.php                      26  DIRTY_JS url::site("admin/users/group/__GROUPID__")
 modules/user/views/admin_users.html.php                      36  DIRTY_JS url::site("admin/users/remove_user_from_group/__USERID__/__GROUPID__?csrf=$csrf")
-modules/user/views/admin_users.html.php                      71  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      71  DIRTY_ATTR text::alternate("g-odd","g-even")
-modules/user/views/admin_users.html.php                      71  DIRTY_ATTR $user->admin?"g-admin":""
 modules/user/views/admin_users.html.php                      72  DIRTY_ATTR $user->id
-modules/user/views/admin_users.html.php                      73  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
-modules/user/views/admin_users.html.php                      87  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
-modules/user/views/admin_users.html.php                      123 DIRTY_ATTR $group->id
-modules/user/views/admin_users.html.php                      123 DIRTY_ATTR ($group->special?"g-default-group":"")
-modules/user/views/admin_users.html.php                      125 DIRTY    $v
+modules/user/views/admin_users.html.php                      72  DIRTY_ATTR text::alternate("g-odd","g-even")
+modules/user/views/admin_users.html.php                      72  DIRTY_ATTR $user->admin?"g-admin":""
+modules/user/views/admin_users.html.php                      73  DIRTY_ATTR $user->id
+modules/user/views/admin_users.html.php                      74  DIRTY_ATTR $user->avatar_url(20,$theme->url(,true))
+modules/user/views/admin_users.html.php                      88  DIRTY    ($user->last_login==0)?"":gallery::date($user->last_login)
+modules/user/views/admin_users.html.php                      91  DIRTY    db::build()->from("items")->where("owner_id","=",$user->id)->count_records()
+modules/user/views/admin_users.html.php                      127 DIRTY_ATTR $group->id
+modules/user/views/admin_users.html.php                      127 DIRTY_ATTR ($group->special?"g-default-group":"")
+modules/user/views/admin_users.html.php                      129 DIRTY    $v
+modules/user/views/admin_users_delete_user.html.php          6   DIRTY    $form
 modules/user/views/admin_users_group.html.php                24  DIRTY_JS $user->id
 modules/user/views/admin_users_group.html.php                24  DIRTY_JS $group->id
 modules/watermark/views/admin_watermarks.html.php            20  DIRTY_ATTR $width