diff options
| -rw-r--r-- | Bugzilla/Config/Admin.pm | 36 | ||||
| -rw-r--r-- | Bugzilla/Config/Attachment.pm | 81 | ||||
| -rw-r--r-- | template/en/default/admin/params/admin.html.tmpl | 24 | ||||
| -rw-r--r-- | template/en/default/admin/params/attachment.html.tmpl | 47 |
4 files changed, 130 insertions, 58 deletions
diff --git a/Bugzilla/Config/Admin.pm b/Bugzilla/Config/Admin.pm index f416b7fe6..838e53295 100644 --- a/Bugzilla/Config/Admin.pm +++ b/Bugzilla/Config/Admin.pm @@ -62,42 +62,6 @@ sub get_param_list { name => 'supportwatchers', type => 'b', default => 0 - }, - - { - name => 'maxpatchsize', - type => 't', - default => '1000', - checker => \&check_numeric - }, - - { - name => 'maxattachmentsize', - type => 't', - default => '1000', - checker => \&check_numeric - }, - - # The maximum size (in bytes) for patches and non-patch attachments. - # The default limit is 1000KB, which is 24KB less than mysql's default - # maximum packet size (which determines how much data can be sent in a - # single mysql packet and thus how much data can be inserted into the - # database) to provide breathing space for the data in other fields of - # the attachment record as well as any mysql packet overhead (I don't - # know of any, but I suspect there may be some.) - - { - name => 'maxlocalattachment', - type => 't', - default => '0', - checker => \&check_numeric - }, - - { - name => 'convert_uncompressed_images', - type => 'b', - default => 0, - checker => \&check_image_converter } ); return @param_list; } diff --git a/Bugzilla/Config/Attachment.pm b/Bugzilla/Config/Attachment.pm new file mode 100644 index 000000000..8192d5f9f --- /dev/null +++ b/Bugzilla/Config/Attachment.pm @@ -0,0 +1,81 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Terry Weissman <terry@mozilla.org> +# Dawn Endico <endico@mozilla.org> +# Dan Mosedale <dmose@mozilla.org> +# Joe Robins <jmrobins@tgix.com> +# Jacob Steenhagen <jake@bugzilla.org> +# J. Paul Reed <preed@sigkill.com> +# Bradley Baetz <bbaetz@student.usyd.edu.au> +# Joseph Heenan <joseph@heenan.me.uk> +# Erik Stambaugh <erik@dasbistro.com> +# Frédéric Buclin <LpSolit@gmail.com> +# + +package Bugzilla::Config::Attachment; + +use strict; + +use Bugzilla::Config::Common; + +$Bugzilla::Config::Attachment::sortkey = "025"; + +sub get_param_list { + my $class = shift; + my @param_list = ( + { + name => 'maxpatchsize', + type => 't', + default => '1000', + checker => \&check_numeric + }, + + { + name => 'maxattachmentsize', + type => 't', + default => '1000', + checker => \&check_numeric + }, + + # The maximum size (in bytes) for patches and non-patch attachments. + # The default limit is 1000KB, which is 24KB less than mysql's default + # maximum packet size (which determines how much data can be sent in a + # single mysql packet and thus how much data can be inserted into the + # database) to provide breathing space for the data in other fields of + # the attachment record as well as any mysql packet overhead (I don't + # know of any, but I suspect there may be some.) + + { + name => 'maxlocalattachment', + type => 't', + default => '0', + checker => \&check_numeric + }, + + { + name => 'convert_uncompressed_images', + type => 'b', + default => 0, + checker => \&check_image_converter + } ); + return @param_list; +} + +1; diff --git a/template/en/default/admin/params/admin.html.tmpl b/template/en/default/admin/params/admin.html.tmpl index 202902b15..2602cf20c 100644 --- a/template/en/default/admin/params/admin.html.tmpl +++ b/template/en/default/admin/params/admin.html.tmpl @@ -21,7 +21,7 @@ #%] [% title = "Administrative Policies" - desc = "Set up account and attachment policies" + desc = "Set up account policies" %] [% param_descs = { @@ -42,25 +42,5 @@ supportwatchers => "Support one user watching (ie getting copies of all related " _ "email about) another's ${terms.bugs}. Useful for people going on " _ - "vacation, and QA folks watching particular developers' ${terms.bugs}.", - - maxpatchsize => "The maximum size (in kilobytes) of patches. $terms.Bugzilla will not " _ - "accept patches greater than this number of kilobytes in size. " _ - "To accept patches of any size (subject to the limitations of " _ - "your server software), set this value to zero.", - - maxattachmentsize => "The maximum size (in kilobytes) of non-patch attachments. " _ - "$terms.Bugzilla will not accept attachments greater than this number " _ - "of kilobytes in size. To accept attachments of any size " _ - "(subject to the limitations of your server software), set this " _ - "value to zero.", - - maxlocalattachment => "The maximum size (in megabytes) of attachments identified by " _ - "the user as 'Big Files' to be stored locally on the webserver. " _ - "If set to zero, attachments will never be kept on the local " _ - "filesystem.", - - convert_uncompressed_images => "If this option is on, attachments with content type image/bmp " _ - "will be converted to image/png and compressed before uploading to " _ - "the database to conserve disk space." } + "vacation, and QA folks watching particular developers' ${terms.bugs}." } %]
\ No newline at end of file diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl new file mode 100644 index 000000000..963d89e08 --- /dev/null +++ b/template/en/default/admin/params/attachment.html.tmpl @@ -0,0 +1,47 @@ +[%# 1.0@bugzilla.org %] +[%# The contents of this file are subject to the Mozilla Public + # License Version 1.1 (the "License"); you may not use this file + # except in compliance with the License. You may obtain a copy of + # the License at http://www.mozilla.org/MPL/ + # + # Software distributed under the License is distributed on an "AS + # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + # implied. See the License for the specific language governing + # rights and limitations under the License. + # + # The Original Code is the Bugzilla Bug Tracking System. + # + # The Initial Developer of the Original Code is Netscape Communications + # Corporation. Portions created by Netscape are + # Copyright (C) 1998 Netscape Communications Corporation. All + # Rights Reserved. + # + # Contributor(s): Dave Miller <justdave@bugzilla.org> + # Frédéric Buclin <LpSolit@gmail.com> + #%] +[% + title = "Attachments" + desc = "Set up attachment options" +%] + +[% param_descs = { + maxpatchsize => "The maximum size (in kilobytes) of patches. $terms.Bugzilla will not " _ + "accept patches greater than this number of kilobytes in size. " _ + "To accept patches of any size (subject to the limitations of " _ + "your server software), set this value to zero.", + + maxattachmentsize => "The maximum size (in kilobytes) of non-patch attachments. " _ + "$terms.Bugzilla will not accept attachments greater than this number " _ + "of kilobytes in size. To accept attachments of any size " _ + "(subject to the limitations of your server software), set this " _ + "value to zero.", + + maxlocalattachment => "The maximum size (in megabytes) of attachments identified by " _ + "the user as 'Big Files' to be stored locally on the webserver. " _ + "If set to zero, attachments will never be kept on the local " _ + "filesystem.", + + convert_uncompressed_images => "If this option is on, attachments with content type image/bmp " _ + "will be converted to image/png and compressed before uploading to " _ + "the database to conserve disk space." } +%]
\ No newline at end of file |