Fixed some warnings in the installer.

tbrehm

2011-07-25 ed30c60150ffda0301eb1f8d30c93cac94de41df

 install/lib/installer_base.lib.php

@@ -122,7 +122,7 @@
      if(is_installed('getmail')) $conf['getmail']['installed'] = true;
      if(is_installed('courierlogger')) $conf['courier']['installed'] = true;
      if(is_installed('dovecot')) $conf['dovecot']['installed'] = true;
      if(is_installed('saslsauthd')) $conf['saslauthd']['installed'] = true;
      if(is_installed('saslauthd')) $conf['saslauthd']['installed'] = true;
      if(is_installed('amavisd-new')) $conf['amavis']['installed'] = true;
      if(is_installed('clamdscan')) $conf['clamav']['installed'] = true;
      if(is_installed('pure-ftpd') || is_installed('pure-ftpd-wrapper')) $conf['pureftpd']['installed'] = true;
@@ -133,6 +133,7 @@
      if(is_installed('squid')) $conf['squid']['installed'] = true;
      if(is_installed('nginx')) $conf['nginx']['installed'] = true;
      if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
      if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
      if(is_dir("/etc/Bastille")) $conf['bastille']['installed'] = true;
      
      if ($conf['services']['web'] && $conf['apache']['installed'] && is_file($conf['apache']["vhost_conf_enabled_dir"]."/000-ispconfig.vhost")) $this->ispconfig_interface_installed = true;
@@ -522,9 +523,9 @@
      $lines = explode("\n", $old_file); 
      foreach ($lines as $line)
      {
         if (strlen($line) && substr($line, 0, 1) != '#')
         if (trim($line) != '' && substr($line, 0, 1) != '#')
         {
            list($key, $value) = explode("=", $line);
            @list($key, $value) = @explode("=", $line);
            if (!empty($value))
            {
               $key = rtrim($key);
@@ -539,6 +540,7 @@
         // create virtual_domains list
         $domainAll = $this->db->queryAllRecords("SELECT domain FROM mail_mailinglist GROUP BY domain");
         
         if(is_array($domainAll)) {
         foreach($domainAll as $domain)
         {
            if ($domainAll[0]['domain'] == $domain['domain'])
@@ -546,11 +548,13 @@
            else
               $virtual_domains .= ", '".$domain['domain']."'";
         }
         }
      }
      else
         $virtual_domains = "' '";
         
      $content = str_replace('{hostname}', $conf['hostname'], $content);
      if(!isset($old_options['DEFAULT_SERVER_LANGUAGE'])) $old_options['DEFAULT_SERVER_LANGUAGE'] = ''
      $content = str_replace('{default_language}', $old_options['DEFAULT_SERVER_LANGUAGE'], $content);
      $content = str_replace('{virtual_domains}', $virtual_domains, $content);

@@ -1898,4 +1902,4 @@
   }
}

?>
?>