Added a function to merge language files.

tbrehm

2008-09-21 8dd29e227f44e2379a0a72a4f60130b24e54a14b

 server/plugins-available/firewall_plugin.inc.php

@@ -102,7 +102,7 @@
         $app->log('Restarting the firewall',LOGLEVEL_DEBUG);
      } else {
         exec('/etc/init.d/bastille-firewall stop');
         if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall remove');
         if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
         $app->log('Stopping the firewall',LOGLEVEL_DEBUG);
      }
      
@@ -113,7 +113,7 @@
      global $app, $conf;
      
      exec('/etc/init.d/bastille-firewall stop');
      if(@is_file('/etc/debian_version')) exec('update-rc.d bastille-firewall remove');
      if(@is_file('/etc/debian_version')) exec('update-rc.d -f bastille-firewall remove');
      $app->log('Stopping the firewall',LOGLEVEL_DEBUG);
      
   }