Fixed: FS#1714 - Email autoresponder eliminates <newline>

tbrehm

2011-09-06 2b81b8f6a61d1b3cd65e89292d82568f20e798a2

 install/install.php

@@ -200,7 +200,6 @@
   swriteln('Configuring Getmail');
   $inst->configure_getmail();
   

   //* Configure Pureftpd
   swriteln('Configuring Pureftpd');
   $inst->configure_pureftpd();
@@ -230,20 +229,24 @@
   $inst->configure_apps_vhost();
    
   //* Configure Firewall
   //swriteln('Configuring Firewall');
   //$inst->configure_firewall();
   //** Configure Firewall   
   if($conf['bastille']['installed'] == true) {
   if($conf['ufw']['installed'] == true) {
      //* Configure UFW Firewall
      $conf['services']['firewall'] = true;
      swriteln('Configuring UFW Firewall');
      $inst->configure_ufw_firewall();
   } else {
      //* Configure Bastille Firewall
      $conf['services']['firewall'] = true;
      swriteln('Configuring Bastille Firewall');
      $inst->configure_firewall();
   } elseif($conf['ufw']['installed'] == true) {
      //* Configure Ubuntu Firewall
      $conf['services']['firewall'] = true;
      swriteln('Configuring Ubuntu Firewall');
      $inst->configure_ufw_firewall();
   }

    //* Configure Fail2ban
    if($conf['fail2ban']['installed'] == true) {
        swriteln('Configuring Fail2ban');
        $inst->configure_fail2ban();
    }
   
   if($conf['squid']['installed'] == true) {
      $conf['services']['proxy'] = true;
@@ -260,6 +263,10 @@
   
   //** Customize the port ISPConfig runs on
   $conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');

   if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface',array('y','n'),'y')) == 'y') {
     $inst->make_ispconfig_ssl_cert();
   }

   $inst->install_ispconfig();
   
@@ -544,4 +551,4 @@
echo "Installation completed.\n";


?>
?>