diff options
| author |   mkanat%bugzilla.org <> | 2006-07-25 04:43:35 +0000 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2006-07-25 04:43:35 +0000 |
| commit | bea873a66d06670af744b29d9e8d357ae3b5ceed (patch) | |
| tree | e02d78a0cc4cdec66d7f5624cf91b35f6346913e /Bugzilla/Util.pm | |
| parent | Bug 344282: Require DBI 1.41+ for DBD::Pg 1.45 (diff) | |
| download | bugzilla-bea873a66d06670af744b29d9e8d357ae3b5ceed.tar.gz bugzilla-bea873a66d06670af744b29d9e8d357ae3b5ceed.tar.bz2 bugzilla-bea873a66d06670af744b29d9e8d357ae3b5ceed.zip | |
Bug 344527: Old Charts are broken using mod_perl
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=justdave
Diffstat (limited to 'Bugzilla/Util.pm')
| -rw-r--r-- | Bugzilla/Util.pm | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index c5cfc0444..24debb1d6 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -34,7 +34,7 @@ use base qw(Exporter); detaint_signed html_quote url_quote value_quote xml_quote css_class_quote - i_am_cgi get_netaddr + i_am_cgi get_netaddr correct_urlbase lsearch diff_arrays diff_strings trim wrap_comment find_wrap_point @@ -146,6 +146,22 @@ sub i_am_cgi { return exists $ENV{'SERVER_SOFTWARE'} ? 1 : 0; } +sub correct_urlbase { + my $ssl = Bugzilla->params->{'ssl'}; + return Bugzilla->params->{'urlbase'} if $ssl eq 'never'; + + my $sslbase = Bugzilla->params->{'sslbase'}; + if ($sslbase) { + return $sslbase if $ssl eq 'always'; + # Authenticated Sessions + return $sslbase if Bugzilla->user->id; + } + + # Set to "authenticated sessions" but nobody's logged in, or + # sslbase isn't set. + return Bugzilla->params->{'urlbase'}; +} + sub lsearch { my ($list,$item) = (@_); my $count = 0; @@ -429,8 +445,9 @@ Bugzilla::Util - Generic utility functions for bugzilla $rv = url_decode($var); # Functions that tell you about your environment - my $is_cgi = i_am_cgi(); - $net_addr = get_netaddr($ip_addr); + my $is_cgi = i_am_cgi(); + my $net_addr = get_netaddr($ip_addr); + my $urlbase = correct_urlbase(); # Functions for searching $loc = lsearch(\@arr, $val); @@ -565,6 +582,11 @@ C<Bugzilla->params->{'loginnetmask'}> as the netmask. This can be used to obtain data in order to restrict weak authentication methods (such as cookies) to only some addresses. +=item C<correct_urlbase()> + +Returns either the C<sslbase> or C<urlbase> parameter, depending on the +current setting for the C<ssl> parameter. + =back =head2 Searching |