Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,309...

tbrehm

2012-05-10 e94a9fb5e4b6a2bc07e0bb4cf8ea35fc70c4bbf0

 server/plugins-available/firewall_plugin.inc.php

@@ -38,7 +38,11 @@
   function onInstall() {
      global $conf;
      
      return true;
      if($conf['bastille']['installed'] = true && $conf['services']['firewall'] == true) {
         return true;
      } else {
         return false;
      }
      
   }