Falko Timme
2014-12-12 7c57f78468664a8a62b555798834b4cf5b5e9bef
Merge branch 'feature/add_spdy_option' into 'master'

Option Enable Spdy

checks if spdy is enabled on server configuration

See merge request !144
2 files modified
8 ■■■■■ changed files
interface/web/sites/templates/web_vhost_domain_ssl.htm 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 6 ●●●●● patch | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_ssl.htm
@@ -64,12 +64,14 @@
                    {tmpl_var name='ssl_action'}
                </select>
            </div>
            {tmpl_if name="is_spdy_enabled"}
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='enable_spdy_txt'}</p>
                <div class="multiField">
                    {tmpl_var name="enable_spdy"}
                </div>
            </div>
            {/tmpl_if}
        </fieldset>
        <input type="hidden" name="id" value="{tmpl_var name='id'}">
interface/web/sites/web_vhost_domain_edit.php
@@ -699,6 +699,8 @@
        
        $app->tpl->setVar('vhostdomain_type', $this->_vhostdomain_type);
        $app->tpl->setVar('is_spdy_enabled', ($web_config['enable_spdy'] === 'y'));
        parent::onShowEnd();
    }
@@ -1068,6 +1070,10 @@
            }
        }
        if($web_config['enable_spdy'] === 'n') {
            unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
        }
        parent::onSubmit();
    }