diff options
| -rw-r--r-- | extensions/Mageia/Extension.pm | 15 | ||||
| -rw-r--r-- | extensions/Mageia/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl | 6 |
2 files changed, 19 insertions, 2 deletions
diff --git a/extensions/Mageia/Extension.pm b/extensions/Mageia/Extension.pm index 9943b9c13..e8addda10 100644 --- a/extensions/Mageia/Extension.pm +++ b/extensions/Mageia/Extension.pm @@ -18,7 +18,7 @@ use Bugzilla::Bug qw(LogActivityEntry); use Bugzilla::Field qw(get_field_id); use Bugzilla::User qw(); use Bugzilla::User::Setting qw(add_setting); -use Bugzilla::Util qw(datetime_from); +use Bugzilla::Util qw(trick_taint datetime_from); use Bugzilla::Extension::Mageia::Util qw(compare_datetimes sync_ldap_groups_check); use Email::Address; @@ -170,6 +170,19 @@ sub sanitycheck_repair { sync_ldap_groups_check($args->{status}, 1); &{$args->{status}}('ldap_repair_end'); } + if (Bugzilla->cgi->param('clear_assets')) { + &{$args->{status}}('assets_clear_start'); + # Remove assets. Usually done by checksetup.pl. + my @files = ( + glob(bz_locations()->{assetsdir} . '/*.css'), + glob(bz_locations()->{assetsdir} . '/*.js'), + ); + foreach my $file (@files) { + trick_taint($file); + unlink($file); + } + &{$args->{status}}('assets_clear_end'); + } } sub template_before_process { diff --git a/extensions/Mageia/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl b/extensions/Mageia/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl index 19155048b..3501c2a05 100644 --- a/extensions/Mageia/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl +++ b/extensions/Mageia/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl @@ -6,7 +6,11 @@ # defined by the Mozilla Public License, v. 2.0. #%] -[% IF san_tag == "ldap_check_group_membership" %] +[% IF san_tag == "assets_clear_start" %] + Removing existing assets. +[% ELSIF san_tag == "assets_clear_end" %] + Assets removed. +[% ELSIF san_tag == "ldap_check_group_membership" %] Checking group membership for LDAP groups. [% ELSIF san_tag == "ldap_repair_start" %] OK, now fixing Bugzilla group memberships based on LDAP groups. |