diff options
| -rw-r--r-- | Bugzilla/BugUrl/Debian.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/BugUrl/GitHub.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/BugUrl/Google.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/BugUrl/Launchpad.pm | 2 | ||||
| -rw-r--r-- | Bugzilla/BugUrl/SourceForge.pm | 2 | ||||
| -rw-r--r-- | extensions/MoreBugUrl/lib/GetSatisfaction.pm | 2 | ||||
| -rw-r--r-- | extensions/MoreBugUrl/lib/PHP.pm | 4 | ||||
| -rw-r--r-- | extensions/MoreBugUrl/lib/RT.pm | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/Bugzilla/BugUrl/Debian.pm b/Bugzilla/BugUrl/Debian.pm index 7ab8bf173..97ad4b545 100644 --- a/Bugzilla/BugUrl/Debian.pm +++ b/Bugzilla/BugUrl/Debian.pm @@ -22,7 +22,7 @@ sub should_handle { # Debian BTS URLs can look like various things: # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234 # http://bugs.debian.org/1234 - return ($uri->authority =~ /^bugs.debian.org$/i + return (lc($uri->authority) eq 'bugs.debian.org' and (($uri->path =~ /bugreport\.cgi$/ and $uri->query_param('bug') =~ m|^\d+$|) or $uri->path =~ m|^/\d+$|)) ? 1 : 0; diff --git a/Bugzilla/BugUrl/GitHub.pm b/Bugzilla/BugUrl/GitHub.pm index dbcaf655f..2c35bfb08 100644 --- a/Bugzilla/BugUrl/GitHub.pm +++ b/Bugzilla/BugUrl/GitHub.pm @@ -21,7 +21,7 @@ sub should_handle { # GitHub issue URLs have only one form: # https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/issues/111 - return ($uri->authority =~ /^github.com$/i + return (lc($uri->authority) eq 'github.com' and $uri->path =~ m|^/[^/]+/[^/]+/issues/\d+$|) ? 1 : 0; } diff --git a/Bugzilla/BugUrl/Google.pm b/Bugzilla/BugUrl/Google.pm index eb9aa88f2..dd9ab7ff4 100644 --- a/Bugzilla/BugUrl/Google.pm +++ b/Bugzilla/BugUrl/Google.pm @@ -21,7 +21,7 @@ sub should_handle { # Google Code URLs only have one form: # http(s)://code.google.com/p/PROJECT_NAME/issues/detail?id=1234 - return ($uri->authority =~ /^code.google.com$/i + return (lc($uri->authority) eq 'code.google.com' and $uri->path =~ m|^/p/[^/]+/issues/detail$| and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0; } diff --git a/Bugzilla/BugUrl/Launchpad.pm b/Bugzilla/BugUrl/Launchpad.pm index 43c5c57d9..3409cbe19 100644 --- a/Bugzilla/BugUrl/Launchpad.pm +++ b/Bugzilla/BugUrl/Launchpad.pm @@ -23,7 +23,7 @@ sub should_handle { # https://bugs.launchpad.net/ubuntu/+bug/1234 # https://launchpad.net/bugs/1234 # All variations end with either "/bugs/1234" or "/+bug/1234" - return ($uri->authority =~ /launchpad.net$/ + return ($uri->authority =~ /launchpad\.net$/ and $uri->path =~ m|bugs?/\d+$|) ? 1 : 0; } diff --git a/Bugzilla/BugUrl/SourceForge.pm b/Bugzilla/BugUrl/SourceForge.pm index 90a7ca6a5..630b97d7a 100644 --- a/Bugzilla/BugUrl/SourceForge.pm +++ b/Bugzilla/BugUrl/SourceForge.pm @@ -21,7 +21,7 @@ sub should_handle { # SourceForge tracker URLs have only one form: # http://sourceforge.net/tracker/?func=detail&aid=111&group_id=111&atid=111 - return ($uri->authority =~ /^sourceforge.net$/i + return (lc($uri->authority) eq 'sourceforge.net' and $uri->path =~ m|/tracker/| and $uri->query_param('func') eq 'detail' and $uri->query_param('aid') diff --git a/extensions/MoreBugUrl/lib/GetSatisfaction.pm b/extensions/MoreBugUrl/lib/GetSatisfaction.pm index 4c077b1a6..75d5ece39 100644 --- a/extensions/MoreBugUrl/lib/GetSatisfaction.pm +++ b/extensions/MoreBugUrl/lib/GetSatisfaction.pm @@ -20,7 +20,7 @@ sub should_handle { # GetSatisfaction URLs only have one form: # http(s)://getsatisfaction.com/PROJECT_NAME/topics/TOPIC_NAME - return ($uri->authority =~ /^getsatisfaction.com$/i + return (lc($uri->authority) eq 'getsatisfaction.com' and $uri->path =~ m|^/[^/]+/topics/[^/]+$|) ? 1 : 0; } diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm index 1521cae1a..ea090e865 100644 --- a/extensions/MoreBugUrl/lib/PHP.pm +++ b/extensions/MoreBugUrl/lib/PHP.pm @@ -20,8 +20,8 @@ sub should_handle { # 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$| + return (lc($uri->authority) eq 'bugs.php.net' + and $uri->path =~ m|/bug\.php$| and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0; } diff --git a/extensions/MoreBugUrl/lib/RT.pm b/extensions/MoreBugUrl/lib/RT.pm index 724456828..a1ca6fd88 100644 --- a/extensions/MoreBugUrl/lib/RT.pm +++ b/extensions/MoreBugUrl/lib/RT.pm @@ -21,7 +21,7 @@ sub should_handle { # RT URLs can look like various things: # http://example.com/rt/Ticket/Display.html?id=1234 # https://example.com/Public/Bug/Display.html?id=1234 - return ($uri->path =~ m|/Display.html$| + return ($uri->path =~ m|/Display\.html$| and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0; } |