changed translations see: - http://git.ispconfig.org/panders/ispconfig3/com...

Patrick Anders

2014-12-11 fdda8edab91726a8199c1b52cb4f97abf82e4ed7

 install/update.php

@@ -342,8 +342,10 @@
      $inst->configure_spamassassin();

      //** Configure Amavis
      swriteln('Configuring Amavisd');
      $inst->configure_amavis();
      if($conf['amavis']['installed'] == true) {
         swriteln('Configuring Amavisd');
         $inst->configure_amavis();
      }

      //** Configure Getmail
      swriteln('Configuring Getmail');
@@ -397,10 +399,15 @@


   if($conf['services']['firewall']) {
      if($conf['bastille']['installed'] == true) {
      if($conf['ufw']['installed'] == true) {
         //* Configure Ubuntu Firewall
         $conf['services']['firewall'] = true;
         swriteln('Configuring Ubuntu Firewall');
         $inst->configure_ufw_firewall();
      } else {
         //* Configure Bastille Firewall
         swriteln('Configuring Bastille Firewall');
         $inst->configure_firewall();
         $inst->configure_bastille_firewall();
      }
   }

@@ -493,7 +500,7 @@
   }

   if($conf['services']['firewall']) {
      //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script']))     system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
      if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script']))     system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
   }
}