Gentoo-local version of 7f3a749d7bd78a3e4aee163f562d7e95b0954b44 w/ Perl-Tidy-20180220

Reformat all code using Perl-Tidy v20180220 and .perltidyrc from
matching upstream 7f3a749d7bd78a3e4aee163f562d7e95b0954b44 commit.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

2 files changed, 332 insertions, 530 deletions

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 6adbbcb95..b9ede2001 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -24,431 +24,234 @@
 
 %::safe = (
 
-'whine/schedule.html.tmpl' => [
-  'event.key',
-  'query.id',
-  'query.sort',
-  'schedule.id',
-  'option.0',
-  'option.1',
-],
-
-'whine/mail.html.tmpl' => [
-  'bug.bug_id',
-],
-
-'flag/list.html.tmpl' => [
-  'flag.status', 
-  'type.id', 
-],
-
-'search/form.html.tmpl' => [
-  'qv.name',
-  'qv.description',
-],
-
-'search/search-specific.html.tmpl' => [
-  'status.name',
-],
-
-'search/tabs.html.tmpl' => [
-  'content',
-],
-
-'request/queue.html.tmpl' => [
-  'column_headers.$group_field', 
-  'column_headers.$column', 
-  'request.status', 
-  'request.bug_id', 
-  'request.attach_id', 
-],
-
-'reports/keywords.html.tmpl' => [
-  'keyword.bug_count', 
-],
-
-'reports/report-table.csv.tmpl' => [
-  'data.$tbl.$col.$row',
-  'colsepchar',
-],
-
-'reports/report-table.html.tmpl' => [
-  '"&$col_vals" IF col_vals', 
-  '"&$row_vals" IF row_vals', 
-  'classes.$row_idx.$col_idx', 
-  'urlbase', 
-  'data.$tbl.$col.$row', 
-],
-
-'reports/report.html.tmpl' => [
-  'width', 
-  'height', 
-  'imageurl', 
-  'formaturl', 
-  'other_format.name', 
-  'switchbase',
-  'cumulate',
-],
-
-'reports/chart.html.tmpl' => [
-  'width', 
-  'height', 
-  'imageurl', 
-  'sizeurl', 
-  'height + 100', 
-  'height - 100', 
-  'width + 100', 
-  'width - 100', 
-],
-
-'reports/series-common.html.tmpl' => [
-  'sel.name', 
-  '"onchange=\"$sel.onchange\"" IF sel.onchange', 
-],
-
-'reports/chart.csv.tmpl' => [
-  'data.$j.$i', 
-  'colsepchar',
-],
-
-'reports/create-chart.html.tmpl' => [
-  'series.series_id', 
-  'newidx',
-],
-
-'reports/edit-series.html.tmpl' => [
-  'default.series_id', 
-],
-
-'list/edit-multiple.html.tmpl' => [
-  'group.id', 
-  'menuname',
-],
-
-'list/list.rdf.tmpl' => [
-  'template_version', 
-  'bug.bug_id', 
-  'column', 
-],
-
-'list/table.html.tmpl' => [
-  'tableheader',
-  'bug.bug_id', 
-],
-
-'list/list.csv.tmpl' => [
-  'bug.bug_id', 
-  'colsepchar',
-],
-
-'list/list.js.tmpl' => [
-  'bug.bug_id', 
-],
-
-'global/choose-product.html.tmpl' => [
-  'target',
-],
-
-# You are not permitted to add any values here. Everything in this file should 
+  'whine/schedule.html.tmpl' => [
+    'event.key', 'query.id', 'query.sort', 'schedule.id', 'option.0', 'option.1',
+  ],
+
+  'whine/mail.html.tmpl' => ['bug.bug_id',],
+
+  'flag/list.html.tmpl' => ['flag.status', 'type.id',],
+
+  'search/form.html.tmpl' => ['qv.name', 'qv.description',],
+
+  'search/search-specific.html.tmpl' => ['status.name',],
+
+  'search/tabs.html.tmpl' => ['content',],
+
+  'request/queue.html.tmpl' => [
+    'column_headers.$group_field', 'column_headers.$column',
+    'request.status',              'request.bug_id',
+    'request.attach_id',
+  ],
+
+  'reports/keywords.html.tmpl' => ['keyword.bug_count',],
+
+  'reports/report-table.csv.tmpl' => ['data.$tbl.$col.$row', 'colsepchar',],
+
+  'reports/report-table.html.tmpl' => [
+    '"&$col_vals" IF col_vals', '"&$row_vals" IF row_vals',
+    'classes.$row_idx.$col_idx',    'urlbase',
+    'data.$tbl.$col.$row',
+  ],
+
+  'reports/report.html.tmpl' => [
+    'width',             'height',     'imageurl', 'formaturl',
+    'other_format.name', 'switchbase', 'cumulate',
+  ],
+
+  'reports/chart.html.tmpl' => [
+    'width',        'height',       'imageurl',    'sizeurl',
+    'height + 100', 'height - 100', 'width + 100', 'width - 100',
+  ],
+
+  'reports/series-common.html.tmpl' =>
+    ['sel.name', '"onchange=\"$sel.onchange\"" IF sel.onchange',],
+
+  'reports/chart.csv.tmpl' => ['data.$j.$i', 'colsepchar',],
+
+  'reports/create-chart.html.tmpl' => ['series.series_id', 'newidx',],
+
+  'reports/edit-series.html.tmpl' => ['default.series_id',],
+
+  'list/edit-multiple.html.tmpl' => ['group.id', 'menuname',],
+
+  'list/list.rdf.tmpl' => ['template_version', 'bug.bug_id', 'column',],
+
+  'list/table.html.tmpl' => ['tableheader', 'bug.bug_id',],
+
+  'list/list.csv.tmpl' => ['bug.bug_id', 'colsepchar',],
+
+  'list/list.js.tmpl' => ['bug.bug_id',],
+
+  'global/choose-product.html.tmpl' => ['target',],
+
+# You are not permitted to add any values here. Everything in this file should
 # be filtered unless there's an extremely good reason why not, in which case,
 # use the "none" dummy filter.
-'global/code-error.html.tmpl' => [
-],
- 
-'global/header.html.tmpl' => [
-  'javascript', 
-  'style', 
-  'onload',
-  'title',
-  '" – $header" IF header',
-  'subheader',
-  'header_addl_info', 
-  'message', 
-],
-
-'global/messages.html.tmpl' => [
-  'series.frequency * 2',
-],
-
-'global/select-menu.html.tmpl' => [
-  'options', 
-  'size', 
-],
-
-'global/tabs.html.tmpl' => [
-  'content', 
-],
-
-# You are not permitted to add any values here. Everything in this file should 
+  'global/code-error.html.tmpl' => [],
+
+  'global/header.html.tmpl' => [
+    'javascript',                   'style',
+    'onload',                       'title',
+    '" – $header" IF header', 'subheader',
+    'header_addl_info',             'message',
+  ],
+
+  'global/messages.html.tmpl' => ['series.frequency * 2',],
+
+  'global/select-menu.html.tmpl' => ['options', 'size',],
+
+  'global/tabs.html.tmpl' => ['content',],
+
+# You are not permitted to add any values here. Everything in this file should
 # be filtered unless there's an extremely good reason why not, in which case,
 # use the "none" dummy filter.
-'global/user-error.html.tmpl' => [
-],
-
-'global/confirm-user-match.html.tmpl' => [
-  'script',
-],
-
-'bug/comments.html.tmpl' => [
-  'comment.id',
-  'comment.count',
-  'bug.bug_id',
-],
-
-'bug/dependency-graph.html.tmpl' => [
-  'image_map', # We need to continue to make sure this is safe in the CGI
-  'image_url', 
-  'map_url', 
-  'bug_id', 
-],
-
-'bug/dependency-tree.html.tmpl' => [
-  'bugid', 
-  'maxdepth', 
-  'hide_resolved', 
-  'ids.join(",")',
-  'maxdepth + 1', 
-  'maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""',
-  'maxdepth == 1 ? 1
+  'global/user-error.html.tmpl' => [],
+
+  'global/confirm-user-match.html.tmpl' => ['script',],
+
+  'bug/comments.html.tmpl' => ['comment.id', 'comment.count', 'bug.bug_id',],
+
+  'bug/dependency-graph.html.tmpl' => [
+    'image_map',    # We need to continue to make sure this is safe in the CGI
+    'image_url', 'map_url', 'bug_id',
+  ],
+
+  'bug/dependency-tree.html.tmpl' => [
+    'bugid', 'maxdepth', 'hide_resolved', 'ids.join(",")', 'maxdepth + 1',
+    'maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""', 'maxdepth == 1 ? 1
                        : ( maxdepth ? maxdepth - 1 : realdepth - 1 )',
-],
-
-'bug/edit.html.tmpl' => [
-  'bug.remaining_time', 
-  'bug.delta_ts', 
-  'bug.bug_id', 
-  'group.bit', 
-  'selname',
-  'inputname',
-  '" colspan=\"$colspan\"" IF colspan',
-  '" size=\"$size\"" IF size',
-  '" maxlength=\"$maxlength\"" IF maxlength',
-  '" spellcheck=\"$spellcheck\"" IF spellcheck',
-],
-
-'bug/show-multiple.html.tmpl' => [
-  'attachment.id', 
-  'flag.status',
-],
-
-'bug/show.html.tmpl' => [
-  'bug.bug_id',
-],
-
-'bug/show.xml.tmpl' => [
-  'constants.BUGZILLA_VERSION', 
-  'a.id', 
-  'field', 
-],
-
-'bug/summarize-time.html.tmpl' => [
-  'global.grand_total FILTER format("%.2f")',
-  'subtotal FILTER format("%.2f")',
-  'work_time FILTER format("%.2f")',
-  'global.total FILTER format("%.2f")',
-  'global.remaining FILTER format("%.2f")',
-  'global.estimated FILTER format("%.2f")',
-  'bugs.$id.remaining_time FILTER format("%.2f")',
-  'bugs.$id.estimated_time FILTER format("%.2f")',
-],
-
-
-'bug/time.html.tmpl' => [
-  "time_unit.replace('0\\Z', '')",
-  '(act / (act + rem)) * 100 
-       FILTER format("%d")', 
-],
-
-'bug/process/results.html.tmpl' => [
-  'title.$type.ucfirst',
-],
-
-'bug/create/create.html.tmpl' => [
-  'cloned_bug_id',
-],
-
-'bug/create/create-guided.html.tmpl' => [
-  'sel',
-],
-
-'bug/activity/table.html.tmpl' => [
-  'change.attachid', 
-],
-
-'attachment/create.html.tmpl' => [
-  'bug.bug_id',
-  'attachment.id', 
-],
-
-'attachment/created.html.tmpl' => [
-  'attachment.id',
-  'attachment.bug_id',
-],
-
-'attachment/edit.html.tmpl' => [
-  'attachment.id', 
-  'attachment.bug_id', 
-  'editable_or_hide',
-  'use_patchviewer',
-],
-
-'attachment/list.html.tmpl' => [
-  'attachment.id', 
-  'flag.status',
-  'bugid',
-  'obsolete_attachments',
-],
-
-'attachment/midair.html.tmpl' => [
-  'attachment.id',
-],
-
-'attachment/show-multiple.html.tmpl' => [
-  'a.id',
-  'flag.status'
-],
-
-'attachment/updated.html.tmpl' => [
-  'attachment.id',
-],
-
-'attachment/diff-header.html.tmpl' => [
-  'attachid',
-  'id',
-  'bugid',
-  'oldid',
-  'newid',
-  'patch.id',
-],
-
-'attachment/diff-file.html.tmpl' => [
-  'file.minus_lines',
-  'file.plus_lines',
-  'section.old_start',
-  'section_num',
-  'current_line_old',
-  'current_line_new',
-],
-
-'admin/admin.html.tmpl' => [
-  'class'
-],
-
-'admin/table.html.tmpl' => [
-  'contentlink'
-],
-
-'admin/custom_fields/cf-js.js.tmpl' => [
-  'constants.FIELD_TYPE_SINGLE_SELECT',
-  'constants.FIELD_TYPE_MULTI_SELECT',
-  'constants.FIELD_TYPE_BUG_ID',
-],
-
-'admin/params/common.html.tmpl' => [
-  'sortlist_separator', 
-],
-
-'admin/products/groupcontrol/confirm-edit.html.tmpl' => [
-  'group.count', 
-],
-
-'admin/products/groupcontrol/edit.html.tmpl' => [
-  'group.id',
-  'constants.CONTROLMAPNA', 
-  'constants.CONTROLMAPSHOWN',
-  'constants.CONTROLMAPDEFAULT',
-  'constants.CONTROLMAPMANDATORY',
-],
-
-'admin/products/list.html.tmpl' => [
-  'classification_url_part', 
-],
-
-'admin/products/footer.html.tmpl' => [
-  'classification_url_part', 
-  'classification_text', 
-],
-
-'admin/flag-type/confirm-delete.html.tmpl' => [
-  'flag_type.flag_count',
-  'flag_type.id', 
-],
-
-'admin/flag-type/edit.html.tmpl' => [
-  'selname',
-],
-
-'admin/flag-type/list.html.tmpl' => [
-  'type.id', 
-],
-
-
-'admin/components/confirm-delete.html.tmpl' => [
-  'comp.bug_count'
-],
-
-'admin/groups/delete.html.tmpl' => [
-  'shared_queries'
-],
-
-'admin/users/confirm-delete.html.tmpl' => [
-  'attachments',
-  'reporter',
-  'assignee_or_qa',
-  'cc',
-  'component_cc',
-  'flags.requestee',
-  'flags.setter',
-  'longdescs',
-  'quips',
-  'series',
-  'watch.watched',
-  'watch.watcher',
-  'whine_events',
-  'whine_schedules',
-  'otheruser.id'
-],
-
-'admin/users/edit.html.tmpl' => [
-  'otheruser.id',
-  'group.id',
-],
-
-'admin/components/edit.html.tmpl' => [
-  'comp.bug_count'
-],
-
-'admin/workflow/edit.html.tmpl' => [
-  'status.id',
-  'new_status.id',
-],
-
-'admin/workflow/comment.html.tmpl' => [
-  'status.id',
-  'new_status.id',
-],
-
-'account/auth/login-small.html.tmpl' => [
-  'qs_suffix',
-],
-
-'account/prefs/email.html.tmpl' => [
-  'relationship.id',
-  'event.id',
-  'prefname',
-],
-
-'account/prefs/prefs.html.tmpl' => [
-  'current_tab.label',
-  'current_tab.name',
-],
-
-'account/prefs/saved-searches.html.tmpl' => [
-  'group.id',
-],
-
-'config.rdf.tmpl' => [
-  'escaped_urlbase',
-],
+  ],
+
+  'bug/edit.html.tmpl' => [
+    'bug.remaining_time',
+    'bug.delta_ts',
+    'bug.bug_id',
+    'group.bit',
+    'selname',
+    'inputname',
+    '" colspan=\"$colspan\"" IF colspan',
+    '" size=\"$size\"" IF size',
+    '" maxlength=\"$maxlength\"" IF maxlength',
+    '" spellcheck=\"$spellcheck\"" IF spellcheck',
+  ],
+
+  'bug/show-multiple.html.tmpl' => ['attachment.id', 'flag.status',],
+
+  'bug/show.html.tmpl' => ['bug.bug_id',],
+
+  'bug/show.xml.tmpl' => ['constants.BUGZILLA_VERSION', 'a.id', 'field',],
+
+  'bug/summarize-time.html.tmpl' => [
+    'global.grand_total FILTER format("%.2f")',
+    'subtotal FILTER format("%.2f")',
+    'work_time FILTER format("%.2f")',
+    'global.total FILTER format("%.2f")',
+    'global.remaining FILTER format("%.2f")',
+    'global.estimated FILTER format("%.2f")',
+    'bugs.$id.remaining_time FILTER format("%.2f")',
+    'bugs.$id.estimated_time FILTER format("%.2f")',
+  ],
+
+
+  'bug/time.html.tmpl' => [
+    "time_unit.replace('0\\Z', '')", '(act / (act + rem)) * 100 
+       FILTER format("%d")',
+  ],
+
+  'bug/process/results.html.tmpl' => ['title.$type.ucfirst',],
+
+  'bug/create/create.html.tmpl' => ['cloned_bug_id',],
+
+  'bug/create/create-guided.html.tmpl' => ['sel',],
+
+  'bug/activity/table.html.tmpl' => ['change.attachid',],
+
+  'attachment/create.html.tmpl' => ['bug.bug_id', 'attachment.id',],
+
+  'attachment/created.html.tmpl' => ['attachment.id', 'attachment.bug_id',],
+
+  'attachment/edit.html.tmpl' => [
+    'attachment.id', 'attachment.bug_id', 'editable_or_hide', 'use_patchviewer',
+  ],
+
+  'attachment/list.html.tmpl' =>
+    ['attachment.id', 'flag.status', 'bugid', 'obsolete_attachments',],
+
+  'attachment/midair.html.tmpl' => ['attachment.id',],
+
+  'attachment/show-multiple.html.tmpl' => ['a.id', 'flag.status'],
+
+  'attachment/updated.html.tmpl' => ['attachment.id',],
+
+  'attachment/diff-header.html.tmpl' =>
+    ['attachid', 'id', 'bugid', 'oldid', 'newid', 'patch.id',],
+
+  'attachment/diff-file.html.tmpl' => [
+    'file.minus_lines',  'file.plus_lines',
+    'section.old_start', 'section_num',
+    'current_line_old',  'current_line_new',
+  ],
+
+  'admin/admin.html.tmpl' => ['class'],
+
+  'admin/table.html.tmpl' => ['contentlink'],
+
+  'admin/custom_fields/cf-js.js.tmpl' => [
+    'constants.FIELD_TYPE_SINGLE_SELECT', 'constants.FIELD_TYPE_MULTI_SELECT',
+    'constants.FIELD_TYPE_BUG_ID',
+  ],
+
+  'admin/params/common.html.tmpl' => ['sortlist_separator',],
+
+  'admin/products/groupcontrol/confirm-edit.html.tmpl' => ['group.count',],
+
+  'admin/products/groupcontrol/edit.html.tmpl' => [
+    'group.id',                  'constants.CONTROLMAPNA',
+    'constants.CONTROLMAPSHOWN', 'constants.CONTROLMAPDEFAULT',
+    'constants.CONTROLMAPMANDATORY',
+  ],
+
+  'admin/products/list.html.tmpl' => ['classification_url_part',],
+
+  'admin/products/footer.html.tmpl' =>
+    ['classification_url_part', 'classification_text',],
+
+  'admin/flag-type/confirm-delete.html.tmpl' =>
+    ['flag_type.flag_count', 'flag_type.id',],
+
+  'admin/flag-type/edit.html.tmpl' => ['selname',],
+
+  'admin/flag-type/list.html.tmpl' => ['type.id',],
+
+
+  'admin/components/confirm-delete.html.tmpl' => ['comp.bug_count'],
+
+  'admin/groups/delete.html.tmpl' => ['shared_queries'],
+
+  'admin/users/confirm-delete.html.tmpl' => [
+    'attachments',  'reporter',        'assignee_or_qa', 'cc',
+    'component_cc', 'flags.requestee', 'flags.setter',   'longdescs',
+    'quips',        'series',          'watch.watched',  'watch.watcher',
+    'whine_events', 'whine_schedules', 'otheruser.id'
+  ],
+
+  'admin/users/edit.html.tmpl' => ['otheruser.id', 'group.id',],
+
+  'admin/components/edit.html.tmpl' => ['comp.bug_count'],
+
+  'admin/workflow/edit.html.tmpl' => ['status.id', 'new_status.id',],
+
+  'admin/workflow/comment.html.tmpl' => ['status.id', 'new_status.id',],
+
+  'account/auth/login-small.html.tmpl' => ['qs_suffix',],
+
+  'account/prefs/email.html.tmpl' => ['relationship.id', 'event.id', 'prefname',],
+
+  'account/prefs/prefs.html.tmpl' => ['current_tab.label', 'current_tab.name',],
+
+  'account/prefs/saved-searches.html.tmpl' => ['group.id',],
+
+  'config.rdf.tmpl' => ['escaped_urlbase',],
 
 );
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 78c4d861b..0efc378bb 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -16,15 +16,15 @@
 # Please keep the strings in alphabetical order by their name.
 
 %strings = (
-    any  => 'any',
-    apachectl_failed => <<END,
+  any              => 'any',
+  apachectl_failed => <<END,
 WARNING: We could not check the configuration of Apache. This sometimes
 happens when you are not running checksetup.pl as ##root##. To see the
 problem we ran into, run: ##command##
 END
-    bad_executable => 'not a valid executable: ##bin##',
-    blacklisted => '(blacklisted)',
-    bz_schema_exists_before_220 => <<'END',
+  bad_executable              => 'not a valid executable: ##bin##',
+  blacklisted                 => '(blacklisted)',
+  bz_schema_exists_before_220 => <<'END',
 You are upgrading from a version before 2.20, but the bz_schema table
 already exists. This means that you restored a mysqldump into the Bugzilla
 database without first dropping the already-existing Bugzilla database,
@@ -36,34 +36,33 @@ not contain the bz_schema table. If for some reason you cannot do this, you
 can connect to your MySQL database and drop the bz_schema table, as a last
 resort.
 END
-    checking_for => 'Checking for',
-    checking_dbd      => 'Checking available perl DBD modules...',
-    checking_optional => 'The following Perl modules are optional:',
-    checking_modules  => 'Checking perl modules...',
-    chmod_failed      => '##path##: Failed to change permissions: ##error##',
-    chown_failed      => '##path##: Failed to change ownership: ##error##',
-    commands_dbd      => <<EOT,
+  checking_for      => 'Checking for',
+  checking_dbd      => 'Checking available perl DBD modules...',
+  checking_optional => 'The following Perl modules are optional:',
+  checking_modules  => 'Checking perl modules...',
+  chmod_failed      => '##path##: Failed to change permissions: ##error##',
+  chown_failed      => '##path##: Failed to change ownership: ##error##',
+  commands_dbd      => <<EOT,
 YOU MUST RUN ONE OF THE FOLLOWING COMMANDS (depending on which database
 you use):
 EOT
-    commands_optional => 'COMMANDS TO INSTALL OPTIONAL MODULES:',
-    commands_required => <<EOT,
+  commands_optional => 'COMMANDS TO INSTALL OPTIONAL MODULES:',
+  commands_required => <<EOT,
 COMMANDS TO INSTALL REQUIRED MODULES (You *must* run all these commands
 and then re-run checksetup.pl):
 EOT
-    continue_without_answers => <<'END',
+  continue_without_answers => <<'END',
 Re-run checksetup.pl in interactive mode (without an 'answers' file)
 to continue.
 END
-    cpan_bugzilla_home => 
-        "WARNING: Using the Bugzilla directory as the CPAN home.",
-    db_enum_setup  => "Setting up choices for standard drop-down fields:",
-    db_schema_init => "Initializing bz_schema...",
-    db_table_new   => "Adding new table ##table##...",
-    db_table_setup => "Creating tables...",
-    done => 'done.',
-    enter_or_ctrl_c => "Press Enter to continue or Ctrl-C to exit...",
-    error_localconfig_read => <<'END',
+  cpan_bugzilla_home => "WARNING: Using the Bugzilla directory as the CPAN home.",
+  db_enum_setup      => "Setting up choices for standard drop-down fields:",
+  db_schema_init     => "Initializing bz_schema...",
+  db_table_new       => "Adding new table ##table##...",
+  db_table_setup     => "Creating tables...",
+  done               => 'done.',
+  enter_or_ctrl_c    => "Press Enter to continue or Ctrl-C to exit...",
+  error_localconfig_read => <<'END',
 An error has occurred while reading the ##localconfig## file.  The text of
 the error message is:
 
@@ -76,38 +75,38 @@ localconfig file:
   $ mv -f localconfig localconfig.old
   $ ./checksetup.pl
 END
-    extension_must_return_name => <<END,
+  extension_must_return_name => <<END,
 ##file## returned ##returned##, which is not a valid name for an extension.
 Extensions must return their name, not <code>1</code> or a number. See
 the documentation of Bugzilla::Extension for details.
 END
-    feature_auth_ldap         => 'LDAP Authentication',
-    feature_auth_radius       => 'RADIUS Authentication',
-    feature_documentation     => 'Documentation',
-    feature_graphical_reports => 'Graphical Reports',
-    feature_html_desc         => 'More HTML in Product/Group Descriptions',
-    feature_inbound_email     => 'Inbound Email',
-    feature_jobqueue          => 'Mail Queueing',
-    feature_jsonrpc           => 'JSON-RPC Interface',
-    feature_new_charts        => 'New Charts',
-    feature_old_charts        => 'Old Charts',
-    feature_memcached         => 'Memcached Support',
-    feature_mod_perl          => 'mod_perl',
-    feature_moving            => 'Move Bugs Between Installations',
-    feature_patch_viewer      => 'Patch Viewer',
-    feature_rest              => 'REST Interface',
-    feature_smtp_auth         => 'SMTP Authentication',
-    feature_smtp_ssl          => 'SSL Support for SMTP',
-    feature_updates           => 'Automatic Update Notifications',
-    feature_xmlrpc            => 'XML-RPC Interface',
-    feature_detect_charset    => 'Automatic charset detection for text attachments',
-    feature_typesniffer       => 'Sniff MIME type of attachments',
+  feature_auth_ldap         => 'LDAP Authentication',
+  feature_auth_radius       => 'RADIUS Authentication',
+  feature_documentation     => 'Documentation',
+  feature_graphical_reports => 'Graphical Reports',
+  feature_html_desc         => 'More HTML in Product/Group Descriptions',
+  feature_inbound_email     => 'Inbound Email',
+  feature_jobqueue          => 'Mail Queueing',
+  feature_jsonrpc           => 'JSON-RPC Interface',
+  feature_new_charts        => 'New Charts',
+  feature_old_charts        => 'Old Charts',
+  feature_memcached         => 'Memcached Support',
+  feature_mod_perl          => 'mod_perl',
+  feature_moving            => 'Move Bugs Between Installations',
+  feature_patch_viewer      => 'Patch Viewer',
+  feature_rest              => 'REST Interface',
+  feature_smtp_auth         => 'SMTP Authentication',
+  feature_smtp_ssl          => 'SSL Support for SMTP',
+  feature_updates           => 'Automatic Update Notifications',
+  feature_xmlrpc            => 'XML-RPC Interface',
+  feature_detect_charset    => 'Automatic charset detection for text attachments',
+  feature_typesniffer       => 'Sniff MIME type of attachments',
 
-    file_remove => 'Removing ##name##...',
-    file_rename => 'Renaming ##from## to ##to##...',
-    header => "* This is Bugzilla ##bz_ver## on perl ##perl_ver##\n"
-            . "* Running on ##os_name## ##os_ver##",
-    install_all => <<EOT,
+  file_remove => 'Removing ##name##...',
+  file_rename => 'Renaming ##from## to ##to##...',
+  header      => "* This is Bugzilla ##bz_ver## on perl ##perl_ver##\n"
+    . "* Running on ##os_name## ##os_ver##",
+  install_all => <<EOT,
 
 To attempt an automatic install of every required and optional module
 with one command, do:
@@ -115,23 +114,23 @@ with one command, do:
   ##perl## install-module.pl --all
 
 EOT
-    install_data_too_long => <<EOT,
+  install_data_too_long => <<EOT,
 WARNING: Some of the data in the ##table##.##column## column is longer than
 its new length limit of ##max_length## characters. The data that needs to be
 fixed is printed below with the value of the ##id_column## column first and
 then the value of the ##column## column that needs to be fixed:
 
 EOT
-    install_module => 'Installing ##module## version ##version##...',
-    installation_failed => '*** Installation aborted. Read the messages above. ***',
-    install_no_compiler => <<END,
+  install_module      => 'Installing ##module## version ##version##...',
+  installation_failed => '*** Installation aborted. Read the messages above. ***',
+  install_no_compiler => <<END,
 ERROR: Using install-module.pl requires that you install a compiler, such as
 gcc.
 END
-    install_no_make => <<END,
+  install_no_make => <<END,
 ERROR: Using install-module.pl requires that you install "make".
 END
-    lc_new_vars => <<'END',
+  lc_new_vars => <<'END',
 This version of Bugzilla contains some variables that you may want to
 change and adapt to your local settings. The following variables are
 new to ##localconfig## since you last ran checksetup.pl:
@@ -141,11 +140,11 @@ new to ##localconfig## since you last ran checksetup.pl:
 Please edit the file ##localconfig## and then re-run checksetup.pl
 to complete your installation.
 END
-    lc_old_vars => <<'END',
+  lc_old_vars => <<'END',
 The following variables are no longer used in ##localconfig##, and
 have been moved to ##old_file##: ##vars##
 END
-    localconfig_create_htaccess => <<'END',
+  localconfig_create_htaccess => <<'END',
 If you are using Apache as your web server, Bugzilla can create .htaccess
 files for you, which will keep this file (localconfig) and other
 confidential files from being read over the web.
@@ -155,66 +154,66 @@ they don't exist.
 
 If this is set to 0, checksetup.pl will not create .htaccess files.
 END
-    localconfig_db_check => <<'END',
+  localconfig_db_check => <<'END',
 Should checksetup.pl try to verify that your database setup is correct?
 With some combinations of database servers/Perl modules/moonphase this
 doesn't work, and so you can try setting this to 0 to make checksetup.pl
 run.
 END
-    localconfig_db_driver => <<'END',
+  localconfig_db_driver => <<'END',
 What SQL database to use. Default is mysql. List of supported databases
 can be obtained by listing Bugzilla/DB directory - every module corresponds
 to one supported database and the name of the module (before ".pm")
 corresponds to a valid value for this variable.
 END
-    localconfig_db_host => <<'END',
+  localconfig_db_host => <<'END',
 The DNS name or IP address of the host that the database server runs on.
 END
-    localconfig_db_name => <<'END',
+  localconfig_db_name => <<'END',
 The name of the database. For Oracle, this is the database's SID. For
 SQLite, this is a name (or path) for the DB file.
 END
-    localconfig_db_pass => <<'END',
+  localconfig_db_pass => <<'END',
 Enter your database password here. It's normally advisable to specify
 a password for your bugzilla database user.
 If you use apostrophe (') or a backslash (\) in your password, you'll
 need to escape it by preceding it with a '\' character. (\') or (\)
 (It is far simpler to just not use those characters.)
 END
-    localconfig_db_port => <<'END',
+  localconfig_db_port => <<'END',
 Sometimes the database server is running on a non-standard port. If that's
 the case for your database server, set this to the port number that your
 database server is running on. Setting this to 0 means "use the default
 port for my database server."
 END
-    localconfig_db_sock => <<'END',
+  localconfig_db_sock => <<'END',
 MySQL Only: Enter a path to the unix socket for MySQL. If this is
 blank, then MySQL's compiled-in default will be used. You probably
 want that.
 END
-    localconfig_db_user => "Who we connect to the database as.",
-    localconfig_db_mysql_ssl_ca_file => <<'END',
+  localconfig_db_user              => "Who we connect to the database as.",
+  localconfig_db_mysql_ssl_ca_file => <<'END',
 Path to a PEM file with a list of trusted SSL CA certificates.
 The file must be readable by web server user.
 END
-    localconfig_db_mysql_ssl_ca_path => <<'END',
+  localconfig_db_mysql_ssl_ca_path => <<'END',
 Path to a directory containing trusted SSL CA certificates in PEM format.
 Directory and files inside must be readable by the web server user.
 END
-    localconfig_db_mysql_ssl_client_cert => <<'END',
+  localconfig_db_mysql_ssl_client_cert => <<'END',
 Full path to the client SSL certificate in PEM format we will present to the DB server.
 The file must be readable by web server user.
 END
-    localconfig_db_mysql_ssl_client_key => <<'END',
+  localconfig_db_mysql_ssl_client_key => <<'END',
 Full path to the private key corresponding to the client SSL certificate.
 The file must not be password-protected and must be readable by web server user.
 END
-    localconfig_diffpath => <<'END',
+  localconfig_diffpath => <<'END',
 For the "Difference Between Two Patches" feature to work, we need to know
 what directory the "diff" bin is in. (You only need to set this if you
 are using that feature of the Patch Viewer.)
 END
-    localconfig_index_html => <<'END',
+  localconfig_index_html => <<'END',
 Most web servers will allow you to use index.cgi as a directory
 index, and many come preconfigured that way, but if yours doesn't
 then you'll need an index.html file that provides redirection
@@ -224,19 +223,19 @@ NOTE: checksetup.pl will not replace an existing file, so if you
       wish to have checksetup.pl create one for you, you must
       make sure that index.html doesn't already exist.
 END
-    localconfig_interdiffbin => <<'END',
+  localconfig_interdiffbin => <<'END',
 If you want to use the "Difference Between Two Patches" feature of the
 Patch Viewer, please specify the full path to the "interdiff" executable
 here.
 END
-    localconfig_site_wide_secret => <<'END',
+  localconfig_site_wide_secret => <<'END',
 This secret key is used by your installation for the creation and
 validation of encrypted tokens. These tokens are used to implement
 security features in Bugzilla, to protect against certain types of attacks.
 A random string is generated by default. It's very important that this key
 is kept secret. It also must be very long.
 END
-    localconfig_use_suexec => <<'END',
+  localconfig_use_suexec => <<'END',
 Set this to 1 if Bugzilla runs in an Apache SuexecUserGroup environment.
 
 If your web server runs control panel software (cPanel, Plesk or similar),
@@ -251,7 +250,7 @@ a normal webserver environment.
 If set to 1, checksetup.pl will set file permissions so that Bugzilla
 works in a SuexecUserGroup environment. 
 END
-    localconfig_webservergroup => <<'END',
+  localconfig_webservergroup => <<'END',
 The name of the group that your web server runs as. On Red Hat
 distributions, this is usually "apache". On Debian/Ubuntu, it is 
 usually "www-data".
@@ -271,18 +270,18 @@ and you cannot set this up any other way. YOU HAVE BEEN WARNED!
 If you set this to anything other than "", you will need to run checksetup.pl
 as ##root## or as a user who is a member of the specified group.
 END
-    max_allowed_packet => <<EOT,
+  max_allowed_packet => <<EOT,
 WARNING: You need to set the max_allowed_packet parameter in your MySQL
 configuration to at least ##needed##. Currently it is set to ##current##.
 You can set this parameter in the [mysqld] section of your MySQL
 configuration file.
 EOT
-    min_version_required => "Minimum version required: ",
+  min_version_required => "Minimum version required: ",
 
 # Note: When translating these "modules" messages, don't change the formatting
-# if possible, because there is hardcoded formatting in 
+# if possible, because there is hardcoded formatting in
 # Bugzilla::Install::Requirements to match the box formatting.
-    modules_message_apache => <<END,
+  modules_message_apache => <<END,
 ***********************************************************************
 * APACHE MODULES                                                      *
 ***********************************************************************
@@ -297,7 +296,7 @@ EOT
 * The modules you need to enable are:                                 *
 *                                                                     *
 END
-    modules_message_db => <<EOT,
+  modules_message_db => <<EOT,
 ***********************************************************************
 * DATABASE ACCESS                                                     *
 ***********************************************************************
@@ -306,7 +305,7 @@ END
 * running. See below for the correct command to run to install the    *
 * appropriate module for your database.                               *
 EOT
-    modules_message_optional => <<EOT,
+  modules_message_optional => <<EOT,
 ***********************************************************************
 * OPTIONAL MODULES                                                    *
 ***********************************************************************
@@ -318,7 +317,7 @@ EOT
 * with the name of the feature they enable. Below that table are the  *
 * commands to install each module.                                    *
 EOT
-    modules_message_required => <<EOT,
+  modules_message_required => <<EOT,
 ***********************************************************************
 * REQUIRED MODULES                                                    *
 ***********************************************************************
@@ -327,23 +326,23 @@ EOT
 * See below for commands to install these modules.                    *
 EOT
 
-    module_found => "found v##ver##",
-    module_not_found => "not found",
-    module_ok => 'ok',
-    module_unknown_version => "found unknown version",
-    no_such_module => "There is no Perl module on CPAN named ##module##.",
-    mysql_innodb_disabled => <<'END',
+  module_found           => "found v##ver##",
+  module_not_found       => "not found",
+  module_ok              => 'ok',
+  module_unknown_version => "found unknown version",
+  no_such_module         => "There is no Perl module on CPAN named ##module##.",
+  mysql_innodb_disabled  => <<'END',
 InnoDB is disabled in your MySQL installation.
 Bugzilla requires InnoDB to be enabled.
 Please enable it and then re-run checksetup.pl.
 END
-    mysql_index_renaming => <<'END',
+  mysql_index_renaming => <<'END',
 We are about to rename old indexes. The estimated time to complete
 renaming is ##minutes## minutes. You cannot interrupt this action once
 it has begun. If you would like to cancel, press Ctrl-C now...
 (Waiting 45 seconds...)
 END
-    mysql_utf8_conversion => <<'END',
+  mysql_utf8_conversion => <<'END',
 WARNING: We are about to convert your table storage format to UTF-8. This
          allows Bugzilla to correctly store and sort international characters.
          However, if you have any non-UTF-8 data in your database,
@@ -358,7 +357,7 @@ WARNING: We are about to convert your table storage format to UTF-8. This
          If you ever used a version of Bugzilla before 2.22, we STRONGLY
          recommend that you stop checksetup.pl NOW and run contrib/recode.pl.
 END
-    no_checksetup_from_cgi => <<END,
+  no_checksetup_from_cgi => <<END,
 <!DOCTYPE html>
 <html>
   <head>
@@ -382,49 +381,49 @@ END
   </body>
 </html>
 END
-    patchutils_missing => <<'END',
+  patchutils_missing => <<'END',
 OPTIONAL NOTE: If you want to be able to use the 'difference between two
 patches' feature of Bugzilla (which requires the PatchReader Perl module
 as well), you should install patchutils from:
 
     http://cyberelk.net/tim/software/patchutils/
 END
-    template_precompile   => "Precompiling templates...",
-    template_removal_failed => <<END,
+  template_precompile     => "Precompiling templates...",
+  template_removal_failed => <<END,
 WARNING: The directory '##template_cache##' could not be removed.
          It has been moved into '##deleteme##', which should be
          deleted manually to conserve disk space.
 END
-    template_removing_dir => "Removing existing compiled templates...",
-    update_cf_invalid_name => 
-        "Removing custom field '##field##', because it has an invalid name...",
-    update_flags_bad_name => <<'END',
+  template_removing_dir => "Removing existing compiled templates...",
+  update_cf_invalid_name =>
+    "Removing custom field '##field##', because it has an invalid name...",
+  update_flags_bad_name => <<'END',
 "##flag##" is not a valid name for a flag. Rename it to not have any spaces
 or commas.
 END
-    update_nomail_bad => <<'END',
+  update_nomail_bad => <<'END',
 WARNING: The following users were listed in ##data##/nomail, but do
 not have an account here. The unmatched entries have been moved to 
 ##data##/nomail.bad:
 END
-    update_summary_truncate_comment => 
-        "The original value of the Summary field was longer than 255"
-        . " characters, and so it was truncated during an upgrade."
-        . " The original summary was:\n\n##summary##",
-    update_summary_truncated => <<'END',
+  update_summary_truncate_comment =>
+    "The original value of the Summary field was longer than 255"
+    . " characters, and so it was truncated during an upgrade."
+    . " The original summary was:\n\n##summary##",
+  update_summary_truncated => <<'END',
 WARNING: Some of your bugs had summaries longer than 255 characters.
 They have had their original summary copied into a comment, and then
 the summary was truncated to 255 characters. The affected bug numbers were:
 END
-    update_quips => <<'END',
+  update_quips => <<'END',
 Quips are now stored in the database, rather than in an external file.
 The quips previously stored in ##data##/comments have been copied into
 the database, and that file has been renamed to ##data##/comments.bak
 You may delete the renamed file once you have confirmed that all your
 quips were moved successfully.
 END
-    update_queries_to_tags => "Populating the new 'tag' table:",
-    webdot_bad_htaccess => <<END,
+  update_queries_to_tags => "Populating the new 'tag' table:",
+  webdot_bad_htaccess    => <<END,
 WARNING: Dependency graph images are not accessible.
 Delete ##dir##/.htaccess and re-run checksetup.pl.
 END