Merged revisions 2095-2129 which contain bugfixes from stable branch.

tbrehm

2010-11-24 9f56bd96367f7f3cfa295f23b9129a7dfa1f21af

 install/update.php

@@ -308,7 +308,7 @@
$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', $ispconfig_port_number);

// $ispconfig_ssl_default = (is_ispconfig_ssl_enabled() == true)?'y':'n';
if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('y','n'),'n')) == 'y') {
if(strtolower($inst->simple_query('Create new ISPConfig SSL certificate',array('yes','no'),'no')) == 'yes') {
   $inst->make_ispconfig_ssl_cert();
}