diff options
| author | mkanat%bugzilla.org <> | 2009-10-09 06:31:08 +0200 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2009-10-09 06:31:08 +0200 |
| commit | 8ecb3ad6ecc8d636fb205895d736108cbc8083a1 (patch) | |
| tree | 69b5da83e47b1fc8481227f2ec46aba1261e84ad /template/en | |
| parent | 4671e0ffd9920d000fb6191999288ed12d4dac52 (diff) | |
| download | bugzilla-8ecb3ad6ecc8d636fb205895d736108cbc8083a1.tar.gz bugzilla-8ecb3ad6ecc8d636fb205895d736108cbc8083a1.tar.xz | |
Bug 514913: Eliminate ssl="authenticated sessions"
Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=dkl, a=mkanat
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/account/auth/login-small.html.tmpl | 7 | ||||
| -rw-r--r-- | template/en/default/admin/params/core.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 3 |
3 files changed, 9 insertions, 9 deletions
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 752aa64df..710d7d0a5 100644 --- a/template/en/default/account/auth/login-small.html.tmpl +++ b/template/en/default/account/auth/login-small.html.tmpl @@ -28,12 +28,7 @@ [% login_target = "index.cgi" %] [% END %] -[%# If SSL is in use, use 'sslbase', else use 'urlbase'. %] -[% IF Param("sslbase") != "" && Param("ssl") != "never" %] - [% login_target = Param("sslbase") _ login_target %] -[% ELSE %] - [% login_target = Param("urlbase") _ login_target %] -[% END %] +[% login_target = urlbase _ login_target %] <li id="mini_login_container[% qs_suffix %]"> <span class="separator">| </span> diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl index d66c4a51b..b65dde233 100644 --- a/template/en/default/admin/params/core.html.tmpl +++ b/template/en/default/admin/params/core.html.tmpl @@ -42,8 +42,12 @@ sslbase => "The URL that is the common initial leading part of all HTTPS " _ "(SSL) $terms.Bugzilla URLs.", - ssl => "Controls when $terms.Bugzilla should enforce sessions to use HTTPS by " _ - "using <tt>sslbase</tt>.", + ssl_redirect => + "When this is enabled, $terms.Bugzilla will ensure that every page is" + _ " accessed over SSL, by redirecting any plain HTTP requests to HTTPS" + _ " using the <tt>sslbase</tt> parameter. Also, when this is enabled," + _ " $terms.Bugzilla will send out links using <tt>sslbase</tt> in emails" + _ " instead of <tt>urlbase</tt>.", cookiedomain => "The domain for $terms.Bugzilla cookies. Normally blank. " _ "If your website is at 'www.foo.com', setting this to " _ diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 76ca259e5..d5a345182 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -277,7 +277,8 @@ <legend>Note</legend> <p> You need to - <a href="[% IF Param('ssl') != 'never' %][% Param('sslbase') %][% END %]show_bug.cgi?id=[% bug.bug_id %]&GoAheadAndLogIn=1">log in</a> + <a href="show_bug.cgi?id= + [%- bug.bug_id %]&GoAheadAndLogIn=1">log in</a> before you can comment on or make changes to this [% terms.bug %]. </p> </fieldset> |