Fixed a warning in maildrop plugin.

tbrehm

2011-09-07 c719dc0b1dd696e0cd6b51f09ee13c8263375f7c

 install/autoupdate.php

@@ -77,9 +77,9 @@
$conf_old = $conf;
unset($conf);

if($dist['id'] == '') die('Linux Dustribution or Version not recognized.');
if($dist['id'] == '') die('Linux distribution or version not recognized.');

//** Include the distribution specific installer class library and configuration
//** Include the distribution-specific installer class library and configuration
if(is_file('dist/lib/'.$dist['baseid'].'.lib.php')) include_once('dist/lib/'.$dist['baseid'].'.lib.php');
include_once('dist/lib/'.$dist['id'].'.lib.php');
include_once('dist/conf/'.$dist['id'].'.conf.php');
@@ -128,7 +128,7 @@

/*
 * Try to read the DB-admin settings
*/
 */
$clientdb_host         = '';
$clientdb_user         = '';
$clientdb_password      = '';
@@ -143,6 +143,11 @@
if( empty($conf["mysql"]["admin_password"]) ) {
   die("internal error - MYSQL-Root passord not known");
}

/*
 *  Check all tables
*/
checkDbHealth();

/*
 *  Prepare the dump of the database 
@@ -169,21 +174,25 @@
 * If it is NOT a master-slave - Setup then we are at the Master-DB. So set all rights
*/
if($conf['mysql']['master_slave_setup'] != 'y') {
   $inst->grant_master_database_rights();
   $inst->grant_master_database_rights(true);
}

/*
 *  dump the new Database and reconfigure the server.ini
*/
 */
updateDbAndIni();

/*
 * Reconfigure all Services
*/
 */
if($conf['services']['mail'] == true) {
   //** Configure postfix
   swriteln('Configuring Postfix');
   $inst->configure_postfix('dont-create-certs');
	
   //** Configure mailman
   swriteln('Configuring Mailman');
   $inst->configure_mailman('update');

   //* Configure Jailkit
   swriteln('Configuring Jailkit');
@@ -271,7 +280,7 @@


//** Customise the port ISPConfig runs on
$conf['apache']['vhost_port'] = '8080';
$conf['apache']['vhost_port'] = get_ispconfig_port_number();

$inst->install_ispconfig();

@@ -281,7 +290,7 @@

//** Restart services:
swriteln('Restarting services ...');
if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' restart');
if($conf['mysql']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mysql']['init_script']))               system($conf['init_scripts'].'/'.$conf['mysql']['init_script'].' reload');
if($conf['services']['mail']) {
   if($conf['postfix']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['postfix']['init_script']))            system($conf['init_scripts'].'/'.$conf['postfix']['init_script'].' restart');
   if($conf['saslauthd']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['saslauthd']['init_script']))         system($conf['init_scripts'].'/'.$conf['saslauthd']['init_script'].' restart');
@@ -293,6 +302,7 @@
   if($conf['courier']['courier-pop'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop']))             system($conf['init_scripts'].'/'.$conf['courier']['courier-pop'].' restart');
   if($conf['courier']['courier-pop-ssl'] != '' && is_executable($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl']))       system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart');
   if($conf['dovecot']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['dovecot']['init_script']))       system($conf['init_scripts'].'/'.$conf['dovecot']['init_script'].' restart');
   if($conf['mailman']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['mailman']['init_script']))       system($conf['init_scripts'].'/'.$conf['mailman']['init_script'].' restart');
}
if($conf['services']['web']) {
   if($conf['apache']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['apache']['init_script']))             system($conf['init_scripts'].'/'.$conf['apache']['init_script'].' restart');
@@ -306,4 +316,4 @@

echo "Update finished.\n";

?>
?>