Fixed: Module > Email > Email Mailbox > Mailfilter custom_mailfilter is mis...

tbrehm

2008-05-23 b658fe80a25ec780836e36214e21b57cd635eb95

 install/install.php

@@ -56,16 +56,16 @@
//** Include the base class of the installer class
require_once('lib/installer_base.lib.php');

include_once('options.conf.php');
//** Get distribution identifier
$distname = get_distname();

if($distname == '') die('Linux Dustribution or Version not recognized.');

//** Include the distribution specific installer class library and configuration
include_once('dist/lib/'.$conf['distname'].'.lib.php');
include_once('dist/conf/'.$conf['distname'].'.conf.php');
include_once('dist/lib/'.$distname.'.lib.php');
include_once('dist/conf/'.$distname.'.conf.php');

//TODO: this is not there ????
$conf['dist'] = $dist;

//** Install logfile
define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');

//****************************************************************************************************
@@ -77,8 +77,12 @@
swriteln($inst->lng('    Tap in "quit" (without the quotes) to stop the installer.'."\n\n"));

//** Check log file is writable (probably not root or sudo)
if(!is_writable(ISPC_LOG_FILE)){
    die("ERROR: Cannot write to the log file '".ISPC_LOG_FILE."'. Are you root or sudo ?\n\n");
if(!is_writable(dirname(ISPC_LOG_FILE))){
    die("ERROR: Cannot write to the directory ".dirname(ISPC_LOG_FILE).". Are you root or sudo ?\n\n");
}

if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) {
   die('This software can not be installed on a server wich runs ISPConfig 2.x.');
}

//** Select the language
@@ -91,7 +95,7 @@
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
$conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
$inst->conf['hostname'] = $inst->free_query('Full qualified hostname (FQDN) of the server, eg foo.example.com ', $tmp_out[0]);
unset($tmp_out);

//** Get MySQL root credentials
@@ -124,6 +128,9 @@
   
   //* Create the mysql database
   $inst->configure_database();
	
   //* Insert the Server record into the database
   $inst->add_database_server_record();

   //* Configure postfix
   $inst->configure_postfix();
@@ -174,29 +181,33 @@
   $inst->install_crontab();
   
   swriteln('Restarting services ...');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['mysql']['init_script'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['postfix']['init_script'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['amavis']['init_script'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['clamav']['init_script'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['apache']['init_script'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
   system($conf['dist']['init_scripts'].'/'.$conf['dist']['mydns']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
   
}else{

   //** Get Server ID
   $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
   // $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
   // Server ID is an autoInc value of the mysql database now
   
   if(strtolower($inst->simple_query('Create Database',array('y','n'),'y')) == 'y') {
      //* Create the mysql database
      $inst->configure_database();
      system('/etc/init.d/mysql restart');
		
      //* Insert the Server record into the database
      $inst->add_database_server_record();
   }
   
   if(strtolower($inst->simple_query('Configure Mail', array('y','n') ,'y') ) == 'y') {
@@ -225,29 +236,29 @@
      swriteln('Configuring Getmail');
      $inst->configure_getmail();
      
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['postfix']['init_script'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['saslauthd']['init_script'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['amavis']['init_script'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['clamav']['init_script'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-authdaemon'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-imap-ssl'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop'].' restart');
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['courier']['courier-pop-ssl'].' restart');
      system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
      system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
      system($conf['init_scripts'].'/'.$conf['amavis']['init_script'].' restart');
      system($conf['init_scripts'].'/'.$conf['clamav']['init_script'].' restart');
      system($conf['init_scripts'].'/'.$conf['courier']['courier-authdaemon'].' restart');
      system($conf['init_scripts'].'/'.$conf['courier']['courier-imap'].' restart');
      system($conf['init_scripts'].'/'.$conf['courier']['courier-imap-ssl'].' restart');
      system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
      system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   }
   
   //** Configure Pureftpd
   if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') {   
      swriteln('Configuring Pureftpd');
      $inst->configure_pureftpd();
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['pureftpd']['init_script'].' restart');
      system($conf['init_scripts'].'/'.$conf['pureftpd']['init_script'].' restart');
   }
   
   //** Configure MyDNS
   if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
      swriteln('Configuring MyDNS');
      $inst->configure_mydns();
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['mydns']['init_script'].' restart');
      system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart');
   }
   
   //** Configure Apache
@@ -264,7 +275,7 @@
      //* Configure ISPConfig
      swriteln('Installing Crontab');
      $inst->install_crontab();
      system($conf['dist']['init_scripts'].'/'.$conf['dist']['apache']['init_script'].' restart');	
      system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');	
   }
   
} //* << $install_mode / 'Standard' or Genius