Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Florian Schaal

2014-12-14 a549793dccc43cbbd47b40fb339c1a1c37cbc6e6

 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();
   }