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

Florian Schaal

2015-06-05 dadfb45a9a29e239ff722e6d8e91c75f76c314b8

 interface/web/sites/web_vhost_domain_edit.php

@@ -693,6 +693,10 @@
            $domain_select .= "<option value=''></option>\r\n";
         }
         $app->tpl->setVar("domain_option", $domain_select);
      } else {

         // remove the parent domain part of the domain name before we show it in the text field.
         if($this->dataRecord["type"] == 'vhostsubdomain') $this->dataRecord["domain"] = str_replace('.'.$parent_domain["domain"], '', $this->dataRecord["domain"]);
      }
      if($this->_vhostdomain_type != 'domain') $app->tpl->setVar("domain", $this->dataRecord["domain"]);

@@ -719,6 +723,10 @@
         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);
      }

      $sys_config = $app->getconf->get_global_config('misc');
      if($sys_config['use_combobox'] == 'y') {
         $app->tpl->setVar('use_combobox', 'y');
      }
      parent::onShowEnd();
   }

@@ -1083,6 +1091,7 @@
      if($web_config['enable_spdy'] === 'n') {
         unset($app->tform->formDef["tabs"]['ssl']['fields']['enable_spdy']);
      }
      if($this->dataRecord["directive_snippets_id"] < 1) $this->dataRecord["enable_pagespeed"] = 'n';

      parent::onSubmit();
   }