diff -crN ./html/mod_user_noquota.html ../qmailadmin-1.0.7.01132003joe/html/mod_user_noquota.html
*** ./html/mod_user_noquota.html	Mon Jan 13 10:09:23 2003
--- ../qmailadmin-1.0.7.01132003joe/html/mod_user_noquota.html	Thu Mar 13 17:15:33 2003
***************
*** 82,87 ****
--- 82,90 ----
                                          <input type="hidden" name="user" value="##U">
                                          <input type="hidden" name="dom" value="##D">
                                          <input type="hidden" name="time" value="##T">
+ 
+ <input type="checkbox" name="spam" ##1>
+ 
                                          <input type="submit" name="##X111" value="##X111">
                                      </form>
                                      <div align="right">
diff -crN ./limits.c ../qmailadmin-1.0.7.01132003joe/limits.c
*** ./limits.c	Tue Aug  6 15:04:59 2002
--- ../qmailadmin-1.0.7.01132003joe/limits.c	Tue Mar 18 11:31:15 2003
***************
*** 48,53 ****
--- 48,54 ----
    DisablePasswordChanging = 0;
    DisableWebmail = 0;
    DisableRelay = 0;
+   EnableSpamassassin = 0;
    memset(DefaultQuota, 0, MAX_BUFF);
  
    if ( (fs=fopen(".qmailadmin-limits","r"))==NULL) {
***************
*** 89,94 ****
--- 90,98 ----
      } else if ( strncmp(tmpstr, "disable_imap", 12 ) == 0 ) {
        DisableIMAP = 1;
  
+     } else if ( strncmp(tmpstr, "enable_spamassassin", 19 ) == 0 ) {
+       EnableSpamassassin = 1;
+ 
      } else if ( strncmp(tmpstr, "disable_dialup", 14 ) == 0 ) {
        DisableDialup = 1;
  
diff -crN ./qmailadmin.c ../qmailadmin-1.0.7.01132003joe/qmailadmin.c
*** ./qmailadmin.c	Fri Oct 25 01:33:42 2002
--- ../qmailadmin-1.0.7.01132003joe/qmailadmin.c	Tue Mar 18 11:03:31 2003
***************
*** 68,80 ****
  int MaxForwards;
  int MaxAutoResponders;
  int MaxMailingLists;
! 
  int DisablePOP;
  int DisableIMAP;
  int DisableDialup;
  int DisablePasswordChanging;
  int DisableWebmail;
  int DisableRelay;
  char DefaultQuota[MAX_BUFF];
  
  int CurPopAccounts;
--- 68,81 ----
  int MaxForwards;
  int MaxAutoResponders;
  int MaxMailingLists;
! int EnableSpamassassin;
  int DisablePOP;
  int DisableIMAP;
  int DisableDialup;
  int DisablePasswordChanging;
  int DisableWebmail;
  int DisableRelay;
+ 
  char DefaultQuota[MAX_BUFF];
  
  int CurPopAccounts;
diff -crN ./qmailadminx.h ../qmailadmin-1.0.7.01132003joe/qmailadminx.h
*** ./qmailadminx.h	Fri Oct 25 01:33:42 2002
--- ../qmailadmin-1.0.7.01132003joe/qmailadminx.h	Tue Mar 18 11:06:49 2003
***************
*** 61,66 ****
--- 61,68 ----
  extern int DisablePasswordChanging;
  extern int DisableWebmail;
  extern int DisableRelay;
+ extern int EnableSpamassassin;
+ 
  extern char DefaultQuota[MAX_BUFF];
  
  extern int CurPopAccounts;
diff -crN ./template.c ../qmailadmin-1.0.7.01132003joe/template.c
*** ./template.c	Mon Jan 13 07:45:20 2003
--- ../qmailadmin-1.0.7.01132003joe/template.c	Tue Mar 18 11:25:42 2003
***************
*** 407,412 ****
--- 407,423 ----
              get_catchall();
              break;
  
+ 
+ 	  /* spamassassin joe */
+ 	  case '1':
+ 	   load_limits();
+ 	   if( EnableSpamassassin == 1){
+            fprintf(actout,"checked");}
+            break;
+ 
+ 
+ 
+ 
            /* display a file */
            case 'F':
              {
diff -crN ./user.c ../qmailadmin-1.0.7.01132003joe/user.c
*** ./user.c	Mon Jan 13 10:29:12 2003
--- ../qmailadmin-1.0.7.01132003joe/user.c	Tue Mar 18 14:57:29 2003
***************
*** 782,787 ****
--- 782,788 ----
   char qconvert[11];
   int count;
   FILE *fs;
+  static char spam[50];
  
    if (!( AdminType==DOMAIN_ADMIN ||
           (AdminType==USER_ADMIN && strcmp(ActionUser,Username)==0))){
***************
*** 894,899 ****
--- 895,901 ----
      } 
      fclose(fs);
  
+ 
    /* they want vacation */
    } else if (strcmp(box,"vacation") == 0 ) {
  
***************
*** 950,955 ****
--- 952,966 ----
      printf("nothing\n");
    }
  
+ 
+   GetValue(TmpCGI,spam, "spam=", MAX_BUFF);
+   if ( EnableSpamassassin == 1 ) {
+    if ( strcmp(spam,"on") == 0 ) {
+     sprintf(StatusMessage, " JOE %s\n",spam );
+    }
+   }
+ 
+ 
    call_hooks(HOOK_MODUSER);
    moduser();
  }