removed useless br tags

xaver

2011-09-15 3504abec909c06cd42eaa32fced7a350c8b3e925

 install/lib/installer_base.lib.php

@@ -717,10 +717,10 @@
      }

      //* Chmod and chown the .mailfilter file
      $command = 'chown -R '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';
      $command = 'chown '.$cf['vmail_username'].':'.$cf['vmail_groupname'].' '.$cf['vmail_mailbox_base'].'/.mailfilter';
      caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

      $command = 'chmod -R 600 '.$cf['vmail_mailbox_base'].'/.mailfilter';
      $command = 'chmod 600 '.$cf['vmail_mailbox_base'].'/.mailfilter';
      caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

   }
@@ -909,10 +909,19 @@


      // Adding the amavisd commands to the postfix configuration
      $postconf_commands = array (
            'content_filter = amavis:[127.0.0.1]:10024',
            'receive_override_options = no_address_mappings'
      );
      // Add array for no error in foreach and maybe future options
      $postconf_commands = array ();
		
      // Check for amavisd -> pure webserver with postfix for mailing without antispam
      // Check for different names
      system('which amavisd-new', $retval); // Debian, Ubuntu, ?
      if ($retval !== 0){
         system('which amavisd', $retval); // CentOS
      }
      if ($retval === 0) {
         $postconf_commands[] = 'content_filter = amavis:[127.0.0.1]:10024';
         $postconf_commands[] = 'receive_override_options = no_address_mappings';
      }

      // Make a backup copy of the main.cf file
      copy($conf['postfix']['config_dir'].'/main.cf',$conf['postfix']['config_dir'].'/main.cf~2');