Implemented: FS#539 - ssl domain must be selectable

tbrehm

2009-10-27 3764dc4ad0b85b25cfe1247f68c5df00a2f0445d

Implemented: FS#539 - ssl domain must be selectable

 install/sql/ispconfig3.sql

@@ -1022,6 +1022,7 @@
  `ssl_organisation` varchar(255) NULL,
  `ssl_organisation_unit` varchar(255) NULL,
  `ssl_country` varchar(255) NULL,
  `ssl_domain` varchar(255) NULL,
  `ssl_request` mediumtext NULL,
  `ssl_cert` mediumtext NULL,
  `ssl_bundle` mediumtext NULL,

 interface/web/sites/form/web_domain.tform.php

@@ -286,6 +286,14 @@
            'width'        => '2',
            'maxlength'    => '2'
        ),
        'ssl_domain' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'default'    => '',
            'value'        => '',
            'width'        => '30',
            'maxlength'    => '255'
        ),
        'ssl_request' => array (
            'datatype'    => 'TEXT',
            'formtype'    => 'TEXTAREA',

 interface/web/sites/lib/lang/en_web_domain.lng

@@ -8,6 +8,7 @@
$wb["ssl_cert_txt"] = 'SSL Certificate';

$wb["ssl_bundle_txt"] = 'SSL Bundle';

$wb["ssl_action_txt"] = 'SSL Action';

$wb["ssl_domain_txt"] = 'SSL Domain';
$wb["server_id_txt"] = 'Server';

$wb["domain_txt"] = 'Domain';

$wb["type_txt"] = 'Type';


 interface/web/sites/templates/web_domain_ssl.htm

@@ -26,6 +26,12 @@
        <input name="ssl_country" id="ssl_country" value="{tmpl_var name='ssl_country'}" size="2" maxlength="2" type="text" class="textInput" />

            </div>

      <div class="ctrlHolder">

          <label for="client_group_id">{tmpl_var name='ssl_domain_txt'}</label>
        <select name="ssl_domain" id="ssl_domain" class="selectInput">
                    {tmpl_var name='ssl_domain'}
                </select>
      </div>
      <div class="ctrlHolder">
          <label for="ssl_request">{tmpl_var name='ssl_request_txt'}</label>

        <textarea name="ssl_request" id="ssl_request" rows='10' cols='30'>{tmpl_var name='ssl_request'}</textarea>

      </div>


 interface/web/sites/web_domain_edit.php

@@ -179,6 +179,19 @@
            
        }
        
        $ssl_domain_select = '';
        $ssl_domains = array($this->dataRecord["domain"],'www.'.$this->dataRecord["domain"]);
        if(is_array($ssl_domains)) {
            foreach( $ssl_domains as $ssl_domain) {
                $selected = ($ssl_domain == $this->dataRecord['ssl_domain'])?'SELECTED':'';
                $ssl_domain_select .= "<option value='$ssl_domain' $selected>$ssl_domain</option>\r\n";
            }
        }
        $app->tpl->setVar("ssl_domain",$ssl_domain_select);
        unset($ssl_domain_select);
        unset($ssl_domains);
        unset($ssl_domain);
		
        if($this->id > 0) {
            //* we are editing a existing record
            $app->tpl->setVar("edit_disabled", 1);

 server/plugins-available/apache2_plugin.inc.php

@@ -83,7 +83,7 @@
        
        if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
        $ssl_dir = $data["new"]["document_root"]."/ssl";
        $domain = $data["new"]["domain"];
        $domain = $data["new"]["ssl_domain"];
        $key_file = $ssl_dir.'/'.$domain.".key.org";
          $key_file2 = $ssl_dir.'/'.$domain.".key";
          $csr_file = $ssl_dir.'/'.$domain.".csr";