- Improved Installation instructions

- Better Autoresponder script
- Fixed error in language file.

Author: tbrehm

INSTALL_DEBIAN.txt

@@ -95,16 +95,16 @@ apt-get install vlogger webalizer
 7) Install ISPConfig 3
 
 There are two possile scenarios, but not both:
-7.1) Install the latest alpha 
+7.1) Install the latest released version 
 7.2) Install directly from SVN
 
 apt-get install php5-cli
 
 7.1) Installation of beta 3 from tar.gz
 
   cd /tmp
-  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.5-beta.tar.gz
-  tar xvfz ISPConfig-3.0.0.5-beta.tar.gz
+  wget http://www.ispconfig.org/downloads/ISPConfig-3.0.0.6-beta.tar.gz
+  tar xvfz ISPConfig-3.0.0.6-beta.tar.gz
   cd ispconfig3_install/install/
 
 7.2) Installation from SVN

interface/web/mail/mail_user_filter_edit.php

@@ -119,7 +119,7 @@ function getRule() {
 {
   `maildirmake -f ".$this->dataRecord["target"].' $DEFAULT'."`
   `chmod -R 0700 ".'$DEFAULT/'.$this->dataRecord["target"]."`
-  `echo INBOX.".$this->dataRecord["target"]." >> ".'$MAILDIR'."/courierimapsubscribed`
+  `echo INBOX.".$this->dataRecord["target"]." >> ".'$DEFAULT'."/courierimapsubscribed`
 }
 ";		
 		}

interface/web/mail/templates/mail_user_autoresponder_edit.htm

@@ -13,8 +13,8 @@
   </tr>
   <tr>
     <td>&nbsp;</td>
-    <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_autoresponder_edit.php');"><div class="buttonEnding"></div>
-      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_autoresponder_list.php');"><div class="buttonEnding"></div>
+    <td><input name="btn_save" type="button" class="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','mail/mail_user_edit.php');"><div class="buttonEnding"></div>
+      <input name="btn_cancel" type="button" class="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('mail/mail_user_list.php');"><div class="buttonEnding"></div>
     </td>
   </tr>
 </table>

interface/web/sites/lib/lang/en_web_domain.lng

@@ -23,7 +23,7 @@ $wb["system_group_txt"] = 'Linux Group';
 $wb["ip_address_txt"] = 'IP-Address';
 $wb["vhost_type_txt"] = 'VHost Type';
 $wb["hd_quota_txt"] = 'Harddisk Quota';
-$wb["traffic_quota_txt"] = 'Traffic Quaota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
 $wb["cgi_txt"] = 'CGI';
 $wb["ssi_txt"] = 'SSI';
 $wb["ssl_txt"] = 'SSL';

server/conf/autoresponder.master

@@ -1,14 +1,19 @@
-# cc $DEFAULT
-xfilter "reformail -r -t -I 'From: $LOGNAME'"
-/^To:.*/
-getaddr{$MATCH}=~ /^.*/;
-MATCH=tolower${MATCH}
-flock "{vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.lock" {
-        `fgrep -iqx "$MATCH" {vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.lst 2>/dev/null || { \
-               echo "$MATCH" >> {vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.lst ; \
-               exit 1 ; \
-         } `
-}
-if ( $RETURNCODE == 0 )
-    exit
-cc "| (cat - ; echo ''; cat {vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.msg) | $SENDMAIL -t"
+`test -f {vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.msg && exit 1 || exit 0`
+if ($RETURNCODE==1)
+{
+       {
+       if (!/^List-Unsubscribe:.*/:h )
+       {
+               if (!/^X-Spam-Flag: YES/:h )
+               {
+                      RESPOND="{vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.msg"
+                      RESPONDDB="{vmail_mailbox_base}/mailfilters/$HOST/$USER/.vacation.lst"
+
+                      # The following must be one contiguous line
+                      cc "| mailbot -t $RESPOND -d $RESPONDDB -D 1 \
+                      -A 'From: $RECIPIENT' -s 'Auto Response: from $RECIPIENT' \
+                      /usr/sbin/sendmail -t -f ''"
+               }
+       }
+       }
+}