Skip to content

Commit 7c57f78

Browse files
committed
Merge branch 'feature/add_spdy_option' into 'master'
Option Enable Spdy checks if spdy is enabled on server configuration See merge request !144
2 parents 256e08f + dcf94eb commit 7c57f78

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

interface/web/sites/templates/web_vhost_domain_ssl.htm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,14 @@ <h2><tmpl_var name="list_head_txt"></h2>
6464
{tmpl_var name='ssl_action'}
6565
</select>
6666
</div>
67+
{tmpl_if name="is_spdy_enabled"}
6768
<div class="ctrlHolder">
6869
<p class="label">{tmpl_var name='enable_spdy_txt'}</p>
6970
<div class="multiField">
7071
{tmpl_var name="enable_spdy"}
7172
</div>
7273
</div>
74+
{/tmpl_if}
7375
</fieldset>
7476

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

interface/web/sites/web_vhost_domain_edit.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,8 @@ function onShowEnd() {
699699

700700
$app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
701701

702+
$app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
703+
702704
parent::onShowEnd();
703705
}
704706

@@ -1068,6 +1070,10 @@ function onSubmit() {
10681070
}
10691071
}
10701072

1073+
if($web_config['enable_spdy'] === 'n') {
1074+
unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
1075+
}
1076+
10711077
parent::onSubmit();
10721078
}
10731079

0 commit comments

Comments
 (0)