Skip to content

Commit e0280fd

Browse files
author
Pascal Dreissen
committed
Only show rewrite http->https when SSL is enabled and active
1 parent 086c5b0 commit e0280fd

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

interface/web/sites/templates/web_vhost_domain_redirect.htm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ <h1><tmpl_var name="list_head_txt"></h1>
3434
<div class="col-sm-9"><textarea class="form-control" name="rewrite_rules" id="rewrite_rules" rows='10' cols='50'>{tmpl_var name='rewrite_rules'}</textarea>
3535
<b>{tmpl_var name="allowed_rewrite_rule_directives_txt"}</b>&nbsp;break&nbsp;if&nbsp;return&nbsp;rewrite&nbsp;set<br />&nbsp;<a href="http://wiki.nginx.org/HttpRewriteModule" target="_blank">http://wiki.nginx.org/HttpRewriteModule</a></div>
3636
</div>
37+
<tmpl_if name="is_ssl_enabled" op="==" value="y">
3738
<div class="form-group">
3839
<label class="col-sm-3 control-label">{tmpl_var name='rewrite_to_https_txt'}</label>
3940
<div class="col-sm-9">
4041
{tmpl_var name="rewrite_to_https"}
4142
</div>
4243
</div>
43-
44+
</tmpl_if>
4445

4546
<input type="hidden" name="id" value="{tmpl_var name='id'}">
4647

interface/web/sites/web_vhost_domain_edit.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,7 @@ function onShowEnd() {
835835
$tmp_sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ?", intval($tmp_web['sys_groupid']));
836836
if(intval($tmp_sys_group['client_id']) > 0) $tmp_client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", intval($tmp_sys_group['client_id']));
837837
if(is_array($tmp_client) && !empty($tmp_client) && trim($this->dataRecord['ssl_organisation']) == '' && trim($this->dataRecord['ssl_locality']) == '' && trim($this->dataRecord['ssl_state']) == '' && trim($this->dataRecord['ssl_organisation_unit']) == '') $app->tpl->setVar("show_helper_links", true);
838+
$app->tpl->setVar('is_ssl_enabled', $tmp_web['ssl']);
838839
}
839840

840841
$sys_config = $app->getconf->get_global_config('misc');

0 commit comments

Comments
 (0)