maildrop and spamassassin processing

This is a multi-part message in MIME format.

------=_NextPart_000_0013_01C8B81E.4D8C7740
Content-Type: text/plain;
	format=flowed;
	charset="iso-8859-1";
	reply-type=original
Content-Transfer-Encoding: 7bit

Attached there is a patch to 

- enable/disable maildrop processing
- correct spamassassin management in modify domain page
- add some italian and en-us translations

I hope it's useful.

Valerio

!DSPAM:482ebcb232351897520371!

------=_NextPart_000_0013_01C8B81E.4D8C7740
Content-Type: application/octet-stream;
	name="vqadmin-maildrop.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="vqadmin-maildrop.patch"

/*
 * This patch is for vqadmin 2.3.7 ( http://www.inter7.com/vqadmin ).
 * Adds the 'enable/disable' maildrop feature and some Italian strings
 * in the 'it' translations file.
 * Corrects the incorrect disable_spamassassin management in domain
 * modification page.
 * The spamassassin/maildrop processing has to be enabled in vpopmail.
 *
 * Questa patch =E8 per vqadmin 2.3.7 ( http://www.inter7.com/vqadmin ).
 * Aggiunge la possibilita' di attivare/disattivare l'utilizzo di
 * maildrop e alcune stringhe italiane che mancavano nel file 'it'.
 * Corregge il mancato funzionamento del flag disable_spamassassin
 * nella pagina di modifica dominio.
 * L'utilizzo di spamassassin o maildrop deve essere abilitato nel
 * vpopmail.
 *
 * 2008-05-17 Valerio Granato <valerio [at] grana [dot] to>
 */

diff -ur vqadmin-2.3.7/domain.c vqadmin-2.3.7-maildrop/domain.c
--- vqadmin-2.3.7/domain.c  2005-01-11 21:48:03.000000000 +0100
+++ vqadmin-2.3.7-maildrop/domain.c 2008-05-17 12:51:04.000000000 +0200
@@ -59,7 +59,12 @@
  char *upassc =3D NULL;
  char *uweb =3D NULL;
  char *urelay =3D NULL;
+#ifdef SPAMASSASSIN
  char *uspam =3D NULL;
+#endif
+#ifdef MAILDROP
+ char *umaildrop =3D NULL;
+#endif
  int   ret;
  char dir[156];
  uid_t uid;
@@ -87,7 +92,12 @@
   upassc  =3D cgi_is_var("upassc");
   uweb    =3D cgi_is_var("uweb");
   urelay  =3D cgi_is_var("urelay");
+#ifdef SPAMASSASSIN
   uspam  =3D cgi_is_var("uspam");
