Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

 install/update.php

@@ -120,6 +120,10 @@
      include_once $cmd_opt['autoinstall'];
   } elseif($path_parts['extension'] == 'ini') {
      $tmp = ini_to_array(file_get_contents('autoinstall.ini'));
      if(!is_array($tmp['install'])) $tmp['install'] = array();
      if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
      if(!is_array($tmp['expert'])) $tmp['expert'] = array();
      if(!is_array($tmp['update'])) $tmp['update'] = array();
      $autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
      unset($tmp);
   }
@@ -170,10 +174,8 @@
$conf['ispconfig_log_priority'] = $conf_old["log_priority"];

$inst = new installer();
if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
$inst->is_update = true;

//** Detect the installed applications
$inst->find_installed_apps();

echo "This application will update ISPConfig 3 on your server.\n\n";

@@ -299,6 +301,18 @@
}
//}

//** Detect the installed applications
$inst->find_installed_apps();

$conf['services']['mail'] = $conf['postfix']['installed'];
if ($conf['powerdns']['installed'] || $conf['bind']['installed'] || $conf['mydns']['installed']) $conf['services']['dns'] = true;
if ($conf['apache']['installed'] || $conf['nginx']['installed']) $conf['services']['web'] = true;
$conf['services']['xmpp'] =  $conf['xmpp']['installed'];;
if ($conf['ufw']['installed'] || $conf['firewall']['installed']) $conf['services']['firewall'] = true;
$conf['services']['vserver'] = $conf['services']['vserver'];
$conf['services']['db'] = true;


//** Shall the services be reconfigured during update
$reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services');

@@ -316,12 +330,6 @@
      if($conf['mailman']['installed'] == true && $inst->reconfigure_app('Mailman', $reconfigure_services_answer)) {
         swriteln('Configuring Mailman');
         $inst->configure_mailman('update');
      }

      //* Configure Jailkit
      if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
         swriteln('Configuring Jailkit');
         $inst->configure_jailkit();
      }

      if($conf['dovecot']['installed'] == true && $inst->reconfigure_app('Dovecot', $reconfigure_services_answer)) {
@@ -402,6 +410,13 @@
         swriteln('Configuring Apps vhost');
         $inst->configure_apps_vhost();
         }
	
         //* Configure Jailkit
         if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
            swriteln('Configuring Jailkit');
            $inst->configure_jailkit();
         }

      }

    if($conf['services']['xmpp'] && $inst->reconfigure_app('XMPP', $reconfigure_services_answer)) {