1.) Added final_*_destiny settings in amavisd_user_config.master to enable quarantining if wanted.

2.) Cleaned up update.php
3.) Changed definitions for quarantine settings
4.) Commented out areas for quarantining 'clean' and 'other' 

install/tpl/amavisd_user_config.master

@@ -40,6 +40,14 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
     ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k))' .
     ' ORDER BY spamfilter_wblist.priority DESC';
 
+#
+# Quarantine settings
+#
+
+$final_virus_destiny = D_BOUNCE;
+$final_spam_destiny = D_DISCARD;
+$final_banned_destiny = D_BOUNCE;
+$final_bad_header_destiny = D_DISCARD;
 
 #
 # Enable Logging

install/update.php

@@ -28,18 +28,17 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-/*
-	ISPConfig 3 installer.
-*/
+
+//** ISPConfig 3 installer.
 
 
-// Include the library with the basic installer functions
+//** Include the library with the basic installer functions
 require_once('lib/install.lib.php');
 
-// Include the base class of the installer class
+//** Include the base class of the installer class
 require_once('lib/installer_base.lib.php');
 
-//** Install logfile
+//** Installer/updater logfile
 define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log');
 
 //** Get distribution identifier
@@ -49,12 +48,11 @@ include_once("/usr/local/ispconfig/server/lib/config.inc.php");
 $conf_old = $conf;
 unset($conf);
 
-// Include the distribution specific installer class library
-// and configuration
+//** Include the distribution specific installer class library and configuration
 include_once('dist/lib/'.$distname.'.lib.php');
 include_once('dist/conf/'.$distname.'.conf.php');
 
-// Set the mysql login information
+//** Set the mysql login information
 $conf["mysql"]["host"] = $conf_old["db_host"];
 $conf["mysql"]["database"] = $conf_old["db_database"];
 $conf["mysql"]["ispconfig_user"] = $conf_old["db_user"];
@@ -62,24 +60,22 @@ $conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
 
 $inst = new installer();
 
-
 echo "This application will update ISPConfig 3 on your server.\n";
 
-// $conf["language"] = $inst->request_language();
-
-// TODO: all other queries, for testing I will setup everything in $conf
+//** TODO: all other queries, for testing I will setup everything in $conf
 
-// Initialize the MySQL server connection
+//** Initialize the MySQL server connection
 include_once('lib/mysql.lib.php');
 
-// Database update is a bit brute force and should be rebuild later ;)
+//** Database update is a bit brute force and should be rebuild later ;)
 
-// export the current database data
+//** Ask user for mysql admin_password if empty
 if( empty($conf["mysql"]["admin_password"]) ) {
 
 	$conf["mysql"]["admin_password"] = $inst->free_query('MySQL root password', $conf['mysql']['admin_password']);
 }
 
