diff -Naur qmailadmin-0.42/ChangeLog qmailadmin-0.42-dropto/ChangeLog --- qmailadmin-0.42/ChangeLog Fri Jan 19 18:22:36 2001 +++ qmailadmin-0.42-dropto/ChangeLog Mon Feb 26 09:47:40 2001 @@ -1,4 +1,8 @@ 0.42 +Feb 26 - Added an option to silently drop all mail to a specific email + address when removed. Could come handy if other measures fails. + Oden Eriksson + Jan 19 - added QMAILADMIN_TEMPLATEDIR as environment variable so virtual domains can point to different template directories diff -Naur qmailadmin-0.42/html/de qmailadmin-0.42-dropto/html/de --- qmailadmin-0.42/html/de Wed Jan 10 22:05:06 2001 +++ qmailadmin-0.42-dropto/html/de Mon Feb 26 09:36:25 2001 @@ -200,3 +200,4 @@ 201 Out of memory 202 Where the parameters are: 203 Email address removed from mailing list +210 Silently drop all mail sent to this email address diff -Naur qmailadmin-0.42/html/del_user_confirm.html qmailadmin-0.42-dropto/html/del_user_confirm.html --- qmailadmin-0.42/html/del_user_confirm.html Wed Jan 10 22:01:04 2001 +++ qmailadmin-0.42-dropto/html/del_user_confirm.html Mon Feb 26 09:43:15 2001 @@ -20,16 +20,16 @@

##X102 ##A @ ##D ?

-
- - - +
- ##X103 -
##X104 - -

-   - ##X001

+ +
+

 ##X210

+

 ##X103

+

##X104

+
+   + ##X001 +
diff -Naur qmailadmin-0.42/html/en qmailadmin-0.42-dropto/html/en --- qmailadmin-0.42/html/en Wed Jan 10 22:04:47 2001 +++ qmailadmin-0.42-dropto/html/en Mon Feb 26 09:36:34 2001 @@ -200,3 +200,4 @@ 201 Out of memory 202 Where the parameters are: 203 Email address removed from mailing list +210 Silently drop all mail sent to this email address diff -Naur qmailadmin-0.42/html/fr qmailadmin-0.42-dropto/html/fr --- qmailadmin-0.42/html/fr Wed Jan 10 22:05:22 2001 +++ qmailadmin-0.42-dropto/html/fr Mon Feb 26 09:36:47 2001 @@ -200,3 +200,4 @@ 201 Out of memory 202 Où trouver les paramètres: 203 Email address removed from mailing list +210 Silently drop all mail sent to this email address diff -Naur qmailadmin-0.42/html/ja qmailadmin-0.42-dropto/html/ja --- qmailadmin-0.42/html/ja Fri Jan 19 20:13:26 2001 +++ qmailadmin-0.42-dropto/html/ja Mon Feb 26 09:36:56 2001 @@ -201,3 +201,4 @@ 201 ¥á¥â¥ê¡¼¤¬ÉÔ­¤·¤Æ¤Þ¤¹ 202 ¥Ñ¥é¥á¡¼¥¿¡¼¤Ï: 203 ¥á¡¼¥ë¥¢¥É¥ì¥¹¤Ï¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤«¤éºï½ü¤µ¤ì¤Þ¤·¤¿ +210 Silently drop all mail sent to this email address diff -Naur qmailadmin-0.42/html/pt-BR qmailadmin-0.42-dropto/html/pt-BR --- qmailadmin-0.42/html/pt-BR Wed Jan 10 22:07:23 2001 +++ qmailadmin-0.42-dropto/html/pt-BR Mon Feb 26 09:37:06 2001 @@ -200,3 +200,4 @@ 201 Sem memória 202 Onde estão os parãmetros: 203 Email address removed from mailing list +210 Silently drop all mail sent to this email address diff -Naur qmailadmin-0.42/user.c qmailadmin-0.42-dropto/user.c --- qmailadmin-0.42/user.c Wed Jan 10 22:23:00 2001 +++ qmailadmin-0.42-dropto/user.c Mon Feb 26 09:47:40 2001 @@ -481,6 +481,7 @@ { char forward[200]; char forwardto[200]; + char dropto[200]; FILE *fs; int i; struct passwd *pw; @@ -496,6 +497,7 @@ * Code added by Eugene Teo 6 June 2000 */ GetValue(TmpCGI,forward, "forward=", MAX_BUFF); + GetValue(TmpCGI,dropto, "dropto=", MAX_BUFF); #ifdef DEBUG fprintf(actout, "Forward: %s\n
", forward); @@ -503,7 +505,16 @@ if (strcmp(forward, "on") == 0) { - /* replace "." in name with ":" */ + count_forwards(); + load_limits(); + if ( MaxForwards != -1 && CurForwards >= MaxForwards ) { + fprintf(actout, "

%s %d

\n", + get_html_text("157"), MaxForwards); + show_menu(); + exit(0); + } + + /* replace "." in name with ":" */ sprintf(TmpBuf2, ".qmail-%s", ActionUser); for(i=6;TmpBuf2[i]!=0;++i) if ( TmpBuf2[i] == '.' ) TmpBuf2[i] = ':'; @@ -519,12 +530,21 @@ fprintf(fs, "&%s", forwardto); fclose(fs); - + } + else + + if (strcmp(dropto, "on") == 0) + { + sprintf(TmpBuf2, ".qmail-%s", ActionUser); + if ((fs=fopen(TmpBuf2,"w")) == NULL) + ack("Failed to open passwd file",21); + fprintf(fs, "#", dropto); + fclose(fs); /* End create forward when delete - * Code added by Eugene Teo 6 June 2000 */ } - + fprintf(actout, "

%s %s

", ActionUser, get_html_text("141"));