+#endif
+#ifdef MAILDROP
+  umaildrop  =3D cgi_is_var("maildrop");
+#endif

   /* get the domain name */
   if (domain=3D=3DNULL || strlen(domain)=3D=3D0) {
@@ -142,7 +152,12 @@
   if (upassc!=3DNULL) fprintf(fs, "disable_password_changing\n");
   if (uweb!=3DNULL) fprintf(fs, "disable_webmail\n");
   if (urelay!=3DNULL) fprintf(fs, "disable_external_relay\n");
-  if (uspam!=3DNULL) fprintf(fs, "disable_spamassasin\n");
+#ifdef SPAMASSASSIN
+  if (uspam!=3DNULL) fprintf(fs, "disable_spamassassin\n");
+#endif
+#ifdef MAILDROP
+  if (umaildrop!=3DNULL) fprintf(fs, "disable_maildrop\n");
+#endif
   fclose(fs);
   chown(dir,uid, gid);
   chmod(dir, S_IRUSR | S_IWUSR);
@@ -229,6 +244,12 @@
  char *upassc =3D NULL;
  char *uweb =3D NULL;
  char *urelay =3D NULL;
+#ifdef SPAMASSASSIN
+ char *uspam =3D NULL;
+#endif
+#ifdef MAILDROP
+ char *umaildrop =3D NULL;
+#endif
  int   ret;
  char dir[156];
  uid_t uid;
@@ -260,6 +281,12 @@
   upassc  =3D cgi_is_var("upassc");
   uweb    =3D cgi_is_var("uweb");
   urelay  =3D cgi_is_var("urelay");
+#ifdef SPAMASSASSIN
+  uspam   =3D cgi_is_var("uspam");
+#endif
+#ifdef MAILDROP
+  umaildrop  =3D cgi_is_var("umaildrop");
+#endif

   vget_assign(domain,dir,156,&uid,&gid);
   strncat(dir,"/.qmailadmin-limits", 156);
@@ -286,6 +313,12 @@
   if (upassc!=3DNULL) fprintf(fs, "disable_password_changing\n");
   if (uweb!=3DNULL) fprintf(fs, "disable_webmail\n");
   if (urelay!=3DNULL) fprintf(fs, "disable_external_relay\n");
+#ifdef SPAMASSASSIN
+  if (uspam!=3DNULL) fprintf(fs, "disable_spamassassin\n");
+#endif
+#ifdef MAILDROP
+  if (umaildrop!=3DNULL) fprintf(fs, "disable_maildrop\n");
+#endif

   fclose(fs);
   chown(dir,uid, gid);
@@ -397,9 +430,15 @@

       } else if ( strcmp(tmpstr1, "disable_external_relay") =3D=3D 0 ) =
{
         global_par("MS", "checked");
-
-     } else if ( strcmp(tmpstr1, "disable_spamassassin") =3D=3D 0 ) {
-       global_par("MZ", "checked");
+#ifdef SPAMASSASSIN
+      } else if ( strcmp(tmpstr1, "disable_spamassassin") =3D=3D 0 ) {
+   global_par("MZ", "checked");
+#endif
+
+#ifdef MAILDROP
+      } else if ( strcmp(tmpstr1, "disable_maildrop") =3D=3D 0 ) {
+   global_par("MM", "checked");
+#endif

       } else if ( strcmp(tmpstr1, "disable_webmail") =3D=3D 0 ) {
         global_par("MW", "checked");
diff -ur vqadmin-2.3.7/html/add_user.html =
vqadmin-2.3.7-maildrop/html/add_user.html
--- vqadmin-2.3.7/html/add_user.html    2005-01-11 21:43:10.000000000 =
+0100
+++ vqadmin-2.3.7-maildrop/html/add_user.html   2008-05-17 =
12:04:59.000000000 +0200
@@ -35,6 +35,8 @@
    <label for=3D"urelay" title=3D"#-047">#-047</label></td> </tr>
 <tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"uspam" id=3D"uspam" $-UF>
    <label for=3D"uspam" title=3D"#-069">#-069</label></td> </tr>
+<tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"umaildrop" id=3D"umaildrop" =
$-UM>
+   <label for=3D"umaildrop" title=3D"#-070">#-070</label></td> </tr>
 <tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"uqadmin" id=3D"uqadmin" $-UK>
    <label for=3D"uqadmin" title=3D"#-048">#-048</label></td></tr>
 <tr><td><br>
diff -ur vqadmin-2.3.7/html/en vqadmin-2.3.7-maildrop/html/en
--- vqadmin-2.3.7/html/en   2005-01-11 21:24:52.000000000 +0100
+++ vqadmin-2.3.7-maildrop/html/en  2008-05-17 12:03:57.000000000 +0200
@@ -65,4 +65,4 @@
 067 user:
 068 permission:
 069 Disable SpamAssassin
-
+070 Disable Maildrop
diff -ur vqadmin-2.3.7/html/en-us vqadmin-2.3.7-maildrop/html/en-us
--- vqadmin-2.3.7/html/en-us    2003-01-09 21:15:21.000000000 +0100
+++ vqadmin-2.3.7-maildrop/html/en-us   2008-05-17 12:04:14.000000000 =
+0200
@@ -59,6 +59,11 @@
 058 3
 059 Add Alias Domain
 060 Alias Domain Name
-061 Qmail Control Files
-062 Modify Control File
-063 Modify File
+061 Qmail Control Files
+062 Modify Control File
+063 Modify File
+067 user:
+068 permission:
+069 Disable SpamAssassin
+070 Disable Maildrop
+
diff -ur vqadmin-2.3.7/html/it vqadmin-2.3.7-maildrop/html/it
--- vqadmin-2.3.7/html/it   2002-08-02 19:12:55.000000000 +0200
+++ vqadmin-2.3.7-maildrop/html/it  2008-05-17 12:03:49.000000000 +0200
@@ -62,3 +62,7 @@
 061 Qmail Control Files
 062 Modify Control File
 063 Modify File
+067 utente:
+068 permessi:
+069 Disabilita SpamAssassin
+070 Disabilita Maildrop
diff -ur vqadmin-2.3.7/html/mod_domain.html =
vqadmin-2.3.7-maildrop/html/mod_domain.html
--- vqadmin-2.3.7/html/mod_domain.html  2005-01-11 21:47:51.000000000 =
+0100
+++ vqadmin-2.3.7-maildrop/html/mod_domain.html 2008-05-17 =
12:06:11.000000000 +0200
@@ -62,6 +62,7 @@
 <tr><td><input TYPE=3D"checkbox" NAME=3D"uweb" id=3D"uweb" $-MW =
title=3D"#-043"><label for=3D"uweb" =
title=3D"#-043">#-043</label></td></tr>
 <tr><td><input TYPE=3D"checkbox" NAME=3D"urelay" id=3D"urelay"$-MS =
title=3D"#-047"><label for=3D"urelay" =
title=3D"#-047">#-047</label></td></tr>
 <tr><td><input TYPE=3D"checkbox" NAME=3D"uspam" id=3D"uspam"$-MZ =
title=3D"#-069"><label for=3D"uspam" =
title=3D"#-069">#-069</label></td></tr>
+<tr><td><input TYPE=3D"checkbox" NAME=3D"umaildrop" =
id=3D"umaildrop"$-MM title=3D"#-070"><label for=3D"umaildrop" =
title=3D"#-070">#-070</label></td></tr>
 <tr>
 <td><BR><INPUT TYPE=3D"SUBMIT" NAME=3D"Submit" VALUE=3D"#-033">
 <INPUT TYPE=3D"HIDDEN" NAME=3D"nav" VALUE=3D"mod_domain">
diff -ur vqadmin-2.3.7/html/mod_user.html =
vqadmin-2.3.7-maildrop/html/mod_user.html
--- vqadmin-2.3.7/html/mod_user.html    2005-01-11 21:42:28.000000000 =
+0100
+++ vqadmin-2.3.7-maildrop/html/mod_user.html   2008-05-17 =
12:05:30.000000000 +0200
@@ -36,6 +36,7 @@
 <tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"ubounce" id=3D"ubounce" $-UB =
title=3D"#-046"><label for=3D"ubounce" =
title=3D"#-046">#-046</label></td> </tr>
 <tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"urelay" id=3D"urelay" $-US =
title=3D"#-047"><label for=3D"urelay" title=3D"#-047">#-047</label></td> =
</tr>
 <tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"uspam" id=3D"uspam" $-UF =
title=3D"#-069"><label for=3D"uspam" title=3D"#-069">#-069</label></td> =
</tr>
+<tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"umaildrop" id=3D"umaildrop" =
$-UM title=3D"#-070"><label for=3D"umaildrop" =
title=3D"#-070">#-070</label></td> </tr>
 <tr><td><INPUT TYPE=3D"CHECKBOX" NAME=3D"uqadmin" id=3D"uqadmin" $-UK =
title=3D"#-048"><label for=3D"uqadmin" =
title=3D"#-048">#-048</label></td></tr>
 </tr>
 <tr><td>
diff -ur vqadmin-2.3.7/user.c vqadmin-2.3.7-maildrop/user.c
--- vqadmin-2.3.7/user.c    2005-01-11 22:10:35.000000000 +0100
+++ vqadmin-2.3.7-maildrop/user.c   2008-05-17 12:46:25.000000000 +0200
@@ -123,7 +123,12 @@
  char *upassc;
  char *ubounce;
  char *urelay;
+#ifdef SPAMASSASSIN
  char *uspam;
+#endif
+#ifdef MAILDROP
+ char *umaildrop;
+#endif
  char *uqadmin;
  int   ret;
  int   i;
@@ -146,6 +151,7 @@
   ubounce =3D cgi_is_var("ubounce");
   urelay =3D cgi_is_var("urelay");
   uspam =3D cgi_is_var("uspam");
+  umaildrop =3D cgi_is_var("umaildrop");
   uqadmin =3D cgi_is_var("uqadmin");

   if ( eaddr=3D=3DNULL || strlen(eaddr)=3D=3D0 ) {
@@ -192,6 +198,9 @@
 #ifdef SPAMASSASSIN
   if (uspam!=3DNULL) GidFlag |=3D NO_SPAMASSASSIN;
 #endif
+#ifdef MAILDROP
+  if (umaildrop!=3DNULL) GidFlag |=3D NO_MAILDROP;
+#endif
   if (uqadmin!=3DNULL) GidFlag |=3D QA_ADMIN;

   vpw->pw_gid =3D GidFlag;
@@ -244,6 +253,10 @@
   if (vpw->pw_gid & NO_SPAMASSASSIN) global_par("UF", "CHECKED");
 #endif

+#ifdef MAILDROP
+  if (vpw->pw_gid & NO_MAILDROP) global_par("UM", "CHECKED");
+#endif
+
   if (vpw->pw_gid & QA_ADMIN) global_par("UK", "CHECKED");

 #ifdef ENABLE_AUTH_LOGGING

------=_NextPart_000_0013_01C8B81E.4D8C7740--