diff options
| -rw-r--r-- | Bugzilla/Config/General.pm | 6 | ||||
| -rwxr-xr-x | buglist.cgi | 42 | ||||
| -rw-r--r-- | docs/en/rst/administering/parameters.rst | 6 | ||||
| -rw-r--r-- | docs/en/rst/style.rst | 5 | ||||
| -rwxr-xr-x | editparams.cgi | 3 | ||||
| -rw-r--r-- | mod_perl.pl | 197 | ||||
| -rw-r--r-- | template/en/default/admin/params/editparams.html.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/admin/params/general.html.tmpl | 5 | ||||
| -rw-r--r-- | template/en/default/global/field-descs.none.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 62 |
10 files changed, 30 insertions, 307 deletions
diff --git a/Bugzilla/Config/General.pm b/Bugzilla/Config/General.pm index 15688dfd3..c870c7376 100644 --- a/Bugzilla/Config/General.pm +++ b/Bugzilla/Config/General.pm @@ -40,12 +40,6 @@ use constant get_param_list => ( }, { - name => 'shutdownhtml', - type => 'l', - default => '' - }, - - { name => 'announcehtml', type => 'l', default => '' diff --git a/buglist.cgi b/buglist.cgi index fee259a2b..019bf0d4e 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -105,27 +105,6 @@ my $agent = ($cgi->http('X-Moz') && $cgi->http('X-Moz') =~ /\bmicrosummary\b/); my $format = $template->get_format("list/list", scalar $cgi->param('format'), scalar $cgi->param('ctype')); -# Use server push to display a "Please wait..." message for the user while -# executing their query if their browser supports it and they are viewing -# the bug list as HTML and they have not disabled it by adding &serverpush=0 -# to the URL. -# -# Server push is a Netscape 3+ hack incompatible with MSIE, Lynx, and others. -# Even Communicator 4.51 has bugs with it, especially during page reload. -# http://www.browsercaps.org used as source of compatible browsers. -# Safari (WebKit) does not support it, despite a UA that says otherwise (bug 188712) -# MSIE 5+ supports it on Mac (but not on Windows) (bug 190370) -# -my $serverpush = 0; - # $format->{'extension'} eq "html" - # && exists $ENV{'HTTP_USER_AGENT'} - # && $ENV{'HTTP_USER_AGENT'} =~ /Mozilla.[3-9]/ - # && (($ENV{'HTTP_USER_AGENT'} !~ /[Cc]ompatible/) || ($ENV{'HTTP_USER_AGENT'} =~ /MSIE 5.*Mac_PowerPC/)) - # && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident|KHTML)/ - # && !$agent - # && !defined($cgi->param('serverpush')) - # || $cgi->param('serverpush'); - my $order = $cgi->param('order') || ""; # The params object to use for the actual query itself @@ -746,18 +725,6 @@ $params->delete('limit') if $vars->{'default_limited'}; # Time to use server push to display an interim message to the user until # the query completes and we can display the bug list. -if ($serverpush) { - print $cgi->multipart_init(); - print $cgi->multipart_start(-type => 'text/html'); - - # Generate and return the UI (HTML page) from the appropriate template. - $template->process("list/server-push.html.tmpl", $vars) - || ThrowTemplateError($template->error()); - - # Don't do multipart_end() until we're ready to display the replacement - # page, otherwise any errors that happen before then (like SQL errors) - # will result in a blank page being shown to the user instead of the error. -} # Connect to the shadow database if this installation is using one to improve # query performance. @@ -1136,11 +1103,4 @@ $cgi->close_standby_message($contenttype, $disposition, $disp_prefix, $format->{ # Generate and return the UI (HTML page) from the appropriate template. $template->process($format->{'template'}, $vars) - || ThrowTemplateError($template->error()); - - -################################################################################ -# Script Conclusion -################################################################################ - -print $cgi->multipart_final() if $serverpush; + || ThrowTemplateError($template->error());
\ No newline at end of file diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst index 338df3eb3..0492e0070 100644 --- a/docs/en/rst/administering/parameters.rst +++ b/docs/en/rst/administering/parameters.rst @@ -28,12 +28,6 @@ utf8 .. note:: If you turn this parameter from :paramval:`off` to :paramval:`on`, you must re-run :file:`checksetup.pl` immediately afterward. -shutdownhtml - If there is any text in this field, this Bugzilla installation will - be completely disabled and this text will appear instead of all - Bugzilla pages for all users, including Admins. Used in the event - of site maintenance or outage situations. - announcehtml Any text in this field will be displayed at the top of every HTML page in this Bugzilla installation. The text is not wrapped in any diff --git a/docs/en/rst/style.rst b/docs/en/rst/style.rst index aa3957b95..5058a51a3 100644 --- a/docs/en/rst/style.rst +++ b/docs/en/rst/style.rst @@ -65,7 +65,7 @@ Other block types: aware of. .. todo:: This is some documentation-related task that still needs doing. - + Use both of the above block types sparingly. Consider putting the information in the main text, omitting it, or (if long) placing it in a subsidiary file. @@ -103,9 +103,6 @@ Inline Directives * A command to type in the shell: :command:`command --arguments` -* A parameter name: - :param:`shutdownhtml` - * A parameter value: :paramval:`DB` diff --git a/editparams.cgi b/editparams.cgi index ac7976d99..495d53937 100755 --- a/editparams.cgi +++ b/editparams.cgi @@ -137,9 +137,6 @@ if ($action eq 'save' && $current_module) { } push(@changes, $name); SetParam($name, $value); - if (($name eq "shutdownhtml") && ($value ne "")) { - $vars->{'shutdown_is_active'} = 1; - } if ($name eq 'duplicate_or_move_bug_status') { Bugzilla::Status::add_missing_bug_status_transitions($value); } diff --git a/mod_perl.pl b/mod_perl.pl deleted file mode 100644 index aeadd6f35..000000000 --- a/mod_perl.pl +++ /dev/null @@ -1,197 +0,0 @@ -#!/usr/bin/perl -T -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This Source Code Form is "Incompatible With Secondary Licenses", as -# defined by the Mozilla Public License, v. 2.0. - -package Bugzilla::ModPerl; - -use 5.10.1; -use strict; -use warnings; - -# This sets up our libpath without having to specify it in the mod_perl -# configuration. -use File::Basename; -use File::Spec; -BEGIN { - require lib; - my $dir = dirname(__FILE__); - lib->import($dir, File::Spec->catdir($dir, "lib"), File::Spec->catdir($dir, qw(local lib perl5))); -} - -use Bugzilla::ModPerl::StartupFix; -use Taint::Util qw(untaint); - -use constant USE_NYTPROF => !! $ENV{USE_NYTPROF}; -use constant NYTPROF_DIR => do { - my $dir = $ENV{NYTPROF_DIR}; - untaint($dir); - $dir; -}; -BEGIN { - if (USE_NYTPROF) { - $ENV{NYTPROF} = "savesrc=0:start=no:addpid=1"; - } -} -use if USE_NYTPROF, 'Devel::NYTProf::Apache'; - -use Bugzilla::Constants (); - -# If you have an Apache2::Status handler in your Apache configuration, -# you need to load Apache2::Status *here*, so that any later-loaded modules -# can report information to Apache2::Status. -#use Apache2::Status (); - -# We don't want to import anything into the global scope during -# startup, so we always specify () after using any module in this -# file. - -use Apache2::Log (); -use Apache2::ServerUtil; -use Apache2::SizeLimit; -use ModPerl::RegistryLoader (); -use File::Basename (); -use File::Find (); -use English qw(-no_match_vars $OSNAME); - -# This loads most of our modules. -use Bugzilla (); -# Loading Bugzilla.pm doesn't load this, though, and we want it preloaded. -use Bugzilla::BugMail (); -use Bugzilla::CGI (); -use Bugzilla::Extension (); -use Bugzilla::Install::Requirements (); -use Bugzilla::Util (); -use Bugzilla::RNG (); -use Bugzilla::ModPerl (); - -# Make warnings go to the virtual host's log and not the main -# server log. -BEGIN { *CORE::GLOBAL::warn = \&Apache2::ServerRec::warn; } - -# Pre-compile the CGI.pm methods that we're going to use. -Bugzilla::CGI->compile(qw(:cgi :push)); - -# This means that every httpd child will die after processing a request if it -# is taking up more than $apache_size_limit of RAM all by itself, not counting RAM it is -# sharing with the other httpd processes. -my $limit = Bugzilla->localconfig->{apache_size_limit}; -if ($OSNAME eq 'linux' && ! eval { require Linux::Smaps }) { - WARN('SizeLimit requires Linux::Smaps on linux. size limit set to 800MB'); - $limit = 800_000; -} -Apache2::SizeLimit->set_max_unshared_size($limit); - -my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'}; - -# Set up the configuration for the web server -my $server = Apache2::ServerUtil->server; -my $conf = Bugzilla::ModPerl->apache_config($cgi_path); -$server->add_config([ grep { length $_ } split("\n", $conf)]); - -# Pre-load localconfig. It might already be loaded, but we need to make sure. -Bugzilla->localconfig; -if ($ENV{LOCALCONFIG_ENV}) { - delete @ENV{ (Bugzilla::Install::Localconfig::ENV_KEYS) }; -} - -# Pre-load all extensions -Bugzilla::Extension->load_all(); - -Bugzilla->preload_features(); - -# Force instantiation of template so Bugzilla::Template::PreloadProvider can do its magic. -Bugzilla->preload_templates; - -# Have ModPerl::RegistryLoader pre-compile all CGI scripts. -my $rl = new ModPerl::RegistryLoader(); -# If we try to do this in "new" it fails because it looks for a -# Bugzilla/ModPerl/ResponseHandler.pm -$rl->{package} = 'Bugzilla::ModPerl::ResponseHandler'; -my $feature_files = Bugzilla::Install::Requirements::map_files_to_features(); - -# Prevent "use lib" from doing anything when the .cgi files are compiled. -# This is important to prevent the current directory from getting into -# @INC and messing things up. (See bug 630750.) -no warnings 'redefine'; -local *lib::import = sub {}; -use warnings; - -foreach my $file (glob "$cgi_path/*.cgi") { - my $base_filename = File::Basename::basename($file); - if (my $feature = $feature_files->{$base_filename}) { - next if !Bugzilla->feature($feature); - } - Bugzilla::Util::trick_taint($file); - $rl->handler($file, $file); -} - -# Some items might already be loaded into the request cache -# best to make sure it starts out empty. -# Because of bug 1347335 we also do this in init_page(). -Bugzilla::clear_request_cache(); - -package Bugzilla::ModPerl::ResponseHandler; -use strict; -use base qw(ModPerl::Registry); -use Bugzilla; -use Bugzilla::Constants qw(USAGE_MODE_REST bz_locations); -use Time::HiRes; -use Sys::Hostname; - -sub handler : method { - my $class = shift; - - # $0 is broken under mod_perl before 2.0.2, so we have to set it - # here explicitly or init_page's shutdownhtml code won't work right. - $0 = $ENV{'SCRIPT_FILENAME'}; - - # Prevent "use lib" from modifying @INC in the case where a .cgi file - # is being automatically recompiled by mod_perl when Apache is - # running. (This happens if a file changes while Apache is already - # running.) - no warnings 'redefine'; - local *lib::import = sub {}; - use warnings; - - if (Bugzilla::ModPerl::USE_NYTPROF) { - state $count = {}; - state $dir = Bugzilla::ModPerl::NYTPROF_DIR // bz_locations()->{datadir}; - state $host = (split(/\./, hostname()))[0]; - my $script = File::Basename::basename($ENV{SCRIPT_FILENAME}); - $script =~ s/\.cgi$//; - my $file = $dir . "/nytprof.$host.$script." . ++$count->{$$}; - DB::enable_profile($file); - } - Bugzilla::init_page(); - my $result = $class->SUPER::handler(@_); - if (Bugzilla::ModPerl::USE_NYTPROF) { - DB::disable_profile(); - DB::finish_profile(); - } - - # When returning data from the REST api we must only return 200 or 304, - # which tells Apache not to append its error html documents to the - # response. - return Bugzilla->usage_mode == USAGE_MODE_REST && $result != 304 - ? Apache2::Const::OK - : $result; -} - - -package Bugzilla::ModPerl::CleanupHandler; -use strict; -use Apache2::Const -compile => qw(OK); - -sub handler { - my $r = shift; - - Bugzilla::_cleanup(); - - return Apache2::Const::OK; -} - -1; diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index 838bff7ef..6e8bc2257 100644 --- a/template/en/default/admin/params/editparams.html.tmpl +++ b/template/en/default/admin/params/editparams.html.tmpl @@ -21,7 +21,6 @@ [%# INTERFACE: # panels: array of hashes representing the panels available. # param_changed: array of parameters which have been changed. - # shutdown_is_active: boolean; is true when 'shutdownhtml' has been turned on. #%] [% PROCESS global/variables.none.tmpl %] diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl index f1b86e19f..05e8f09a2 100644 --- a/template/en/default/admin/params/general.html.tmpl +++ b/template/en/default/admin/params/general.html.tmpl @@ -48,11 +48,6 @@ _ " "on", you must re-run <kbd>checksetup.pl</kbd> immediately" _ " afterward.</p>", - shutdownhtml => - "If this field is non-empty, then $terms.Bugzilla will be completely" - _ " disabled and this text will be displayed instead of all the" - _ " $terms.Bugzilla pages.", - announcehtml => "If this field is non-empty, then $terms.Bugzilla will" _ " display whatever is in this field at the top of every" diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 3e0a528dc..cb6240c29 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -162,13 +162,11 @@ if ( $stash->get("in_template_var") ) { # database. If you want to override this for your language # or your installation, just use a hook. %] my $bug_fields = $stash->get("bug_fields"); - unless ( Bugzilla->params->{shutdownhtml} ) { - foreach my $bz_field ( values %$bug_fields ) { - $vars->{field_descs}{$bz_field->name} //= $bz_field->description; - } - - $context->process("bug/field-help.none.tmpl"); + foreach my $bz_field ( values %$bug_fields ) { + $vars->{field_descs}{$bz_field->name} //= $bz_field->description; } + + $context->process("bug/field-help.none.tmpl"); } [% END %] diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 591617f3e..278b0f161 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -140,7 +140,7 @@ [% ELSIF message_tag == "buglist_updated_named_query" %] [% title = "Search updated" %] - Your search named <code><a + Your search named <code><a href="buglist.cgi?cmdtype=runnamed&namedcmd=[% queryname FILTER uri %]" >[% queryname FILTER html %]</a></code> has been updated. @@ -298,22 +298,22 @@ [% ELSIF message_tag == "email_change_canceled_reinstated" %] [% title = "Cancel Request to Change Email Address" %] The request to change the email address for the - account [%+ old_email FILTER html %] to + account [%+ old_email FILTER html %] to [%+ new_email FILTER html %] has been canceled. Your old account settings have been reinstated. [% ELSIF message_tag == "extension_created" %] An extension named [% name FILTER html %] has been created - in [% path FILTER html %]. Make sure you change "YOUR NAME" and + in [% path FILTER html %]. Make sure you change "YOUR NAME" and "YOUR EMAIL ADDRESS" in the code to your name and your email address. [% ELSIF message_tag == "field_value_created" %] [% title = "New Field Value Created" %] - The value <em>[% value.name FILTER html %]</em> has been added as a + The value <em>[% value.name FILTER html %]</em> has been added as a valid choice for the <em>[% field.description FILTER html %]</em> (<em>[% field.name FILTER html %]</em>) field. [% IF field.name == "bug_status" %] - You should now visit the <a href="editworkflow.cgi">status workflow + You should now visit the <a href="editworkflow.cgi">status workflow page</a> to include your new [% terms.bug %] status. [% END %] @@ -331,7 +331,7 @@ (<em>[% field.name FILTER html %]</em>) field has been changed: <ul> [% IF changes.value %] - <li>Field value updated to + <li>Field value updated to <em>[% changes.value.1 FILTER html %]</em>. [% IF value.is_default %] (Note that this value is the default for this field. All @@ -340,16 +340,16 @@ </li> [% END %] [% IF changes.sortkey %] - <li>Sortkey updated to + <li>Sortkey updated to <em>[% changes.sortkey.1 FILTER html %]</em>.</li> [% END %] [% IF changes.visibility_value_id %] [% IF value.visibility_value.defined %] - <li>It only appears when + <li>It only appears when [%+ value.field.value_field.description FILTER html %] is set to '[%+ value.visibility_value.name FILTER html %]'.</li> [% ELSE %] - <li>It now always appears, no matter what + <li>It now always appears, no matter what [%+ value.field.value_field.description FILTER html %] is set to. </li> [% END %] @@ -535,7 +535,7 @@ Reading users... [% ELSIF message_tag == "migrate_translating_bugs" %] - Converting [% terms.bug %] values to be appropriate for + Converting [% terms.bug %] values to be appropriate for [%+ terms.Bugzilla %]... [% ELSIF message_tag == "migrate_user_created" %] @@ -594,12 +594,6 @@ No changes made. [% END %] - [% IF shutdown_is_active == 1 %] - <hr> - [% terms.Bugzilla %] has now been shut down. To re-enable the system, - clear the <em>shutdownhtml</em> field. - [% END%] - [% ELSIF message_tag == "password_change_canceled" %] [% title = "Cancel Request to Change Password" %] Your request has been canceled. @@ -731,7 +725,7 @@ [% ELSIF message_tag == "install_fk_invalid" %] ERROR: There are invalid values for the [% column FILTER html %] column in the [% table FILTER html %] - table. (These values do not exist in the [% foreign_table FILTER html %] table, in the + table. (These values do not exist in the [% foreign_table FILTER html %] table, in the [%+ foreign_column FILTER html %] column.) Before continuing with checksetup, you will need to fix these values, @@ -789,8 +783,8 @@ to be editable by both you and the web server must be world writable, and other files (including the localconfig file which stores your database password) must be world readable. This means that _anyone_ who can obtain - local access to this machine can do whatever they want to your - [%+ terms.Bugzilla %] installation, and is probably also able to run + local access to this machine can do whatever they want to your + [%+ terms.Bugzilla %] installation, and is probably also able to run arbitrary Perl code as the user that the web server runs as. You really, really, really need to change this setting. @@ -798,10 +792,10 @@ [% ELSIF message_tag == "install_webservergroup_not_in" %] Warning: you have entered a value for the "webservergroup" parameter in - localconfig, but you are not either a) running this script as [% constants.ROOT_USER FILTER html %]; - or b) a member of this group. This can cause permissions problems and + localconfig, but you are not either a) running this script as [% constants.ROOT_USER FILTER html %]; + or b) a member of this group. This can cause permissions problems and decreased security. If you experience problems running [% terms.Bugzilla %] - scripts, log in as [% constants.ROOT_USER FILTER html %] and re-run this script, become a + scripts, log in as [% constants.ROOT_USER FILTER html %] and re-run this script, become a member of the group, or remove the value of the "webservergroup" parameter. [% ELSIF message_tag == "install_webservergroup_windows" %] @@ -836,7 +830,7 @@ products you can choose from. [% ELSIF message_tag == "remaining_time_zeroed" %] - The [% field_descs.remaining_time FILTER html %] field has been + The [% field_descs.remaining_time FILTER html %] field has been set to zero automatically as part of closing this [% terms.bug %] or moving it from one closed state to another. @@ -856,21 +850,21 @@ [% ELSIF message_tag == "sudo_started" %] [% title = "Sudo session started" %] - The sudo session has been started. For the next 6 hours, or until you - end the session, everything you do you do as the user you are + The sudo session has been started. For the next 6 hours, or until you + end the session, everything you do you do as the user you are impersonating ([% target FILTER html %]). - + [% ELSIF message_tag == "sudo_ended" %] [% title = "Sudo session complete" %] - The sudo session has been ended. From this point forward, everything you + The sudo session has been ended. From this point forward, everything you do you do as yourself. [% ELSIF message_tag == "series_created" %] [% title = "Series Created" %] The series <em>[% series.category FILTER html %] / - [%+ series.subcategory FILTER html %] / + [%+ series.subcategory FILTER html %] / [%+ series.name FILTER html %]</em> - has been created. Note that you may need to wait up to + has been created. Note that you may need to wait up to [%+ series.frequency * 2 %] days before there will be enough data for a chart of this series to be produced. @@ -881,14 +875,6 @@ [%+ series.name FILTER html %]</em> has been deleted. - [% ELSIF message_tag == "shutdown" %] - [% title = "$terms.Bugzilla is Down" %] - [% Param("shutdownhtml") %] - [% IF userid %] - <p>For security reasons, you have been logged out automatically. - The cookie that was remembering your login is now gone. - [% END %] - [% ELSIF message_tag == "tag_updated" %] [% title = "Tag Updated" %] The '<a href="buglist.cgi?tag=[% tag FILTER uri %]">[% tag FILTER html %]</a>' @@ -908,7 +894,7 @@ Some flags could not be set. Please check your changes. [% ELSIF message_tag == "user_match_failed" %] - You entered a username that did not match any known + You entered a username that did not match any known [% terms.Bugzilla %] users, so we have instead left the [% match_field FILTER html %] field blank. |