diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm index 383bb0c19..b01757835 100644 --- a/Bugzilla/DB/Schema.pm +++ b/Bugzilla/DB/Schema.pm @@ -1,3 +1,4 @@ +# -*- 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 diff --git a/Bugzilla/Extension.pm b/Bugzilla/Extension.pm index fc08fd921..3099cb78e 100644 --- a/Bugzilla/Extension.pm +++ b/Bugzilla/Extension.pm @@ -77,6 +77,7 @@ sub extension_include trick_taint($_) for @$new; } my $old = setter('inc', $name, $new); + return $old if !$new; # update @INC my $oh = { map { $_ => 1 } @$old }; for (my $i = $#INC; $i >= 0; $i--) diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index a4d13734e..5be9d06f2 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -327,18 +327,18 @@ sub _get_extension_requirements if ($function eq 'REQUIRED_MODULES' || $function eq 'OPTIONAL_MODULES') { no strict 'refs'; - $function = "Bugzilla::Extension::".lc($function); + $function = 'Bugzilla::Extension::'.lc($function); foreach (Bugzilla::Extension::loaded()) { if (my $em = &$function($_)) { - ref $_->{feature} or $_->{feature} = [ $_->{feature} ]; + ref $_->{feature} or $_->{feature} = [ $_->{feature} ] for @$em; push @$modules, @$em; } } } return $modules; -}; +} sub check_requirements { my ($output) = @_; diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm index f0f605b28..ed46c6a51 100644 --- a/Bugzilla/Install/Util.pm +++ b/Bugzilla/Install/Util.pm @@ -288,6 +288,8 @@ sub template_include_path # with perl by default. sub vers_cmp { my ($a, $b) = @_; + $a = '' if !defined $a; + $b = '' if !defined $b; # Remove leading zeroes - Bug 344661 $a =~ s/^0*(\d.+)/$1/; diff --git a/extensions/example/code/auth-login_methods.pl b/extensions/example/code/auth-login_methods.pl deleted file mode 100644 index 0ae12aa6b..000000000 --- a/extensions/example/code/auth-login_methods.pl +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -my $modules = Bugzilla->hook_args->{modules}; -if (exists $modules->{Example}) { - $modules->{Example} = 'extensions/example/lib/AuthLogin.pm'; -} diff --git a/extensions/example/code/auth-verify_methods.pl b/extensions/example/code/auth-verify_methods.pl deleted file mode 100644 index 7ae52f012..000000000 --- a/extensions/example/code/auth-verify_methods.pl +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -my $modules = Bugzilla->hook_args->{modules}; -if (exists $modules->{Example}) { - $modules->{Example} = 'extensions/example/lib/AuthVerify.pm'; -} diff --git a/extensions/example/code/bug-columns.pl b/extensions/example/code/bug-columns.pl deleted file mode 100644 index 92ccf6d23..000000000 --- a/extensions/example/code/bug-columns.pl +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Elliotte Martin - - -use strict; -use warnings; -use Bugzilla; - -my $columns = Bugzilla->hook_args->{'columns'}; -push (@$columns, "delta_ts AS example") diff --git a/extensions/example/code/bug-end_of_create.pl b/extensions/example/code/bug-end_of_create.pl deleted file mode 100644 index 0325ddd59..000000000 --- a/extensions/example/code/bug-end_of_create.pl +++ /dev/null @@ -1,35 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is ITA Software -# Portions created by the Initial Developer are Copyright (C) 2009 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander -# Bradley Baetz - -use strict; -use warnings; -use Bugzilla; - -# This code doesn't actually *do* anything, it's just here to show you -# how to use this hook. -my $args = Bugzilla->hook_args; -my $bug = $args->{'bug'}; -my $timestamp = $args->{'timestamp'}; - -my $bug_id = $bug->id; -# Uncomment this line to see a line in your webserver's error log whenever -# you file a bug. -# warn "Bug $bug_id has been filed!"; diff --git a/extensions/example/code/bug-end_of_update.pl b/extensions/example/code/bug-end_of_update.pl deleted file mode 100644 index 036563517..000000000 --- a/extensions/example/code/bug-end_of_update.pl +++ /dev/null @@ -1,56 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by Everything Solved are Copyright (C) 2008 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -use Bugzilla::Status; - -# This code doesn't actually *do* anything, it's just here to show you -# how to use this hook. -my $args = Bugzilla->hook_args; -my $bug = $args->{'bug'}; -my $timestamp = $args->{'timestamp'}; -my $changes = $args->{'changes'}; - -foreach my $field (keys %$changes) { - my $used_to_be = $changes->{$field}->[0]; - my $now_it_is = $changes->{$field}->[1]; -} - -my $status_message; -if (my $status_change = $changes->{'bug_status'}) { - my $old_status = new Bugzilla::Status({ name => $status_change->[0] }); - my $new_status = new Bugzilla::Status({ name => $status_change->[1] }); - if ($new_status->is_open && !$old_status->is_open) { - $status_message = "Bug re-opened!"; - } - if (!$new_status->is_open && $old_status->is_open) { - $status_message = "Bug closed!"; - } -} - -my $bug_id = $bug->id; -my $num_changes = scalar keys %$changes; -my $result = "There were $num_changes changes to fields on bug $bug_id" - . " at $timestamp."; -# Uncomment this line to see $result in your webserver's error log whenever -# you update a bug. -# warn $result; diff --git a/extensions/example/code/bug-fields.pl b/extensions/example/code/bug-fields.pl deleted file mode 100644 index f8475426d..000000000 --- a/extensions/example/code/bug-fields.pl +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Elliotte Martin - - -use strict; -use warnings; -use Bugzilla; - -my $fields = Bugzilla->hook_args->{'fields'}; -push (@$fields, "example") diff --git a/extensions/example/code/buglist-columns.pl b/extensions/example/code/buglist-columns.pl deleted file mode 100644 index 4487b2dc8..000000000 --- a/extensions/example/code/buglist-columns.pl +++ /dev/null @@ -1,26 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Elliotte Martin - -use strict; -use warnings; -use Bugzilla; - -my $columns = Bugzilla->hook_args->{'columns'}; -$columns->{'example'} = { 'name' => 'bugs.delta_ts' , 'title' => 'Example' }; diff --git a/extensions/example/code/colchange-columns.pl b/extensions/example/code/colchange-columns.pl deleted file mode 100644 index 6174d3940..000000000 --- a/extensions/example/code/colchange-columns.pl +++ /dev/null @@ -1,27 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Elliotte Martin - - -use strict; -use warnings; -use Bugzilla; - -my $columns = Bugzilla->hook_args->{'columns'}; -push (@$columns, "example") diff --git a/extensions/example/code/config-add_panels.pl b/extensions/example/code/config-add_panels.pl deleted file mode 100644 index 5f4f5bdd4..000000000 --- a/extensions/example/code/config-add_panels.pl +++ /dev/null @@ -1,25 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Bradley Baetz - -use strict; -use warnings; -use Bugzilla; -my $modules = Bugzilla->hook_args->{panel_modules}; -$modules->{Example} = "extensions::example::lib::ConfigExample"; diff --git a/extensions/example/code/config-modify_panels.pl b/extensions/example/code/config-modify_panels.pl deleted file mode 100644 index bd93962bf..000000000 --- a/extensions/example/code/config-modify_panels.pl +++ /dev/null @@ -1,32 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -my $panels = Bugzilla->hook_args->{panels}; - -# Add the "Example" auth methods. -my $auth_params = $panels->{'auth'}->{params}; -my ($info_class) = grep($_->{name} eq 'user_info_class', @$auth_params); -my ($verify_class) = grep($_->{name} eq 'user_verify_class', @$auth_params); - -push(@{ $info_class->{choices} }, 'CGI,Example'); -push(@{ $verify_class->{choices} }, 'Example'); diff --git a/extensions/example/code/config.pl b/extensions/example/code/config.pl deleted file mode 100644 index 1da490cc2..000000000 --- a/extensions/example/code/config.pl +++ /dev/null @@ -1,26 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander -# Bradley Baetz - -use strict; -use warnings; -use Bugzilla; -my $config = Bugzilla->hook_args->{config}; -$config->{Example} = "extensions::example::lib::ConfigExample"; diff --git a/extensions/example/code/flag-end_of_update.pl b/extensions/example/code/flag-end_of_update.pl deleted file mode 100644 index 6371bd154..000000000 --- a/extensions/example/code/flag-end_of_update.pl +++ /dev/null @@ -1,42 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by Everything Solved are Copyright (C) 2008 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -use Bugzilla::Util qw(diff_arrays); - -# This code doesn't actually *do* anything, it's just here to show you -# how to use this hook. -my $args = Bugzilla->hook_args; -my ($bug, $timestamp, $old_flags, $new_flags) = - @$args{qw(bug timestamp old_flags new_flags)}; -my ($removed, $added) = diff_arrays($old_flags, $new_flags); -my ($granted, $denied) = (0, 0); -foreach my $new_flag (@$added) { - $granted++ if $new_flag =~ /\+$/; - $denied++ if $new_flag =~ /-$/; -} -my $bug_id = $bug->id; -my $result = "$granted flags were granted and $denied flags were denied" - . " on bug $bug_id at $timestamp."; -# Uncomment this line to see $result in your webserver's error log whenever -# you update flags. -# warn $result; diff --git a/extensions/example/code/install-before_final_checks.pl b/extensions/example/code/install-before_final_checks.pl deleted file mode 100644 index ef1bee22c..000000000 --- a/extensions/example/code/install-before_final_checks.pl +++ /dev/null @@ -1,28 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Elliotte Martin - - -use strict; -use warnings; -use Bugzilla; - -my $silent = Bugzilla->hook_args->{'silent'}; - -print "Install-before_final_checks hook\n" unless $silent; diff --git a/extensions/example/code/mailer-before_send.pl b/extensions/example/code/mailer-before_send.pl deleted file mode 100644 index 322c78088..000000000 --- a/extensions/example/code/mailer-before_send.pl +++ /dev/null @@ -1,28 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by the Initial Developer are Copyright (C) 2008 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -my $email = Bugzilla->hook_args->{email}; -# If you add a header to an email, it's best to start it with -# 'X-Bugzilla-' so that you don't conflict with -# other extensions. -$email->header_set('X-Bugzilla-Example-Header', 'Example'); diff --git a/extensions/example/code/page-before_template.pl b/extensions/example/code/page-before_template.pl deleted file mode 100644 index dcf059367..000000000 --- a/extensions/example/code/page-before_template.pl +++ /dev/null @@ -1,33 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2009 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): -# Max Kanat-Alexander - - -use strict; -use warnings; -use Bugzilla; - -my %args = %{ Bugzilla->hook_args }; -my ($vars, $page) = @args{qw(vars page_id)}; - -# You can see this hook in action by loading page.cgi?id=example.html -if ($page eq 'example.html') { - $vars->{cgi_variables} = { Bugzilla->cgi->Vars }; -} diff --git a/extensions/example/code/product-confirm_delete.pl b/extensions/example/code/product-confirm_delete.pl deleted file mode 100644 index 1f4c3740e..000000000 --- a/extensions/example/code/product-confirm_delete.pl +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/perl -w -# -*- 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 Testopia System. -# -# The Initial Developer of the Original Code is Greg Hendricks. -# Portions created by Greg Hendricks are Copyright (C) 2008 -# Novell. All Rights Reserved. -# -# Contributor(s): Greg Hendricks - -use strict; - -my $vars = Bugzilla->hook_args->{vars}; - -$vars->{'example'} = 1 diff --git a/extensions/example/code/webservice-error_codes.pl b/extensions/example/code/webservice-error_codes.pl deleted file mode 100644 index 94c4c52fc..000000000 --- a/extensions/example/code/webservice-error_codes.pl +++ /dev/null @@ -1,25 +0,0 @@ -# -*- 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 Everything Solved, Inc. -# Portions created by Everything Solved, Inc. are Copyright (C) 2008 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -my $error_map = Bugzilla->hook_args->{error_map}; -$error_map->{'example_my_error'} = 10001; diff --git a/extensions/example/code/webservice.pl b/extensions/example/code/webservice.pl deleted file mode 100644 index ff503be39..000000000 --- a/extensions/example/code/webservice.pl +++ /dev/null @@ -1,25 +0,0 @@ -# -*- 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 Everything Solved, Inc. -# Portions created by Everything Solved, Inc. are Copyright (C) 2007 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -use strict; -use warnings; -use Bugzilla; -my $dispatch = Bugzilla->hook_args->{dispatch}; -$dispatch->{Example} = "extensions::example::lib::WSExample"; diff --git a/extensions/example/disabled b/extensions/example/disabled deleted file mode 100644 index e69de29bb..000000000 diff --git a/extensions/example/info.pl b/extensions/example/info.pl deleted file mode 100644 index b4620eed6..000000000 --- a/extensions/example/info.pl +++ /dev/null @@ -1,41 +0,0 @@ -# -*- 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 Example WebService Plugin -# -# The Initial Developer of the Original Code is Everything Solved, Inc. -# Portions created by Everything Solved, Inc. are Copyright (C) 2007 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander -# Colin Ogilvie - -# This script does some code to return a hash about the Extension. -# You are required to return a hash containing the Extension version -# You can optionaally add any other values to the hash too, as long as -# they begin with an x_ -# -# Eg: -# { -# 'version' => '0.1', # required -# 'x_name' => 'Example Extension' -# } - -use strict; -no warnings qw(void); # Avoid "useless use of a constant in void context" -use Bugzilla::Constants; - -{ - 'version' => BUGZILLA_VERSION, - 'x_blah' => 'Hello....', - -}; diff --git a/extensions/example/lib/AuthLogin.pm b/extensions/example/lib/AuthLogin.pm deleted file mode 100644 index def3fa228..000000000 --- a/extensions/example/lib/AuthLogin.pm +++ /dev/null @@ -1,32 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical are Copyright (C) 2008 Canonical Ltd. -# All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -package extensions::example::lib::AuthLogin; -use strict; -use base qw(Bugzilla::Auth::Login); -use constant user_can_create_account => 0; -use Bugzilla::Constants; - -# Always returns no data. -sub get_login_info { - return { failure => AUTH_NODATA }; -} - -1; diff --git a/extensions/example/lib/AuthVerify.pm b/extensions/example/lib/AuthVerify.pm deleted file mode 100644 index b89bbb213..000000000 --- a/extensions/example/lib/AuthVerify.pm +++ /dev/null @@ -1,31 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical are Copyright (C) 2008 Canonical Ltd. -# All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -package extensions::example::lib::AuthVerify; -use strict; -use base qw(Bugzilla::Auth::Verify); -use Bugzilla::Constants; - -# A verifier that always fails. -sub check_credentials { - return { failure => AUTH_NO_SUCH_USER }; -} - -1; diff --git a/extensions/example/lib/ConfigExample.pm b/extensions/example/lib/ConfigExample.pm deleted file mode 100644 index 5ee612de2..000000000 --- a/extensions/example/lib/ConfigExample.pm +++ /dev/null @@ -1,41 +0,0 @@ -# -*- 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 Example Plugin. -# -# The Initial Developer of the Original Code is Canonical Ltd. -# Portions created by Canonical Ltd. are Copyright (C) 2008 -# Canonical Ltd. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander -# Bradley Baetz - -package extensions::example::lib::ConfigExample; -use strict; -use warnings; - -use Bugzilla::Config::Common; - -sub get_param_list { - my ($class) = @_; - - my @param_list = ( - { - name => 'example_string', - type => 't', - default => 'EXAMPLE', - }, - ); - return @param_list; -} - -1; diff --git a/extensions/example/lib/WSExample.pm b/extensions/example/lib/WSExample.pm deleted file mode 100644 index 146867294..000000000 --- a/extensions/example/lib/WSExample.pm +++ /dev/null @@ -1,32 +0,0 @@ -# -*- 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 Everything Solved, Inc. -# Portions created by Everything Solved, Inc. are Copyright (C) 2007 -# Everything Solved, Inc. All Rights Reserved. -# -# Contributor(s): Max Kanat-Alexander - -package extensions::example::lib::WSExample; -use strict; -use warnings; -use base qw(Bugzilla::WebService); -use Bugzilla::Error; - -# This can be called as Example.hello() from XML-RPC. -sub hello { return 'Hello!'; } - -sub throw_an_error { ThrowUserError('example_my_error') } - -1; diff --git a/extensions/example/template/en/default/admin/params/example.html.tmpl b/extensions/example/template/en/default/admin/params/example.html.tmpl deleted file mode 100644 index e2bb5f35c..000000000 --- a/extensions/example/template/en/default/admin/params/example.html.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -[%# - # 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 Example Plugin. - # - # The Initial Developer of the Original Code is Canonical Ltd. - # Portions created by Canonical Ltd. are Copyright (C) 2008 - # Canonical Ltd. All Rights Reserved. - # - # Contributor(s): Bradley Baetz - #%] -[% - title = "Example Extension" - desc = "Configure example extension" -%] - -[% param_descs = { - example_string => "Example string", -} -%] diff --git a/extensions/example/template/en/global/user-error-errors.html.tmpl b/extensions/example/template/en/global/user-error-errors.html.tmpl deleted file mode 100644 index df5a203dd..000000000 --- a/extensions/example/template/en/global/user-error-errors.html.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -[%# Note that error messages should generally be indented four spaces, like - # below, because when Bugzilla translates an error message into plain - # text, it takes four spaces off the beginning of the lines. - # - # Note also that I prefixed my error name with "example", the name of my - # extension, so that I wouldn't conflict with other error names in - # Bugzilla or other extensions. - #%] -[% IF error == "example_my_error" %] - [% title = "Example Error Title" %] - This is the error message! It contains some html. -[% END %] diff --git a/extensions/testopia/testopia.pl b/extensions/testopia/testopia.pl index d4352e3fe..0e11064e8 100644 --- a/extensions/testopia/testopia.pl +++ b/extensions/testopia/testopia.pl @@ -43,11 +43,6 @@ my $OPTIONAL_MODULES = [ version => '1.06', feature => 'CSV Importing of test cases' }, - { - package => 'GD-Graph3d', - module => 'GD::Graph3d', - version => '0.63' - }, { package => 'XML Schema Validator', module => 'XML::Validator::Schema', diff --git a/template/en/custom/admin/editemailin.html.tmpl b/template/en/custom/admin/editemailin.html.tmpl index d668d491d..d2bf4c9fe 100644 --- a/template/en/custom/admin/editemailin.html.tmpl +++ b/template/en/custom/admin/editemailin.html.tmpl @@ -1,22 +1,6 @@ -[%# 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): Gavin Shelley - # Akamai Technologies +[%# Edit incoming address field mapping for email_in.pl + # License: Dual-license GPL 3.0+ or MPL 1.1+ + # Contributor(s): Vitaliy Filippov #%] [% PROCESS global/header.html.tmpl diff --git a/template/en/custom/admin/params/integration.html.tmpl b/template/en/custom/admin/params/integration.html.tmpl index 2a138b0cb..f64c54e50 100644 --- a/template/en/custom/admin/params/integration.html.tmpl +++ b/template/en/custom/admin/params/integration.html.tmpl @@ -1,5 +1,6 @@ -[%# License: Dual-license GPL 3.0+ or MPL 1.1+ - # Contributor(s): Vitaliy Filippov %] +[%# Parameter descriptions for Integration config section + # License: Dual-license GPL 3.0+ or MPL 1.1+ + # Contributor(s): Stas Fomin , Vitaliy Filippov %] [% title = "Integration config" diff --git a/template/en/custom/list-of-mail-groups.html.tmpl b/template/en/custom/list-of-mail-groups.html.tmpl index ccc98c46c..ce9e4e238 100644 --- a/template/en/custom/list-of-mail-groups.html.tmpl +++ b/template/en/custom/list-of-mail-groups.html.tmpl @@ -1,4 +1,7 @@ -[%# 1.0@bugzilla.org %] +[%# List "mail groups" (VERY specific to CustIS usage) + # License: Dual-license GPL 3.0+ or MPL 1.1+ + # Contributor(s): Stas Fomin , Vitaliy Filippov + # %] [%# INTERFACE: # users: list of user information (id, login_name, realname, disabledtext). @@ -21,7 +24,6 @@ Список этих групп и входящих в них пользователей представлен ниже:

- [% columns = [{name => 'login_name' heading => 'Группа'