From 5fb38bd7342c69a567b73dcd15352cde5ea97f71 Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Mon, 28 May 2012 01:25:45 +0200 Subject: Bug 735196: Support "bugs.php.net" URLs in "See also" field r=gerv a=LpSolit --- extensions/MoreBugUrl/Extension.pm | 1 + extensions/MoreBugUrl/lib/PHP.pm | 40 ++++++++++++++++++++++ .../user-error-bug_url_invalid_tracker.html.tmpl | 1 + 3 files changed, 42 insertions(+) create mode 100644 extensions/MoreBugUrl/lib/PHP.pm diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm index 03a5ab608..52b6e61c3 100644 --- a/extensions/MoreBugUrl/Extension.pm +++ b/extensions/MoreBugUrl/Extension.pm @@ -14,6 +14,7 @@ use constant MORE_SUB_CLASSES => qw( Bugzilla::Extension::MoreBugUrl::Rietveld Bugzilla::Extension::MoreBugUrl::RT Bugzilla::Extension::MoreBugUrl::GetSatisfaction + Bugzilla::Extension::MoreBugUrl::PHP ); # We need to update bug_see_also table because both diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm new file mode 100644 index 000000000..c8d4e1689 --- /dev/null +++ b/extensions/MoreBugUrl/lib/PHP.pm @@ -0,0 +1,40 @@ +# 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::Extension::MoreBugUrl::PHP; +use strict; +use base qw(Bugzilla::BugUrl); + +############################### +#### Methods #### +############################### + +sub should_handle { + my ($class, $uri) = @_; + + # PHP Bug URLs have only one form: + # https://bugs.php.net/bug.php?id=1234 + return ($uri->authority =~ /^bugs.php.net$/i + and $uri->path =~ m|/bug.php$| + and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0; +} + +sub _check_value { + my $class = shift; + + my $uri = $class->SUPER::_check_value(@_); + + # PHP Bug URLs redirect to HTTPS, so just use the HTTPS scheme. + $uri->scheme('https'); + + # And remove any # part if there is one. + $uri->fragment(undef); + + return $uri; +} + +1; diff --git a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl index 60d662034..7683e4299 100644 --- a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl +++ b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl @@ -10,3 +10,4 @@
  • An issue in a Rietveld installation.
  • A ticket in an RT installation.
  • A topic on getsatisfaction.com.
  • +
  • A b[% %]ug on b[% %]ugs.php.net.
  • -- cgit v1.2.3-24-g4f1b