+//** export the current database data
 if( !empty($conf["mysql"]["admin_password"]) ) {
 
 	system("mysqldump -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." -c -t --add-drop-table --all --quick ".$conf['mysql']['database']." > existing_db.sql");
@@ -89,7 +85,7 @@ else {
 	system("mysqldump -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -c -t --add-drop-table --all --quick ".$conf['mysql']['database']." > existing_db.sql");
 }
 
-// Delete the old database
+//** Delete the old database
 $inst->db = new db();
 
 if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['mysql']['database']) ) {
@@ -97,81 +93,74 @@ if( !$inst->db->query('DROP DATABASE IF EXISTS '.$conf['mysql']['database']) ) {
 	$inst->error('Unable to drop MySQL database: '.$conf['mysql']['database'].'.');
 }
 
-
-/*exec("/etc/init.d/mysql stop");
-sleep(3);
-if($conf["mysql"]["database"] != '') exec("rm -rf /var/lib/mysql/".$conf["mysql"]["database"]);
-exec("/etc/init.d/mysql start");
-sleep(5);*/
-
-// Create the mysql database
+//** Create the mysql database
 $inst->configure_database();
 
-// empty all databases
+//** empty all databases
 $db_tables = $inst->db->getTables();
+
 foreach($db_tables as $table) {
+
 	$inst->db->query("TRUNCATE $table");
 }
 
-// load old data back into database
-if($conf["mysql"]["admin_password"] != '') {
+//** load old data back into database
+if( !empty($conf["mysql"]["admin_password"]) ) {
+
 	system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." -p".$conf['mysql']['admin_password']." ".$conf['mysql']['database']." < existing_db.sql");
 } else {
+
 	system("mysql -h ".$conf['mysql']['host']." -u ".$conf['mysql']['admin_user']." ".$conf['mysql']['database']." < existing_db.sql");
 }
-// Configure postfix
+
+//** Configure postfix
 $inst->configure_postfix('dont-create-certs');
 
-// Configure saslauthd
+//** Configure saslauthd
 swriteln('Configuring SASL');
 $inst->configure_saslauthd();
 
-
-// Configure PAM
+//** Configure PAM
 swriteln('Configuring PAM');
 $inst->configure_pam();
 
-// Configure courier
+//** Configure courier
 swriteln('Configuring Courier');
 $inst->configure_courier();
 
-// Configure Spamasassin
+//** Configure Spamasassin
 swriteln('Configuring Spamassassin');
 $inst->configure_spamassassin();
 
-// Configure Amavis
+//** Configure Amavis
 swriteln('Configuring Amavisd');
 $inst->configure_amavis();
 
-// Configure Getmail
+//** Configure Getmail
 swriteln('Configuring Getmail');
 $inst->configure_getmail();
 
-// Configure Pureftpd
+//** Configure Pureftpd
 swriteln('Configuring Pureftpd');
 $inst->configure_pureftpd();
 
-// Configure MyDNS
+//** Configure MyDNS
 swriteln('Configuring MyDNS');
 $inst->configure_mydns();
 
-// Configure Apache
+//** Configure Apache
 swriteln('Configuring Apache');
 $inst->configure_apache();
 
-// Configure ISPConfig
+//** Configure ISPConfig
 swriteln('Installing ISPConfig');
 $inst->install_ispconfig();
 
-// Configure ISPConfig
+//** Configure ISPConfig
 swriteln('Installing Crontab');
 $inst->install_crontab();
 
-
-/*
-Restart services:
-*/
-
+//** Restart services:
 swriteln('Restarting services ...');
 system("/etc/init.d/mysql restart");
 system("/etc/init.d/postfix restart");
@@ -189,5 +178,4 @@ system("/etc/init.d/mydns restart");
 
 echo "Update finished.\n";
 
-
 ?>

interface/web/mail/lib/lang/en_spamfilter_policy.lng

@@ -9,12 +9,12 @@ $wb["bypass_banned_checks_txt"] = 'Bypass banned checks';
 $wb["bypass_header_checks_txt"] = 'Bypass header checks';
 $wb["btn_save_txt"] = 'Save';
 $wb["btn_cancel_txt"] = 'Cancel';
-$wb["virus_quarantine_to_txt"] = 'Virus quarantine to';
-$wb["spam_quarantine_to_txt"] = 'Spam quarantine to';
-$wb["banned_quarantine_to_txt"] = 'Banned quarantine to';
-$wb["bad_header_quarantine_to_txt"] = 'Bad header quarantine to';
-$wb["clean_quarantine_to_txt"] = 'Clean quarantine to';
-$wb["other_quarantine_to_txt"] = 'Other quarantine to';
+$wb["virus_quarantine_to_txt"] = 'Forward virus to email';
+$wb["spam_quarantine_to_txt"] = 'Forward spam to email';
+$wb["banned_quarantine_to_txt"] = 'Forward banned to email';
+$wb["bad_header_quarantine_to_txt"] = 'Forward bad header to email';
+$wb["clean_quarantine_to_txt"] = 'Forward clean to email';
+$wb["other_quarantine_to_txt"] = 'Forward other to email';
 $wb["spam_tag_level_txt"] = 'SPAM tag level';
 $wb["spam_tag2_level_txt"] = 'SPAM tag2 level';
 $wb["spam_kill_level_txt"] = 'SPAM kill level';

interface/web/mail/templates/spamfilter_quarantine_edit.htm

@@ -15,6 +15,7 @@
     <td class="frmText11">{tmpl_var name='bad_header_quarantine_to_txt'}:</td>
     <td class="frmText11"><input name="bad_header_quarantine_to" type="text" class="text" value="{tmpl_var name='bad_header_quarantine_to'}" size="30" maxlength="255"></td>
   </tr>
+  <!--
   <tr>
     <td class="frmText11">{tmpl_var name='clean_quarantine_to_txt'}:</td>
     <td class="frmText11"><input name="clean_quarantine_to" type="text" class="text" value="{tmpl_var name='clean_quarantine_to'}" size="30" maxlength="255"></td>
@@ -22,7 +23,9 @@
   <tr>
     <td class="frmText11">{tmpl_var name='other_quarantine_to_txt'}:</td>
     <td class="frmText11"><input name="other_quarantine_to" type="text" class="text" value="{tmpl_var name='other_quarantine_to'}" size="30" maxlength="255"></td>
-  </tr>  <tr>
+  </tr> 
+  //-->
+   <tr>
     <td class="frmText11">&nbsp;</td>
     <td class="frmText11">&nbsp;</td>
   </tr>