- ported some patches

Marius Cramer

2015-04-15 d5f2d5f5504572a9c62aadbfc6f780bb08e1e156

 interface/web/sites/web_vhost_domain_edit.php

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