Menu
▾
▴
qmailadmin-cvs — CVS commits for the qmailadmin project
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(18) |
Oct
(28) |
Nov
(9) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(37) |
Feb
(16) |
Mar
|
Apr
(11) |
May
(2) |
Jun
(3) |
Jul
|
Aug
(6) |
Sep
(6) |
Oct
(8) |
Nov
(14) |
Dec
(20) |
| 2005 |
Jan
(11) |
Feb
(8) |
Mar
(7) |
Apr
(1) |
May
|
Jun
|
Jul
(3) |
Aug
(7) |
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
(11) |
Mar
|
Apr
(2) |
May
(7) |
Jun
(1) |
Jul
|
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(1) |
Dec
(4) |
| 2007 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(6) |
Dec
|
| 2008 |
Jan
(5) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2009 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(12) |
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(2) |
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Tom C. <tom...@us...> - 2004-12-02 00:07:54
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11058 Modified Files: Tag: stable-1_2 template.c Log Message: remove unused var from template.c Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.7.2.7 retrieving revision 1.7.2.8 diff -u -d -r1.7.2.7 -r1.7.2.8 --- template.c 27 Nov 2004 17:18:06 -0000 1.7.2.7 +++ template.c 2 Dec 2004 00:07:43 -0000 1.7.2.8 @@ -55,8 +55,6 @@ void get_calling_host(); char *get_session_val(char *session_var); -static char NTmpBuf[500]; - /* * send an html template to the browser */ |
|
From: Tom C. <tom...@us...> - 2004-12-01 23:19:53
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30649 Modified Files: Tag: stable-1_2 ChangeLog Log Message: set release date of 1.2.5 Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.36 retrieving revision 1.15.2.37 diff -u -d -r1.15.2.36 -r1.15.2.37 --- ChangeLog 27 Nov 2004 17:18:06 -0000 1.15.2.36 +++ ChangeLog 1 Dec 2004 23:19:44 -0000 1.15.2.37 @@ -1,7 +1,7 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. -1.2.5 - unreleased +1.2.5 - released 1-Dec-04 Tom Collins - Remove unnecessary name attributes in SUBMIT buttons. [869292] |
|
From: Tom C. <tom...@us...> - 2004-11-27 17:18:20
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12690 Modified Files: Tag: stable-1_2 ChangeLog template.c user.c user.h Log Message: Vacation now delivers first, then sends response. Wrote new code to parse .qmail file, works with new vacation .qmail format and allows for future flexibility. Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.11.2.5 retrieving revision 1.11.2.6 diff -u -d -r1.11.2.5 -r1.11.2.6 --- user.c 20 Nov 2004 01:10:41 -0000 1.11.2.5 +++ user.c 27 Nov 2004 17:18:06 -0000 1.11.2.6 @@ -933,14 +933,16 @@ /* open the .qmail file */ snprintf(NewBuf,sizeof(NewBuf),"%s/.qmail", vpw->pw_dir); fs = fopen(NewBuf,"w+"); - fprintf(fs, "| %s/autorespond 86400 3 %s/vacation/message %s/vacation\n", - AUTORESPOND_PATH, vpw->pw_dir, vpw->pw_dir ); /* save a copy for the user (if checking for spam, it will keep a copy)*/ if(spam_check==1) fprintf(fs, "%s\n", SPAM_COMMAND); else fprintf(fs,"%s/" MAILDIR "/\n", vpw->pw_dir); + + fprintf(fs, "| %s/autorespond 86400 3 %s/vacation/message %s/vacation\n", + AUTORESPOND_PATH, vpw->pw_dir, vpw->pw_dir ); + fclose(fs); /* set up the message file */ @@ -989,3 +991,180 @@ call_hooks(HOOK_MODUSER, ActionUser, Domain, Password1, Gecos); moduser(); } + +/* display ##i0 - ##i9 macros */ +void parse_users_dotqmail (char newchar) +{ + static struct vqpasswd *vpw = NULL; + static FILE *fs1=NULL; /* for the .qmail file */ + static FILE *fs2=NULL; /* for the vacation message file */ + int i; + char fn[500]; + char linebuf[256]; + int inheader; + + static unsigned int dotqmail_flags = 0; +#define DOTQMAIL_STANDARD (1<<0) +#define DOTQMAIL_FORWARD (1<<1) +#define DOTQMAIL_SAVECOPY (1<<3) +#define DOTQMAIL_VACATION (1<<4) +#define DOTQMAIL_BLACKHOLE (1<<8) +#define DOTQMAIL_SPAMCHECK (1<<9) +#define DOTQMAIL_OTHERPGM (1<<14) + + + if (vpw == NULL) vpw = vauth_getpw(ActionUser, Domain); + if (vpw == NULL) return; + + if (fs1 == NULL) { + + snprintf (fn, sizeof(fn), "%s/.qmail", vpw->pw_dir); + fs1 = fopen (fn, "r"); + if (fs1 == NULL) { + /* no .qmail file, standard delivery */ + dotqmail_flags = DOTQMAIL_STANDARD; + } else { + while (fgets (linebuf, sizeof(linebuf), fs1) != NULL) { + i = strlen (linebuf); + /* strip trailing newline if any */ + if (i && linebuf[i-1] == '\n') linebuf[i-1] = '\0'; + + switch (*linebuf) { + case '\0': /* blank line, ignore */ + break; + + case '/': /* maildir delivery */ + /* see if it's the user's maildir */ + if (1) + dotqmail_flags |= DOTQMAIL_SAVECOPY; + break; + + case '|': /* program delivery */ + /* in older versions of QmailAdmin, we used "|/bin/true delete" + * for blackhole accounts. Since the path to true may vary, + * just check for the end of the string + */ + if (strstr (linebuf, "/true delete") != NULL) + dotqmail_flags |= DOTQMAIL_BLACKHOLE; + + else if (strstr (linebuf, "/autorespond ") != NULL) { + dotqmail_flags |= DOTQMAIL_VACATION; + snprintf (fn, sizeof(fn), "%s/vacation/message", vpw->pw_dir); + fs2 = fopen (fn, "r"); + } + + else if (strstr (linebuf, SPAM_COMMAND) != NULL ) + dotqmail_flags |= DOTQMAIL_SPAMCHECK; + + else /* unrecognized program delivery, set a flag so we don't blackhole */ + dotqmail_flags |= DOTQMAIL_OTHERPGM; + + break; + + case '#': /* comment */ + /* ignore unless it's our 'blackhole' comment */ + if (strcmp (linebuf, "# delete") == 0) + dotqmail_flags |= DOTQMAIL_BLACKHOLE; + break; + + default: /* email address delivery */ + dotqmail_flags |= DOTQMAIL_FORWARD; + + } + } + + /* if other flags were set, in addition to blackhole, clear blackhole flag */ + if (dotqmail_flags & ~DOTQMAIL_BLACKHOLE) + dotqmail_flags &= ~DOTQMAIL_BLACKHOLE; + + /* if no flags were set (.qmail file without delivery), it's a blackhole */ + if (dotqmail_flags == 0) + dotqmail_flags = DOTQMAIL_BLACKHOLE; + + /* if unrecognized programs were all that was set, consider it standard */ + if (dotqmail_flags == DOTQMAIL_OTHERPGM) + dotqmail_flags = DOTQMAIL_STANDARD; + + /* clear OTHERPGM flag, as it tells us nothing at this point */ + dotqmail_flags &= ~DOTQMAIL_OTHERPGM; + + /* if forward and save-a-copy are set, it will actually set the spam flag? */ + if ((dotqmail_flags & DOTQMAIL_FORWARD) && (dotqmail_flags & DOTQMAIL_SPAMCHECK)) + dotqmail_flags |= DOTQMAIL_SAVECOPY; + + /* if vacation is set, it will set save a copy as well, so we clear it */ + if (dotqmail_flags & DOTQMAIL_VACATION) + dotqmail_flags &= ~DOTQMAIL_SAVECOPY; + } + + /* if only spam detection was set, it's standard delivery */ + /* default to standard delivery */ + if (! (dotqmail_flags & ~DOTQMAIL_SPAMCHECK)) + dotqmail_flags |= DOTQMAIL_STANDARD; + } + + switch (newchar) { + case '0': /* standard delivery checkbox */ + case '1': /* forward delivery checkbox */ + case '3': /* save-a-copy checkbox */ + case '4': /* vacation checkbox */ + case '8': /* blackhole checkbox */ + case '9': /* spam check checkbox */ + if (dotqmail_flags & (1 << (newchar - '0'))) printf ("checked "); + break; + + case '2': /* forwarding addresses */ + if (fs1 != NULL) { + rewind (fs1); + i = 0; + while (fgets (linebuf, sizeof(linebuf), fs1) != NULL) { + switch (*linebuf) { + case '\0': /* blank line */ + case '/': /* maildir delivery */ + case '|': /* program delivery */ + case '#': /* comment */ + /* ignore */ + break; + + default: /* email address delivery */ + /* print address, skipping over '&' if necessary and removing newline */ + if (i++) printf (", "); + printh ("%H", strtok(&linebuf[(*linebuf == '&' ? 1 : 0)], "\n")); + } + } + } + break; + + case '5': /* vacation subject */ + if (fs2 != NULL) { + rewind (fs2); + + /* scan headers for Subject */ + while (fgets (linebuf, sizeof(linebuf), fs2) != NULL) { + if (*linebuf == '\n') break; + if (strncasecmp (linebuf, "Subject: ", 9) == 0) + printh ("%H", &linebuf[9]); + } + } + break; + + case '6': /* vacation message */ + if (fs2 != NULL) { + rewind (fs2); + + /* read from file, skipping headers (look for first blank line) */ + inheader = 1; + while (fgets (linebuf, sizeof(linebuf), fs2) != NULL) { + if (!inheader) printh ("%H", linebuf); + if (*linebuf == '\n') inheader = 0; + } + } + break; + + case '7': /* gecos (real name) */ + printh ("%H", vpw->pw_gecos); + break; + } + +} + Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.7.2.6 retrieving revision 1.7.2.7 diff -u -d -r1.7.2.6 -r1.7.2.7 --- template.c 20 Nov 2004 06:24:51 -0000 1.7.2.6 +++ template.c 27 Nov 2004 17:18:06 -0000 1.7.2.7 @@ -49,7 +49,6 @@ #include "util.h" static char dchar[4]; -void check_user_forward_vacation(char newchar); void check_mailbox_flags(char newchar); void transmit_block(FILE *fs); void ignore_to_end_tag(FILE *fs); @@ -278,7 +277,7 @@ /* check for user forward and forward/store vacation */ case 'i': - check_user_forward_vacation(fgetc(fs)); + parse_users_dotqmail( fgetc(fs) ); break; /* show mailbox flag status */ @@ -722,147 +721,6 @@ return; } -void check_user_forward_vacation(char newchar) -{ - static struct vqpasswd *vpw = NULL; - static FILE *fs1=NULL; /* for the .qmail file */ - static FILE *fs2=NULL; /* for the vacation message file */ - int i; - - if (vpw==NULL) vpw = vauth_getpw(ActionUser, Domain); - if (fs1== NULL) { - snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/.qmail", vpw->pw_dir); - fs1 = fopen(NTmpBuf,"r"); - } - - if ( newchar=='7') { - printh ("%H", vpw->pw_gecos); - return; - } - - if (fs1 == NULL) { - if (newchar=='0'){ - printf("checked "); - } - return; - } - - /* start at the begingin if second time thru */ - rewind(fs1); - - if (fgets(NTmpBuf,sizeof(NTmpBuf),fs1)!=NULL) { - - /* if it is a forward to a program */ - if (strstr(NTmpBuf, "autorespond")!=NULL ) { - if (newchar=='4') { - printf("checked "); - } else if (newchar=='5') { - if (fs2 == NULL) { - snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/vacation/message", vpw->pw_dir); - fs2 = fopen(NTmpBuf,"r"); - } - if (fs2 != NULL) { - rewind(fs2); - /* - * it's a hack, the second line always has - * the subject - */ - fgets(NTmpBuf,sizeof(NTmpBuf),fs2); - fgets(NTmpBuf,sizeof(NTmpBuf),fs2); - printh("%H", &NTmpBuf[9]); - } - } else if (newchar=='6') { - if (fs2 == NULL) { - snprintf(NTmpBuf, sizeof(NTmpBuf), "%s/vacation/message", vpw->pw_dir); - fs2 = fopen(NTmpBuf,"r"); - } - if (fs2 != NULL) { - rewind(fs2); - for(i = 0; i < 3 && fgets(NTmpBuf,sizeof(NTmpBuf),fs2) != NULL; ++i); - while (fgets(NTmpBuf,sizeof(NTmpBuf),fs2) != NULL) { - printf("%s", NTmpBuf); - } - } - } - - i = 0; - do { - if (newchar == '3' && (NTmpBuf[0] == '/' || - strstr(NTmpBuf, SPAM_COMMAND)!=NULL) ) { - printf("checked "); - return; - } - if ( newchar == '2' ) { - if (NTmpBuf[0]=='/') continue; - if (NTmpBuf[0]=='|') continue; - if ( i>0 ) printf(", "); - if (NTmpBuf[0]=='&') { - printh("%H", strtok(&NTmpBuf[1], "\n")); - } else { - printh("%H", NTmpBuf[0]); - } - ++i; - } - /* Jeff Hedlund (jef...@ma...) 28 May 2003 */ - /* i9: "checked" if spam filtering on */ - if ( newchar == '9' && strstr(NTmpBuf, SPAM_COMMAND)!=NULL ) { - printf("checked "); - return; - } - } while(fgets(NTmpBuf,sizeof(NTmpBuf),fs1) != NULL ); - - - return; - } else { - - /* James Raftery <ja...@no...>, 21 May 2003 */ - /* i8: "checked" if blackhole */ - if (strstr(NTmpBuf, " delete\n") != NULL) { - if (newchar == '8') { - printf("checked "); - } - return; - } - - if (newchar == '1' || newchar == '0') { - if(strstr(NTmpBuf, SPAM_COMMAND)!=NULL) { - if(newchar == '0') printf("checked "); - } else { - if(newchar == '1') printf("checked "); - } - return; - } - - i = 0; - do { - if (newchar == '3' && (NTmpBuf[0] == '/' || - strstr(NTmpBuf, SPAM_COMMAND)!=NULL)) { - printf("checked "); - return; - } - - if (newchar == '9' && strstr(NTmpBuf, SPAM_COMMAND)!=NULL ) { - printf("checked "); - return; - } - - if (newchar == '2') { - if (NTmpBuf[0]=='/') continue; - if (strstr(NTmpBuf, SPAM_COMMAND)!=NULL) continue; - if (i > 0) printf(", "); - if (NTmpBuf[0] == '&') { - printh("%H", strtok(&NTmpBuf[1], "\n")); - } else { - printh("%H", NTmpBuf); - } - ++i; - } - } while (fgets(NTmpBuf,sizeof(NTmpBuf),fs1) != NULL); - } - } - return; -} - void transmit_block(FILE *fs) { /* tests to see if text between ##tX and ##tt should be transmitted */ /* where X is a letter corresponding to one of the below values */ Index: user.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Attic/user.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- user.h 20 Nov 2004 01:10:41 -0000 1.1.2.1 +++ user.h 27 Nov 2004 17:18:06 -0000 1.1.2.2 @@ -15,6 +15,7 @@ void moduser(); void modusergo(); void modusernow(); +void parse_users_dotqmail (char newchar); void setremotecatchall(); void setremotecatchallnow(); void show_users(char *Username, char *Domain, time_t Mytime); Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.35 retrieving revision 1.15.2.36 diff -u -d -r1.15.2.35 -r1.15.2.36 --- ChangeLog 22 Nov 2004 16:04:10 -0000 1.15.2.35 +++ ChangeLog 27 Nov 2004 17:18:06 -0000 1.15.2.36 @@ -7,6 +7,10 @@ - Remove unnecessary name attributes in SUBMIT buttons. [869292] - When adding a mailing list, automatically subscribe the list owner and make them a moderator/remote admin. [892489] + - user.c: deliver mail to Maildir before sending vacation message + in order to prevent autorespond from losing messages. + - Move .qmail parsing code from template.c to user.c. Rewrite + for more flexibility and to allow new format for vacation. - configure.in: Compile with all warnings on. - Add header files: alias.h auth.h autorespond.h cgi.h command.h dotqmail.h forward.h limits.h mailinglist.h show.h template.h |
|
From: Tom C. <tom...@us...> - 2004-11-22 16:04:22
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10713 Modified Files: Tag: stable-1_2 ChangeLog mailinglist.c mailinglist.h Log Message: When adding a mailing list, automatically subscribe the list owner and make them a moderator/remote admin. [892489] Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.34 retrieving revision 1.15.2.35 diff -u -d -r1.15.2.34 -r1.15.2.35 --- ChangeLog 20 Nov 2004 01:10:41 -0000 1.15.2.34 +++ ChangeLog 22 Nov 2004 16:04:10 -0000 1.15.2.35 @@ -5,6 +5,8 @@ Tom Collins - Remove unnecessary name attributes in SUBMIT buttons. [869292] + - When adding a mailing list, automatically subscribe the + list owner and make them a moderator/remote admin. [892489] - configure.in: Compile with all warnings on. - Add header files: alias.h auth.h autorespond.h cgi.h command.h dotqmail.h forward.h limits.h mailinglist.h show.h template.h Index: mailinglist.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Attic/mailinglist.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- mailinglist.h 20 Nov 2004 01:10:41 -0000 1.1.2.1 +++ mailinglist.h 22 Nov 2004 16:04:11 -0000 1.1.2.2 @@ -13,6 +13,7 @@ void dellistgroupnow(int mod); void delmailinglist(); void delmailinglistnow(); +int ezmlm_sub (char *dir, char *email); void modmailinglist(); void modmailinglistnow(); void show_list_group(char *template); Index: mailinglist.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v retrieving revision 1.5.2.2 retrieving revision 1.5.2.3 diff -u -d -r1.5.2.2 -r1.5.2.3 --- mailinglist.c 20 Nov 2004 01:10:41 -0000 1.5.2.2 +++ mailinglist.c 22 Nov 2004 16:04:10 -0000 1.5.2.3 @@ -596,6 +596,15 @@ fprintf(file, "%s-%s", Domain, ActionUser); fclose(file); } + + /* if this is a new list, add owner as subscriber */ + if (newlist && (*list_owner != '\0')) { + ezmlm_sub ("", list_owner); +#ifdef EZMLMIDX + /* add owner as moderator/remote admin as well */ + ezmlm_sub ("mod", list_owner); +#endif + } } void addmailinglistnow() @@ -756,12 +765,31 @@ void addlistmod() { addlistgroup( "add_listmod.html" ); } void addlistdig() { addlistgroup( "add_listdig.html" ); } +/* returns 0 for success */ +int ezmlm_sub (char *dir, char *email) +{ + int pid; + char subpath[MAX_BUFF]; + char listpath[MAX_BUFF]; + + pid=fork(); + if (pid==0) { + snprintf(subpath, sizeof(subpath), "%s/ezmlm-sub", EZMLMDIR); + snprintf(listpath, sizeof(listpath), "%s/%s/%s", + RealDir, ActionUser, dir); + execl(subpath, "ezmlm-sub", listpath, email, NULL); + exit(127); + } else wait(&pid); + + /* need to check exit code for failure somehow */ + + return 0; +} + void addlistgroupnow (int mod) { // mod = 0 for subscribers, 1 for moderators, 2 for digest subscribers - int pid; - if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); @@ -783,29 +811,18 @@ exit(0); } - pid=fork(); - if (pid==0) { - sprintf(TmpBuf1, "%s/ezmlm-sub", EZMLMDIR); - if(mod == 1) { - sprintf(TmpBuf2, "%s/%s/mod", RealDir, ActionUser); - } else if(mod == 2) { - sprintf(TmpBuf2, "%s/%s/digest", RealDir, ActionUser); - } else { - sprintf(TmpBuf2, "%s/%s/", RealDir, ActionUser); - } - execl(TmpBuf1, "ezmlm-sub", TmpBuf2, Newu, NULL); - exit(127); - } else wait(&pid); - if(mod == 1 ) { + ezmlm_sub ("mod", Newu); snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("194"), ActionUser, Domain); send_template( "add_listmod.html" ); } else if(mod == 2) { + ezmlm_sub ("digest", Newu); snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("240"), ActionUser, Domain); send_template( "add_listdig.html" ); } else { + ezmlm_sub ("", Newu); snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("193"), ActionUser, Domain); send_template( "add_listuser.html" ); |
|
From: Tom C. <tom...@us...> - 2004-11-20 06:24:59
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20961 Modified Files: Tag: stable-1_2 template.c Log Message: remove old printh-related code that snuck back in. Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.7.2.5 retrieving revision 1.7.2.6 diff -u -d -r1.7.2.5 -r1.7.2.6 --- template.c 20 Nov 2004 01:10:41 -0000 1.7.2.5 +++ template.c 20 Nov 2004 06:24:51 -0000 1.7.2.6 @@ -78,7 +78,6 @@ char *tmpstr; struct stat mystat; char qconvert[11]; - char *fmt; char *qnote = " MB"; struct vqpasswd *vpw; char value[MAX_BUFF]; @@ -123,12 +122,8 @@ break; /* found a tag */ - } else if ((inchar == '#') || (inchar == '%')) { - if (inchar == '#') - fmt = "%H"; - else - fmt = "%C"; - + } else if (inchar == '#') { + inchar = fgetc(fs); if (inchar < 0) break; |
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30485 Modified Files: Tag: stable-1_2 ChangeLog alias.c auth.c autorespond.c cgi.c command.c dotqmail.c forward.c limits.c mailinglist.c qmailadmin.c qmailadmin.h qmailadminx.h show.c template.c user.c util.c Added Files: Tag: stable-1_2 alias.h auth.h autorespond.h cgi.h command.h dotqmail.h forward.h limits.h mailinglist.h show.h template.h user.h util.h Log Message: major code clean up; added header files, fixed function prototypes/definitions/calls; fixed all compiler warnings Index: limits.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/limits.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- limits.c 10 Oct 2003 16:36:24 -0000 1.2 +++ limits.c 20 Nov 2004 01:10:41 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,23 +17,12 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <sys/stat.h> -#include <unistd.h> -#include <pwd.h> -#include <dirent.h> -#include <errno.h> #include "config.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "limits.h" -#define LIMIT_TOKENS " :\t\r\n" - - -load_limits() +void load_limits() { vget_limits(Domain, &Limits); MaxPopAccounts = Limits.maxpopaccounts; --- NEW FILE: command.h --- /* * $Id: command.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ void process_commands(); void setdefaultaccount(); Index: mailinglist.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v retrieving revision 1.5.2.1 retrieving revision 1.5.2.2 diff -u -d -r1.5.2.1 -r1.5.2.2 --- mailinglist.c 14 Nov 2004 18:05:54 -0000 1.5.2.1 +++ mailinglist.c 20 Nov 2004 01:10:41 -0000 1.5.2.2 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,13 +23,25 @@ #include <string.h> #include <unistd.h> #include <sys/stat.h> +#include <sys/types.h> +#include <sys/wait.h> #include <unistd.h> #include <pwd.h> #include <dirent.h> +#include <errno.h> + +#include <vpopmail.h> + +#include "cgi.h" #include "config.h" +#include "limits.h" +#include "mailinglist.h" +#include "printh.h" #include "qmailadmin.h" #include "qmailadminx.h" -#include <errno.h> +#include "show.h" +#include "template.h" +#include "util.h" char dotqmail_name[MAX_FILE_NAME]; char replyto_addr[256]; @@ -44,7 +56,7 @@ void set_options(); void default_options(); -int show_mailing_lists(char *user, char *dom, time_t mytime) +void show_mailing_lists(char *user, char *dom, time_t mytime) { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -56,25 +68,25 @@ count_mailinglists(); if ( CurMailingLists == 0 ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("231")); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } if ( MaxMailingLists == 0 ) { - return(0); + return; } send_template( "show_mailinglist.html" ); } -int show_mailing_list_line(char *user, char* dom, time_t mytime, char *dir) +void show_mailing_list_line(char *user, char* dom, time_t mytime, char *dir) { DIR *mydir; struct dirent *mydirent; FILE *fs; char *addr; char testfn[MAX_FILE_NAME]; - int i,j; + int i; if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -83,12 +95,12 @@ } if ( MaxMailingLists == 0 ) { - return(0); + return; } if ( (mydir = opendir(".")) == NULL ) { printf ("<tr><td>%s %d</tr><td>", get_html_text("143"), 1); - return(0); + return; } /* First display the title row */ @@ -134,7 +146,7 @@ closedir(mydir); sort_dosort(); - for (i = 0; addr = sort_get_entry(i); ++i) { + for (i = 0; (addr = sort_get_entry(i)); ++i) { sprintf (testfn, ".qmail-%s-digest-owner", addr); /* convert ':' in addr to '.' */ str_replace (addr, ':', '.'); @@ -184,13 +196,13 @@ } /* mailing list lines on the add user page */ -int show_mailing_list_line2(char *user, char *dom, time_t mytime, char *dir) +void show_mailing_list_line2(char *user, char *dom, time_t mytime, char *dir) { DIR *mydir; struct dirent *mydirent; FILE *fs; char *addr; - int i,j; + int i; int listcount; if ( AdminType!=DOMAIN_ADMIN ) { @@ -200,12 +212,12 @@ } if (*EZMLMDIR == 'n' || MaxMailingLists == 0 ) { - return(0); + return; } if ( (mydir = opendir(".")) == NULL ) { printf ("%s %d<BR>\n", get_html_text("143"), 1); - return(0); + return; } listcount = 0; @@ -231,7 +243,7 @@ /* if there aren't any lists, don't display anything */ if (listcount == 0) { sort_cleanup(); - return 0; + return; } printf ("<hr><table width=100%% cellpadding=1 cellspacing=0 border=0"); @@ -255,8 +267,7 @@ sort_cleanup(); } - -int addmailinglist(void) +void addmailinglist() { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -269,7 +280,7 @@ if ( MaxMailingLists != -1 && CurMailingLists >= MaxMailingLists ) { printf ("%s %d\n", get_html_text("184"), MaxMailingLists); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } @@ -285,7 +296,7 @@ } -int delmailinglist(void) +void delmailinglist() { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -296,9 +307,8 @@ send_template( "del_mailinglist_confirm.html" ); } -int delmailinglistnow(void) +void delmailinglistnow() { - int pid; DIR *mydir; struct dirent *mydirent; @@ -311,7 +321,7 @@ if ( (mydir = opendir(".")) == NULL ) { printf ("%s %d<BR>\n", get_html_text("143"), 1); printf ("</table>"); - return 0; + return; } /* make dotqmail name */ @@ -327,13 +337,13 @@ /* delete the main .qmail-"list" file */ if ( strcmp(TmpBuf2, mydirent->d_name) == 0 ) { if ( unlink(mydirent->d_name) != 0 ) { - ack(get_html_text("185"), TmpBuf2); + ack("185", TmpBuf2); } /* delete secondary .qmail-"list"-* files */ } else if ( strncmp(TmpBuf3, mydirent->d_name, strlen(TmpBuf3)) == 0 ) { if ( unlink(mydirent->d_name) != 0 ) { - ack(get_html_text("185"), TmpBuf2); + ack("185", TmpBuf2); } } } @@ -346,7 +356,7 @@ count_mailinglists(); snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("186"), ActionUser); if ( CurMailingLists == 0 ) { - show_menu(); + show_menu(Username, Domain, Mytime); } else { show_mailing_lists(Username, Domain, Mytime); } @@ -387,7 +397,7 @@ rename (tempfn, realfn); } -ezmlm_make (int newlist) +void ezmlm_make (int newlist) { FILE * file; int pid; @@ -582,20 +592,20 @@ /* update inlocal file */ sprintf(TmpBuf, "%s/%s/inlocal", RealDir, ActionUser); - if (file=fopen(TmpBuf, "w")) { + if ((file=fopen(TmpBuf, "w")) != NULL) { fprintf(file, "%s-%s", Domain, ActionUser); fclose(file); } } -int addmailinglistnow(void) +void addmailinglistnow() { count_mailinglists(); load_limits(); if ( MaxMailingLists != -1 && CurMailingLists >= MaxMailingLists ) { printf ("%s %d\n", get_html_text("184"), MaxMailingLists); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } @@ -614,12 +624,12 @@ show_mailing_lists(Username, Domain, Mytime); } -int show_list_group_now(int mod) +void show_list_group_now(int mod) { /* mod = 0 for subscribers, 1 for moderators, 2 for digest users */ FILE *fs; - int i,handles[2],pid,a,x,y,z = 0,z1=1,subuser_count = 0; + int handles[2],pid,z = 0,subuser_count = 0; char buf[256]; char *addr; @@ -690,13 +700,13 @@ } else { strcpy(TmpBuf, "dellistusernow"); } - for(z = 0; addr = sort_get_entry(z); ++z) { + for(z = 0; (addr = sort_get_entry(z)); ++z) { printf (" <TR align=center>"); printh (" <TD align=right><A href=\"%s/com/%s?modu=%C&newu=%C&dom=%C&user=%C&time=%d\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", CGIPATH, TmpBuf, ActionUser, addr, Domain, Username, Mytime, IMAGEURL); printh (" <TD align=left>%H</TD>\n", addr); ++z; - if(addr = sort_get_entry(z)) { + if( (addr = sort_get_entry(z)) ) { printh (" <TD align=right><A href=\"%s/com/%s?modu=%C&newu=%C&dom=%C&user=%C&time=%d\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", CGIPATH, TmpBuf, ActionUser, addr, Domain, Username, Mytime, IMAGEURL); printh (" <TD align=left>%H</TD>\n", addr); @@ -717,13 +727,7 @@ } } -/* -int show_list_users_now(void) { return show_list_group_now(0); } -int show_list_moderators_now(void) { return show_list_group_now(1); } -int show_list_digest_users_now(void) { return show_list_group_now(2); } -*/ - -int show_list_group(char *template) +void show_list_group(char *template) { if (AdminType != DOMAIN_ADMIN) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -732,19 +736,13 @@ } if (MaxMailingLists == 0) { - return 0; + return; } send_template(template); } -/* -int show_list_users(void) { return show_list_group("show_subscribers.html"); } -int show_list_digest_users(void) { return show_list_group("show_digest_subscribers.html"); } -int show_list_moderators(void) { return show_list_group("show_moderators.html"); } -*/ - -addlistgroup (char *template) +void addlistgroup (char *template) { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -754,15 +752,14 @@ send_template(template); } -addlistuser() { addlistgroup( "add_listuser.html" ); } -addlistmod() { addlistgroup( "add_listmod.html" ); } -addlistdig() { addlistgroup( "add_listdig.html" ); } +void addlistuser() { addlistgroup( "add_listuser.html" ); } +void addlistmod() { addlistgroup( "add_listmod.html" ); } +void addlistdig() { addlistgroup( "add_listdig.html" ); } -addlistgroupnow (int mod) +void addlistgroupnow (int mod) { // mod = 0 for subscribers, 1 for moderators, 2 for digest subscribers - int i, result; int pid; if ( AdminType!=DOMAIN_ADMIN ) { @@ -817,13 +814,7 @@ exit(0); } -/* -addlistusernow() { addlistgroupnow(0); } -addlistmodnow() { addlistgroupnow(1); } -addlistdignow() { addlistgroupnow(2); } -*/ - -dellistgroup(char *template) +void dellistgroup(char *template) { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -834,13 +825,8 @@ send_template(template); } -dellistuser() { dellistgroup ( "del_listuser.html" ); } -dellistmod() { dellistgroup ( "del_listmod.html" ); } -dellistdig() { dellistgroup ( "del_listdig.html" ); } - -dellistgroupnow(int mod) +void dellistgroupnow(int mod) { - int i; int pid; if ( AdminType!=DOMAIN_ADMIN ) { @@ -880,13 +866,7 @@ exit(0); } -/* -dellistusernow() { dellistgroupnow(0); } -dellistmodnow() { dellistgroupnow(1); } -dellistdignow() { dellistgroupnow(2); } -*/ - -count_mailinglists() +void count_mailinglists() { DIR *mydir; struct dirent *mydirent; @@ -895,7 +875,7 @@ if ( (mydir = opendir(".")) == NULL ) { printf ("%s %d<BR>\n", get_html_text("143"), 1); printf ("</table>"); - return(0); + return; } @@ -918,7 +898,7 @@ } -modmailinglist() +void modmailinglist() { /* name of list to modify is stored in ActionUser */ int i; @@ -978,7 +958,7 @@ } -modmailinglistnow() +void modmailinglistnow() { ezmlm_make(0); @@ -987,7 +967,7 @@ show_mailing_lists(Username, Domain, Mytime); } -build_list_value(char *param, char *color, char *opt1, char *desc1, char *opt2, char *desc2, int checked) +void build_list_value(char *param, char *color, char *opt1, char *desc1, char *opt2, char *desc2, int checked) { printf ("<tr bgcolor=%s>\n", get_color_text(color)); printf (" <td>\n"); @@ -999,7 +979,7 @@ printf ("</tr>\n"); } -build_option_str (char *type, char *param, char *options, char *description) +void build_option_str (char *type, char *param, char *options, char *description) { int selected; char *optptr; @@ -1007,7 +987,7 @@ selected = 1; for (optptr = options; *optptr; optptr++) { - selected = selected && checkopt[*optptr]; + selected = selected && checkopt[(int) *optptr]; } /* selected is now true if all options for this radio button are true */ @@ -1063,7 +1043,7 @@ } // default to false for lowercase letters - for (c = 'a'; c <= 'z'; checkopt[c++] = 0); + for (c = 'a'; c <= 'z'; checkopt[(int) c++] = 0); // figure out some options in the -default file sprintf(TmpBuf, ".qmail-%s-default", dotqmail_name); @@ -1149,7 +1129,7 @@ /* update the uppercase option letters (just the opposite of the lowercase) */ for (c = 'A'; c <= 'Z'; c++) { - checkopt[c] = !checkopt[(c - 'A' + 'a')]; + checkopt[(int) c] = !checkopt[(int) (c - 'A' + 'a')]; } } @@ -1195,15 +1175,15 @@ /* update the uppercase option letters (just the opposite of the lowercase) */ for (c = 'A'; c <= 'Z'; c++) { - checkopt[c] = !checkopt[(c - 'A' + 'a')]; + checkopt[(int) c] = !checkopt[(int) (c - 'A' + 'a')]; } } -show_current_list_values() { +void show_current_list_values() { FILE *fs; int sqlfileok = 0; int usesql = 0; - int i,j; + int i=0,j; char checked1[MAX_BUFF] = ""; char listname[128]; int checked; --- NEW FILE: limits.h --- /* * $Id: limits.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ #define LIMIT_TOKENS " :\t\r\n" void load_limits(); --- NEW FILE: mailinglist.h --- /* * $Id: mailinglist.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ #include <time.h> void addlistgroup (char *template); void addlistgroupnow (int mod); void addmailinglist(); void addmailinglistnow(); void count_mailinglists(); void dellistgroup(char *template); void dellistgroupnow(int mod); void delmailinglist(); void delmailinglistnow(); void modmailinglist(); void modmailinglistnow(); void show_list_group(char *template); void show_list_group_now(int mod); void show_mailing_lists(char *user, char *dom, time_t mytime); void show_mailing_list_line(char *user, char* dom, time_t mytime, char *dir); void show_mailing_list_line2(char *user, char *dom, time_t mytime, char *dir); void show_list_group_now(int mod); void show_current_list_values(); int get_mailinglist_prefix(char* prefix); Index: command.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/command.c,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -u -d -r1.2.2.3 -r1.2.2.4 --- command.c 14 Nov 2004 18:05:54 -0000 1.2.2.3 +++ command.c 20 Nov 2004 01:10:41 -0000 1.2.2.4 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,39 +25,47 @@ #include <unistd.h> #include <pwd.h> #include <dirent.h> + +#include <vpopmail_config.h> #include <vpopmail.h> #include <vauth.h> + +#include "alias.h" +#include "autorespond.h" +#include "cgi.h" +#include "command.h" +#include "forward.h" +#include "mailinglist.h" +#include "printh.h" #include "qmailadmin.h" #include "qmailadminx.h" -#include <vpopmail_config.h> - - +#include "show.h" +#include "user.h" +#include "util.h" -process_commands() +void process_commands() { - int pid; - if (strcmp(TmpBuf2, "showmenu") == 0 ) { show_menu(Username, Domain, Mytime); } else if (strcmp(TmpBuf2, "showusers") == 0) { GetValue(TmpCGI, Pagenumber, "page=", sizeof(Pagenumber)); GetValue(TmpCGI, SearchUser, "searchuser=", sizeof(SearchUser)); - show_users(Username, Domain, Mytime, TmpBuf2); + show_users(Username, Domain, Mytime); } else if (strcmp(TmpBuf2, "showaliases") == 0) { GetValue(TmpCGI, Pagenumber, "page=", sizeof(Pagenumber)); - show_aliases(Username, Domain, Mytime, TmpBuf2); + show_aliases(); } else if (strcmp(TmpBuf2, "showforwards") == 0) { GetValue(TmpCGI, Pagenumber, "page=", sizeof(Pagenumber)); - show_forwards(Username, Domain, Mytime, TmpBuf2); + show_forwards(Username, Domain, Mytime); } else if (strcmp(TmpBuf2, "showmailinglists") == 0) { - show_mailing_lists(Username, Domain, Mytime, TmpBuf2); + show_mailing_lists(Username, Domain, Mytime); } else if (strcmp(TmpBuf2, "showautoresponders") == 0) { - show_autoresponders(Username, Domain, Mytime, TmpBuf2); + show_autoresponders(Username, Domain, Mytime); } else if (strcmp(TmpBuf2, "adduser") == 0 ) { adduser(); @@ -265,12 +273,10 @@ exit(0); } -setdefaultaccount() +void setdefaultaccount() { struct vqpasswd *pw; FILE *fs; - int i; - int j; if ((pw = vauth_getpw( ActionUser, Domain )) == NULL) { snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H", Index: show.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/show.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- show.c 10 Oct 2003 16:36:24 -0000 1.2 +++ show.c 20 Nov 2004 01:10:41 -0000 1.2.2.1 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,19 +17,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <sys/stat.h> -#include <unistd.h> -#include <pwd.h> -#include <dirent.h> -#include "config.h" -#include "qmailadmin.h" -#include "qmailadminx.h" +#include "template.h" +#include "show.h" -show_menu(user, dom, mytime) +void show_menu(user, dom, mytime) char *user; char *dom; time_t mytime; @@ -37,7 +28,7 @@ send_template( "main_menu.html" ); } -show_login() +void show_login() { send_template( "show_login.html" ); } --- NEW FILE: forward.h --- /* * $Id: forward.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ int show_forwards(char *user, char *dom, time_t mytime); void count_forwards(); Index: forward.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/forward.c,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -u -d -r1.2.2.3 -r1.2.2.4 --- forward.c 14 Nov 2004 18:05:54 -0000 1.2.2.3 +++ forward.c 20 Nov 2004 01:10:41 -0000 1.2.2.4 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -27,13 +27,16 @@ #include <dirent.h> #include <vpopmail.h> #include <vauth.h> +#include "alias.h" #include "config.h" +#include "forward.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "template.h" +#include "show.h" +#include "util.h" -char* dotqmail_alias_command(char* command); - -int show_forwards(char *user, char *dom, time_t mytime, char *dir) +int show_forwards(char *user, char *dom, time_t mytime) { if (AdminType != DOMAIN_ADMIN) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -55,12 +58,12 @@ return 0; } -int count_forwards() +void count_forwards() { char *alias_line; - char *alias_name_from_command; char alias_name[MAX_FILE_NAME]; char this_alias[MAX_FILE_NAME]; + char *p1, *p2; int isforward; CurForwards = 0; @@ -71,8 +74,6 @@ strcpy (this_alias, alias_name); if (*alias_line == '#') { CurBlackholes++; } else { - char *p1, *p2; - int isforward; isforward = 1; while (isforward && (alias_line != NULL) && (strcmp (this_alias, alias_name) == 0)) { @@ -91,6 +92,6 @@ } } - return 0; + return; } Index: dotqmail.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/dotqmail.c,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -d -r1.2.2.2 -r1.2.2.3 --- dotqmail.c 23 Feb 2004 18:12:20 -0000 1.2.2.2 +++ dotqmail.c 20 Nov 2004 01:10:41 -0000 1.2.2.3 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies + * Copyright (C) 1999-2004 Inter7 Internet Technologies * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,6 +30,7 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION #include "config.h" +#include "dotqmail.h" #include "qmailadmin.h" #include "qmailadminx.h" @@ -132,7 +133,6 @@ int dotqmail_cleanup(char *user, char *line) { int exist = 0; - int i; if (dotqmail_open_files(user)) return(1); Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.7.2.4 retrieving revision 1.7.2.5 diff -u -d -r1.7.2.4 -r1.7.2.5 --- template.c 14 Nov 2004 18:05:55 -0000 1.7.2.4 +++ template.c 20 Nov 2004 01:10:41 -0000 1.7.2.5 @@ -1,6 +1,6 @@ -/* +/* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -33,10 +33,20 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION #include <vauth.h> -#include "printh.h" + +#include "alias.h" +#include "autorespond.h" +#include "cgi.h" #include "config.h" +#include "forward.h" +#include "limits.h" +#include "mailinglist.h" +#include "printh.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "template.h" +#include "user.h" +#include "util.h" static char dchar[4]; void check_user_forward_vacation(char newchar); @@ -62,14 +72,13 @@ int send_template_now(char *filename) { FILE *fs; - FILE *fs_qw; int i; int j; int inchar; - int testint; char *tmpstr; struct stat mystat; char qconvert[11]; + char *fmt; char *qnote = " MB"; struct vqpasswd *vpw; char value[MAX_BUFF]; @@ -114,7 +123,12 @@ break; /* found a tag */ - } else if (inchar == '#') { + } else if ((inchar == '#') || (inchar == '%')) { + if (inchar == '#') + fmt = "%H"; + else + fmt = "%C"; + inchar = fgetc(fs); if (inchar < 0) break; @@ -146,9 +160,9 @@ } break; - /* show the lines inside a alias table */ + /* show the lines inside a alias table (not used, see ##d) */ case 'b': - show_dotqmail_lines(Username,Domain,Mytime,RealDir,"alias"); + show_dotqmail_lines(Username,Domain,Mytime); break; /* send the CGIPATH parameter */ @@ -168,7 +182,7 @@ /* show the lines inside a forward table */ case 'd': - show_dotqmail_lines(Username,Domain,Mytime,RealDir,"forward"); + show_dotqmail_lines(Username,Domain,Mytime); break; /* this will be used to parse mod_mailinglist-idx.html */ @@ -191,7 +205,7 @@ alias_line = valias_select (ActionUser, Domain); /* should verify here that alias_line contains "/autorespond " */ - if (alias_line = valias_select_next()) { + if ( (alias_line = valias_select_next()) ) { strcpy (TmpBuf2, alias_line); /* See if it's a Maildir path rather than address */ @@ -213,7 +227,7 @@ upperit(ActionUser); sprintf(TmpBuf, "%s/message", ActionUser); - if ((fs = fopen(TmpBuf, "r")) == NULL) ack("123", 123); + if ((fs = fopen(TmpBuf, "r")) == NULL) ack("150", TmpBuf); fgets( TmpBuf2, sizeof(TmpBuf2), fs); fgets( TmpBuf2, sizeof(TmpBuf2), fs); @@ -242,7 +256,7 @@ /* show the forwards */ case 'f': if (AdminType == DOMAIN_ADMIN) { - show_forwards(Username,Domain,Mytime,RealDir); + show_forwards(Username,Domain,Mytime); } break; @@ -317,7 +331,7 @@ /* show the aliases stuff */ case 'l': if (AdminType == DOMAIN_ADMIN) { - show_aliases(Username,Domain,Mytime,RealDir); + show_aliases(); } break; @@ -341,7 +355,7 @@ /* show the mailing lists */ case 'm': if (AdminType == DOMAIN_ADMIN) { - show_mailing_lists(Username,Domain,Mytime,RealDir); + show_mailing_lists(Username,Domain,Mytime); } break; @@ -416,7 +430,7 @@ /* show the autoresponder stuff */ case 'r': if (AdminType == DOMAIN_ADMIN) { - show_autoresponders(Username,Domain,Mytime,RealDir); + show_autoresponders(Username,Domain,Mytime); } break; @@ -432,7 +446,7 @@ /* send the time parameter */ case 'T': - printf ("%d", Mytime); + printf ("%u", (unsigned int) Mytime); break; /* transmit block? */ @@ -447,7 +461,7 @@ /* show the users */ case 'u': - show_users(Username,Domain,Mytime,RealDir); + show_users(Username,Domain,Mytime); break; /* show version number */ @@ -508,7 +522,8 @@ * then again, with recent changes, the non-admin shouldn't * even get to this page. */ - long diskquota = 0, maxmsg = 0; + long diskquota = 0; + int maxmsg = 0; char path[256]; vpw = vauth_getpw(Username, Domain); @@ -967,7 +982,7 @@ memset(dir, 0, sizeof(dir)); retval = ""; if ( (vpw = vauth_getpw(Username, Domain)) != NULL ) { - sprintf(dir, "%s/" MAILDIR "/%d.qw", vpw->pw_dir, Mytime); + sprintf(dir, "%s/" MAILDIR "/%u.qw", vpw->pw_dir, (unsigned int) Mytime); fs_qw = fopen(dir, "r"); if ( fs_qw != NULL ) { memset(TmpBuf, 0, sizeof(TmpBuf)); --- NEW FILE: user.h --- /* * $Id: user.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ void adduser(); void addusernow(); void bounceall(); int call_hooks(char *hook_type, char *p1, char *p2, char *p3, char *p4); void count_users(); void deleteall(); void deluser(); void delusergo(); void delusernow(); int get_catchall(); void moduser(); void modusergo(); void modusernow(); void setremotecatchall(); void setremotecatchallnow(); void show_users(char *Username, char *Domain, time_t Mytime); int show_user_lines(char *user, char *dom, time_t mytime, char *dir); --- NEW FILE: util.h --- /* * $Id: util.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ int check_local_user( char *user ); int fixup_local_name( char *addr ); int check_email_addr( char *addr ); int open_lang( char *lang); int open_colortable(); char *strstart( char *sstr, char *tstr); char *safe_getenv(char *var); char *get_html_text( char *index ); char *get_color_text( char *index ); void upperit( char *instr ); void ack( char *msg, char *extra ); void show_counts(); /* prototypes for sorting functions in util.c */ int sort_init(); int sort_add_entry (char *, char); char *sort_get_entry (int); void sort_cleanup(); void sort_dosort(); void str_replace (char *, char, char); void qmail_button(char *modu, char *command, char *user, char *dom, time_t mytime, char *png); int quota_to_bytes(char[], char*); //jhopper prototype int quota_to_megabytes(char[], char*); //jhopper prototype --- NEW FILE: show.h --- /* * $Id: show.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ #include <time.h> void show_menu(char *, char *, time_t); void show_login(); --- NEW FILE: template.h --- /* * $Id: template.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ int send_template(char *actualfile); int send_template_now(char *filename); --- NEW FILE: dotqmail.h --- /* * $Id: dotqmail.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ int dotqmail_delete_files(char *user); int dotqmail_add_line(char *user, char *line); int dotqmail_del_line(char *user, char *line); #ifndef VALIAS int dotqmail_open_files(char *user); void dotqmail_close_files(char *user, int keep); int dotqmail_cleanup(char *user, char *line); int dotqmail_count(char *user); #endif --- NEW FILE: cgi.h --- /* * $Id: cgi.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ void get_cgi(); int GetValue (char *, char *, char *, int); Index: qmailadmin.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.h,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- qmailadmin.h 11 Nov 2004 07:21:49 -0000 1.1.1.1.2.2 +++ qmailadmin.h 20 Nov 2004 01:10:41 -0000 1.1.1.1.2.3 @@ -1,5 +1,6 @@ /* - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * $Id$ + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -16,6 +17,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include <time.h> + /* Some platforms use '.maildir' instead of 'Maildir' as the mail directory * name. Furture versions of Vpopmail might define it. Until then, change * it below. @@ -43,22 +46,12 @@ #define DOMAIN_ADMIN 2 #define USER_ADMIN 3 - #define NUM_SQL_OPTIONS 6 -char *get_html_text( char *index ); -int open_lang( char *lang); - -int quota_to_bytes(char[], char*); //jhopper prototype -int quota_to_megabytes(char[], char*); //jhopper prototype - -/* prototypes for sorting functions in util.c */ -int sort_init(); -int sort_add_entry (char *, char); -char *sort_get_entry (int); -void sort_cleanup(); -void sort_dosort(); -void str_replace (char *, char, char); - -void qmail_button(char *modu, char *command, char *user, char *dom, time_t mytime, char *png); +void del_id_files( char *); +void init_globals(); +/* copied from maildirquota.c in vpopmail + * it really needs to get into vpopmail.h somehow + */ +int readuserquota(const char* dir, long *sizep, int *cntp); Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.33 retrieving revision 1.15.2.34 diff -u -d -r1.15.2.33 -r1.15.2.34 --- ChangeLog 18 Nov 2004 01:55:41 -0000 1.15.2.33 +++ ChangeLog 20 Nov 2004 01:10:41 -0000 1.15.2.34 @@ -6,6 +6,13 @@ Tom Collins - Remove unnecessary name attributes in SUBMIT buttons. [869292] - configure.in: Compile with all warnings on. + - Add header files: alias.h auth.h autorespond.h cgi.h command.h + dotqmail.h forward.h limits.h mailinglist.h show.h template.h + user.h util.h. + - Modify .c files to use header files, fix function prototypes, + definitions and calls for consistent parameter passing and + return values. + - Modify code to eliminate all compiler warnings. 1.2.4 - released 15-Nov-04 Index: qmailadmin.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v retrieving revision 1.6.2.3 retrieving revision 1.6.2.4 diff -u -d -r1.6.2.3 -r1.6.2.4 --- qmailadmin.c 14 Nov 2004 18:05:55 -0000 1.6.2.3 +++ qmailadmin.c 20 Nov 2004 01:10:41 -0000 1.6.2.4 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -31,12 +31,22 @@ #undef PACKAGE_STRING #undef PACKAGE_TARNAME #undef PACKAGE_VERSION -#include "config.h" -#include "qmailadmin.h" + #include <vpopmail.h> #include <vauth.h> #include <vlimits.h> +#include "auth.h" +#include "cgi.h" +#include "command.h" +#include "config.h" +#include "limits.h" +#include "printh.h" +#include "qmailadmin.h" +#include "show.h" +#include "user.h" +#include "util.h" + char Username[MAX_BUFF]; char Domain[MAX_BUFF]; char Password[MAX_BUFF]; @@ -95,23 +105,15 @@ char RealDir[156]; char Lang[40]; -void del_id_files( char *); - -main(argc,argv) +int main(argc,argv) int argc; char *argv[]; { - const char *u; - const char *p; const char *ip_addr=getenv("REMOTE_ADDR"); const char *x_forward=getenv("HTTP_X_FORWARDED_FOR"); char *pi; int i,j; char *rm; - time_t time1; - time_t time2; - FILE *fs; - int pid; char returnhttp[MAX_BUFF]; char returntext[MAX_BUFF]; @@ -236,7 +238,7 @@ del_id_files( TmpBuf); Mytime = time(NULL); - snprintf (TmpBuf, sizeof(TmpBuf), "%s/" MAILDIR "/%d.qw", pw->pw_dir, Mytime); + snprintf (TmpBuf, sizeof(TmpBuf), "%s/" MAILDIR "/%u.qw", pw->pw_dir, (unsigned int) Mytime); fs = fopen(TmpBuf, "w"); if ( fs == NULL ) { printf ("%s %s<br>\n", get_html_text("144"), TmpBuf); @@ -270,12 +272,12 @@ } show_login(); vclose(); + + return 0; } -init_globals() +void init_globals() { - int i,j; - struct vqpasswd *pw; char *accept_lang; char *langptr, *qptr; int lang_err; @@ -400,7 +402,6 @@ { DIR *mydir; struct dirent *mydirent; - struct stat statbuf; mydir = opendir(dirname); if ( mydir == NULL ) return; --- NEW FILE: alias.h --- /* * $Id: alias.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ void adddotqmail(); void adddotqmailnow(); int adddotqmail_shared(char *forwardname, char *dest, int create); void deldotqmail(); void deldotqmailnow(); char* dotqmail_alias_command(char* command); void moddotqmail(); void moddotqmailnow(); int show_aliases(void); void show_dotqmail_lines(char *user, char *dom, time_t mytime); void show_dotqmail_file(char *user); Index: alias.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v retrieving revision 1.4.2.10 retrieving revision 1.4.2.11 diff -u -d -r1.4.2.10 -r1.4.2.11 --- alias.c 14 Nov 2004 18:05:54 -0000 1.4.2.10 +++ alias.c 20 Nov 2004 01:10:41 -0000 1.4.2.11 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -34,10 +35,17 @@ #undef PACKAGE_TARNAME #undef PACKAGE_VERSION #include <vauth.h> +#include "alias.h" #include "config.h" +#include "forward.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "dotqmail.h" +#include "limits.h" +#include "util.h" #include "printh.h" +#include "show.h" +#include "template.h" char* dotqmail_alias_command(char* command); int bkscandir(const char *dirname, @@ -70,7 +78,7 @@ struct aliasentry *firstalias = NULL, *curalias = NULL; -add_alias_entry (char *alias_name, char *alias_command) +void add_alias_entry (char *alias_name, char *alias_command) { if (firstalias == NULL) { firstalias = malloc (sizeof(struct aliasentry)); @@ -92,7 +100,7 @@ return temp; } -show_dotqmail_lines(char *user, char *dom, time_t mytime, char *dir) +void show_dotqmail_lines(char *user, char *dom, time_t mytime) { int moreusers=0; DIR *mydir; @@ -107,7 +115,9 @@ int page; struct dirent **namelist; char this_alias[MAX_FILE_NAME]; +#ifdef VALIAS char *alias_line; +#endif struct stat sbuf; if ( AdminType!=DOMAIN_ADMIN ) { @@ -171,7 +181,7 @@ if ( (mydir = opendir(".")) == NULL ) { printf ("<tr><td colspan=\"4\">"); printf ("%s %d</td></tr>", get_html_text("143"), 1); - return(0); + return; } n = bkscandir(".", &namelist, 0, qa_sort); @@ -184,7 +194,7 @@ /* check for ezmlm lists (file is symbolic link) */ memset (&sbuf, 0, sizeof(sbuf)); if (lstat (mydirent->d_name, &sbuf) == 0) { - if (sbuf.st_mode & S_IFLNK == S_IFLNK) continue; + if ((sbuf.st_mode & S_IFLNK) == S_IFLNK) continue; } if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { @@ -335,7 +345,7 @@ * with the edit mode * */ -int show_dotqmail_file(char *user) +void show_dotqmail_file(char *user) { char alias_user[MAX_BUFF]; char *alias_domain; @@ -391,7 +401,7 @@ printf ("<form method=\"post\" name=\"moddotqmail\" action=\"%s/com/moddotqmailnow\">\n", CGIPATH); printh ("<input type=\"hidden\" name=\"user\" value=\"%H\">\n", Username); printh ("<input type=\"hidden\" name=\"dom\" value=\"%H\">\n", Domain); - printf ("<input type=\"hidden\" name=\"time\" value=\"%i\">\n", Mytime); + printf ("<input type=\"hidden\" name=\"time\" value=\"%u\">\n", (unsigned int) Mytime); printh ("<input type=\"hidden\" name=\"modu\" value=\"%H\">\n", user); printh ("<input type=\"hidden\" name=\"linedata\" value=\"%H\">\n", alias_line); printf ("<input type=\"hidden\" name=\"action\" value=\"delentry\">\n"); @@ -413,7 +423,6 @@ int onevalidonly(char *user) { char *alias_line; - char *alias_name_from_command; int lines; lines=0; @@ -427,7 +436,7 @@ return (lines < 2); } -moddotqmail() +void moddotqmail() { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -437,10 +446,8 @@ send_template("mod_dotqmail.html"); } -moddotqmailnow() +void moddotqmailnow() { - struct vqpasswd *pw; - if ( strcmp(ActionUser,"default")==0) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); @@ -484,14 +491,14 @@ } } -adddotqmail() +void adddotqmail() { count_forwards(); load_limits(); if ( MaxForwards != -1 && CurForwards >= MaxForwards ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", get_html_text("157"), MaxForwards); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } @@ -499,10 +506,8 @@ } -adddotqmailnow() +void adddotqmailnow() { - struct vqpasswd *pw; - if (AdminType!=DOMAIN_ADMIN && !(AdminType==USER_ADMIN && strcmp(ActionUser, Username)==0)) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -528,7 +533,7 @@ } else { snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("152")); - show_forwards(Username,Domain,Mytime,RealDir); + show_forwards(Username,Domain,Mytime); } } @@ -588,7 +593,7 @@ return(0); } -deldotqmail() +void deldotqmail() { if ( AdminType!=DOMAIN_ADMIN ) { @@ -600,7 +605,7 @@ } -deldotqmailnow() +void deldotqmailnow() { if (AdminType!=DOMAIN_ADMIN && @@ -633,7 +638,7 @@ if(CurForwards == 0 && CurBlackholes == 0) { show_menu(Username, Domain, Mytime); } else { - show_forwards(Username,Domain,Mytime,RealDir); + show_forwards(Username,Domain,Mytime); } } Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -u -d -r1.11.2.4 -r1.11.2.5 --- user.c 14 Nov 2004 18:05:55 -0000 1.11.2.4 +++ user.c 20 Nov 2004 01:10:41 -0000 1.11.2.5 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,8 @@ #include <string.h> #include <unistd.h> #include <sys/stat.h> +#include <sys/types.h> +#include <sys/wait.h> #include <unistd.h> #include <pwd.h> #include <dirent.h> @@ -32,9 +34,17 @@ #undef PACKAGE_STRING #undef PACKAGE_TARNAME #undef PACKAGE_VERSION +#include "alias.h" +#include "cgi.h" #include "config.h" +#include "limits.h" +#include "printh.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "show.h" +#include "template.h" +#include "user.h" +#include "util.h" #include "vpopmail.h" #include "vauth.h" @@ -54,9 +64,9 @@ #define HOOK_LISTDELUSER "dellistuser" #endif -int show_users(char *Username, char *Domain, time_t Mytime) +void show_users(char *Username, char *Domain, time_t Mytime) { - if (MaxPopAccounts == 0) return 0; + if (MaxPopAccounts == 0) return; send_template("show_users.html"); } @@ -159,7 +169,8 @@ (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)))) { if (AdminType==DOMAIN_ADMIN || (AdminType==USER_ADMIN && strcmp(pw->pw_name,Username)==0)) { - long diskquota = 0, maxmsg = 0; + long diskquota = 0; + int maxmsg = 0; /* display account name and user name */ printf ("<tr bgcolor=%s>", get_color_text("000")); @@ -257,7 +268,7 @@ printf ("<form method=\"get\" action=\"%s/com/showusers\">", CGIPATH); printh ("<input type=\"hidden\" name=\"user\" value=\"%H\">", user); printh ("<input type=\"hidden\" name=\"dom\" value=\"%H\">", dom); - printf ("<input type=\"hidden\" name=\"time\" value=\"%d\">", mytime); + printf ("<input type=\"hidden\" name=\"time\" value=\"%u\">", (unsigned int) mytime); printh ("<input type=\"text\" name=\"searchuser\" value=\"%H\"> ", SearchUser); printf ("<input type=\"submit\" value=\"%s\">", get_html_text("204")); printf ("</form>"); @@ -303,7 +314,7 @@ return 0; } -adduser() +void adduser() { count_users(); load_limits(); @@ -317,7 +328,7 @@ if ( MaxPopAccounts != -1 && CurPopAccounts >= MaxPopAccounts ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", get_html_text("199"), MaxPopAccounts); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } @@ -326,7 +337,7 @@ } -moduser() +void moduser() { if (!( AdminType==DOMAIN_ADMIN || (AdminType==USER_ADMIN && strcmp(ActionUser,Username)==0))){ @@ -337,26 +348,25 @@ send_template( "mod_user.html" ); } -addusernow() +void addusernow() { - char pw[50]; int cnt=0, num; char *c_num; char **mailingListNames; char *tmp; char *email; char **arguments; - char tmpstr[MAX_BUFF]; +#ifdef MODIFY_QUOTA char qconvert[11]; +#endif int pid; - int i; - int tmpint; int error; struct vqpasswd *mypw; - char pw_shell[256]; +#ifdef MODIFY_SPAM char spamvalue[50]; static char NewBuf[156]; FILE *fs; +#endif c_num = malloc(MAX_BUFF); email = malloc(128); @@ -375,7 +385,7 @@ if ( MaxPopAccounts != -1 && CurPopAccounts >= MaxPopAccounts ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", get_html_text("199"), MaxPopAccounts); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } @@ -571,18 +581,15 @@ return (0); } -deluser() +void deluser() { send_template( "del_user_confirm.html" ); } -delusergo() +void delusergo() { static char forward[200] = ""; static char forwardto[200] = ""; - FILE *fs; - int i; - struct vqpasswd *pw; if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -611,7 +618,7 @@ show_users(Username, Domain, Mytime); } -count_users() +void count_users() { struct vqpasswd *pw; @@ -623,7 +630,7 @@ } } -setremotecatchall() +void setremotecatchall() { send_template("setremotecatchall.html"); } @@ -643,7 +650,7 @@ exit(0); } -setremotecatchallnow() +void setremotecatchallnow() { GetValue(TmpCGI,Newu, "newu=", sizeof(Newu)); @@ -665,7 +672,7 @@ set_qmaildefault ("delete"); } -int get_catchall(void) +int get_catchall() { int i,j; FILE *fs; @@ -704,18 +711,17 @@ return 0; } -modusergo() +void modusergo() { - char crypted[20]; char *tmpstr; - int i; int ret_code; - int password_updated = 0; struct vqpasswd *vpw=NULL; static char box[500]; static char NewBuf[156]; +#ifdef MODIFY_QUOTA char *quotaptr; char qconvert[11]; +#endif int count; FILE *fs; int spam_check = 0; @@ -941,7 +947,7 @@ snprintf(NewBuf,sizeof(NewBuf),"%s/vacation/message", vpw->pw_dir); GetValue(TmpCGI,Message, "vmessage=",sizeof(Message)); - if ( (fs = fopen(NewBuf, "w")) == NULL ) ack("123", 123); + if ( (fs = fopen(NewBuf, "w")) == NULL ) ack("150", NewBuf); fprintf(fs, "From: %s@%s\n", ActionUser,Domain); fprintf(fs, "Subject: %s\n\n", box); fprintf(fs, "%s", Message); Index: autorespond.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/autorespond.c,v retrieving revision 1.3.2.2 retrieving revision 1.3.2.3 diff -u -d -r1.3.2.2 -r1.3.2.3 --- autorespond.c 14 Nov 2004 18:05:54 -0000 1.3.2.2 +++ autorespond.c 20 Nov 2004 01:10:41 -0000 1.3.2.3 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,6 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include <ctype.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -27,17 +28,22 @@ #include <dirent.h> #include <vpopmail.h> #include <vauth.h> +#include "autorespond.h" #include "config.h" +#include "limits.h" +#include "printh.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "show.h" +#include "template.h" +#include "util.h" -show_autoresponders(user,dom,mytime,dir) +void show_autoresponders(user,dom,mytime) char *user; char *dom; time_t mytime; - char *dir; { - if ( MaxAutoResponders == 0 ) return(0); + if ( MaxAutoResponders == 0 ) return; count_autoresponders(); @@ -49,12 +55,12 @@ } } -int show_autorespond_line(char *user, char *dom, time_t mytime, char *dir) +void show_autorespond_line(char *user, char *dom, time_t mytime, char *dir) { char *addr; char alias_name[MAX_FILE_NAME]; char *alias_line; - int i,j; + int i; sort_init(); @@ -68,7 +74,7 @@ sort_dosort(); - for (i = 0; addr = sort_get_entry(i); ++i) { + for (i = 0; (addr = sort_get_entry(i)); ++i) { printf ("<tr>"); printf ("<td align=\"center\">"); @@ -90,7 +96,7 @@ sort_cleanup(); } -addautorespond() +void addautorespond() { if ( AdminType!=DOMAIN_ADMIN ) { @@ -103,7 +109,7 @@ load_limits(); if ( MaxAutoResponders != -1 && CurAutoResponders >= MaxAutoResponders ) { printf ("%s %d\n", get_html_text("158"), MaxAutoResponders); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } @@ -112,11 +118,9 @@ } -addautorespondnow() +void addautorespondnow() { FILE *fs; - int i; - struct vqpasswd *vpw; if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -128,7 +132,7 @@ load_limits(); if ( MaxAutoResponders != -1 && CurAutoResponders >= MaxAutoResponders ) { printf ("%s %d\n", get_html_text("158"), MaxAutoResponders); - show_menu(); + show_menu(Username, Domain, Mytime); vclose(); exit(0); } @@ -179,7 +183,7 @@ * Make the autoresponder message file */ sprintf(TmpBuf, "%s/message", TmpBuf2); - if ( (fs = fopen(TmpBuf, "w")) == NULL ) ack("123", 123); + if ( (fs = fopen(TmpBuf, "w")) == NULL ) ack("150", TmpBuf); fprintf(fs, "From: %s@%s\n", ActionUser,Domain); fprintf(fs, "Subject: %s\n\n", Alias); fprintf(fs, "%s", Message); @@ -193,7 +197,7 @@ show_autoresponders(Username, Domain, Mytime); } -delautorespond() +void delautorespond() { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -203,10 +207,9 @@ send_template( "del_autorespond_confirm.html" ); } -delautorespondnow() +void delautorespondnow() { int i; - int pid; if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -240,7 +243,7 @@ } } -modautorespond() +void modautorespond() { if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -252,11 +255,9 @@ /* addautorespondnow and modautorespondnow should be merged into a single function */ -modautorespondnow() +void modautorespondnow() { FILE *fs; - int i; - struct vqpasswd *vpw; if ( AdminType!=DOMAIN_ADMIN ) { snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); @@ -306,7 +307,7 @@ * Make the autoresponder message file */ sprintf(TmpBuf, "%s/message", TmpBuf2); - if ( (fs = fopen(TmpBuf, "w")) == NULL ) ack("123", 123); + if ( (fs = fopen(TmpBuf, "w")) == NULL ) ack("150", TmpBuf); fprintf(fs, "From: %s@%s\n", ActionUser,Domain); fprintf(fs, "Subject: %s\n\n", Alias); fprintf(fs, "%s", Message); @@ -320,7 +321,7 @@ show_autoresponders(Username, Domain, Mytime); } -count_autoresponders() +void count_autoresponders() { char alias_name[MAX_FILE_NAME]; char *alias_line; Index: util.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/util.c,v retrieving revision 1.4.2.2 retrieving revision 1.4.2.3 diff -u -d -r1.4.2.2 -r1.4.2.3 --- util.c 14 Nov 2004 18:05:55 -0000 1.4.2.2 +++ util.c 20 Nov 2004 01:10:41 -0000 1.4.2.3 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,9 +25,20 @@ #include <unistd.h> #include <pwd.h> #include <dirent.h> +#include <ctype.h> + +#include <vpopmail.h> + +#include "alias.h" +#include "autorespond.h" #include "config.h" +#include "forward.h" +#include "mailinglist.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "printh.h" +#include "user.h" +#include "util.h" extern FILE *lang_fs; extern FILE *color_table; @@ -72,6 +83,7 @@ } *sort_ptr++ = 0; /* NULL terminator */ memleft -= len; + return 0; } char *sort_get_entry(int index) { @@ -109,7 +121,7 @@ printf ("</td>\n"); } -check_local_user( user ) +int check_local_user( user ) char *user; { struct stat buf; @@ -133,7 +145,7 @@ return(0); } -show_counts() +void show_counts() { count_users(); count_forwards(); @@ -146,7 +158,7 @@ printf ("%s = %d<BR>\n", get_html_text("080"), CurMailingLists); } -check_email_addr( addr ) +int check_email_addr( addr ) char *addr; { char *taddr = addr; @@ -179,7 +191,7 @@ return(0); } -fixup_local_name( addr ) +int fixup_local_name( addr ) char *addr; { char *taddr = addr; @@ -205,17 +217,17 @@ return(0); } -ack(msg, c) +void ack(msg, extra) char *msg; - int c; + char *extra; { - printf ("%s\n", msg); - printf ("</BODY></HTML>\n", msg); + printf ("%s %s\n", get_html_text(msg), extra); + printf ("</BODY></HTML>\n"); vclose(); exit(0); } -upperit( instr ) +void upperit( instr ) char *instr; { while(*instr!=0) { @@ -354,11 +366,10 @@ return value: 0 for success, 1 for failure */ int quota_to_bytes(char returnval[], char *quota) { - char *tmpstr; double tmp; if (quota == NULL) { return 1; } - if (tmp = atof(quota)) { + if ((tmp = atof(quota))) { tmp *= 1048576; sprintf(returnval, "%.0lf", tmp); return 0; @@ -372,7 +383,6 @@ return value: 0 for success, 1 for failure */ int quota_to_megabytes(char *returnval, char *quota) { - char *tmpstr; double tmp; int i; @@ -382,7 +392,7 @@ tmp = atol(quota); /* already in megabytes */ } else if ((quota[i-1] == 'K') || (quota[i-1] == 'k')) { tmp = atol(quota) * 1024; /* convert kilobytes to megabytes */ - } else if (tmp = atol(quota)) { + } else if ((tmp = atol(quota))) { tmp /= 1048576.0; } else { strcpy (returnval, ""); --- NEW FILE: auth.h --- /* * $Id: auth.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ void auth_system (const char *ip_addr, struct vqpasswd *pw); void auth_user_domain (const char *ip_addr, struct vqpasswd *pw); void set_admin_type(); Index: qmailadminx.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadminx.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- qmailadminx.h 24 Apr 2004 01:06:40 -0000 1.2.2.1 +++ qmailadminx.h 20 Nov 2004 01:10:41 -0000 1.2.2.2 @@ -1,5 +1,6 @@ /* - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * $Id$ + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,6 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +#include <sys/types.h> +#include <unistd.h> +#include <stdio.h> #include <vauth.h> #include <vlimits.h> @@ -75,8 +79,4 @@ extern int Gid; extern char RealDir[156]; -extern char *strstart(); -extern char *safe_getenv(); extern char Lang[40]; -void del_id_files( char *); -int open_lang( char *lang); Index: cgi.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/cgi.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- cgi.c 14 Nov 2004 18:05:54 -0000 1.2.2.1 +++ cgi.c 20 Nov 2004 01:10:41 -0000 1.2.2.2 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,11 +25,14 @@ #include <unistd.h> #include <pwd.h> #include <dirent.h> +#include <ctype.h> #include "config.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "cgi.h" +#include "util.h" -get_cgi() +void get_cgi() { int count; int i,j; @@ -88,8 +91,8 @@ } else if (source[j+1]=='0'&&source[j+2]=='A'){ dest[k] = '\n'; } else { - dest[k] = (CGIValues[source[j+1]]<<4) + - CGIValues[source[j+2]]; + dest[k] = (CGIValues[(int) source[j+1]]<<4) + + CGIValues[(int) source[j+2]]; } j += 2; } else if ( source[j] == '+' ) { --- NEW FILE: autorespond.h --- /* * $Id: autorespond.h,v 1.1.2.1 2004/11/20 01:10:41 tomcollins Exp $ */ #include <time.h> void addautorespond(); void addautorespondnow(); void count_autoresponders(); void delautorespond(); void delautorespondnow(); void modautorespond(); void modautorespondnow(); void show_autoresponders(char *user, char *dom, time_t mytime); void show_autorespond_line(char *user, char *dom, time_t mytime, char *dir); Index: auth.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/auth.c,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -d -r1.3.2.3 -r1.3.2.4 --- auth.c 14 Nov 2004 18:05:54 -0000 1.3.2.3 +++ auth.c 20 Nov 2004 01:10:41 -0000 1.3.2.4 @@ -1,6 +1,6 @@ /* * $Id$ - * Copyright (C) 1999-2002 Inter7 Internet Technologies, Inc. + * Copyright (C) 1999-2004 Inter7 Internet Technologies, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,11 +30,14 @@ #include "qmailadminx.h" #include <vpopmail.h> #include <vauth.h> +#include "cgi.h" +#include "show.h" +#include "util.h" -extern char *crypt(); +//extern char *crypt(); -auth_system(ip_addr, pw) - char *ip_addr; +void auth_system(ip_addr, pw) + const char *ip_addr; struct vqpasswd *pw; { FILE *fs; @@ -87,8 +90,8 @@ } } -auth_user_domain(ip_addr,pw) - char *ip_addr; +void auth_user_domain(ip_addr,pw) + const char *ip_addr; struct vqpasswd *pw; { FILE *fs; @@ -143,7 +146,7 @@ } -set_admin_type() +void set_admin_type() { struct vqpasswd *vpw=NULL; |
|
From: Tom C. <tom...@us...> - 2004-11-18 01:56:06
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26723 Modified Files: Tag: stable-1_2 ChangeLog configure.in configure Log Message: Compile with all warnings on. Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.32 retrieving revision 1.15.2.33 diff -u -d -r1.15.2.32 -r1.15.2.33 --- ChangeLog 15 Nov 2004 19:23:07 -0000 1.15.2.32 +++ ChangeLog 18 Nov 2004 01:55:41 -0000 1.15.2.33 @@ -5,6 +5,7 @@ Tom Collins - Remove unnecessary name attributes in SUBMIT buttons. [869292] + - configure.in: Compile with all warnings on. 1.2.4 - released 15-Nov-04 Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.14.2.8 retrieving revision 1.14.2.9 diff -u -d -r1.14.2.8 -r1.14.2.9 --- configure 15 Nov 2004 19:04:51 -0000 1.14.2.8 +++ configure 18 Nov 2004 01:55:53 -0000 1.14.2.9 @@ -4031,6 +4031,9 @@ done +if test "$GCC" = yes ; then + CFLAGS="$CFLAGS -Wall" +fi CGIBINTARGETS=qmailadmin Index: configure.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v retrieving revision 1.15.2.8 retrieving revision 1.15.2.9 diff -u -d -r1.15.2.8 -r1.15.2.9 --- configure.in 15 Nov 2004 19:04:50 -0000 1.15.2.8 +++ configure.in 18 Nov 2004 01:55:53 -0000 1.15.2.9 @@ -45,6 +45,9 @@ #AC_FUNC_STAT AC_CHECK_FUNCS([dup2 memset mkdir strcasecmp strchr strdup strncasecmp strrchr strstr]) +if test "$GCC" = yes ; then + CFLAGS="$CFLAGS -Wall" +fi CGIBINTARGETS=qmailadmin AC_SUBST(CGIBINTARGETS) |
|
From: Tom C. <tom...@us...> - 2004-11-17 19:42:20
|
Update of /cvsroot/qmailadmin/qmailadmin/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3361 Modified Files: Tag: stable-1_2 en Log Message: minor change to wording related to adding moderator and digest subscriber Index: en =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/lang/en,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- en 26 Aug 2004 00:43:52 -0000 1.2.2.1 +++ en 17 Nov 2004 19:42:10 -0000 1.2.2.2 @@ -159,7 +159,7 @@ 191 List of moderator email addresses on mailing list 192 Back to main menu 193 added to mailing list -194 Email address added as a moderator to mailing list +194 added as a moderator to mailing list 195 Delete subscriber from mailing list 196 Delete moderator from mailing list 197 removed as a moderator for mailing list @@ -205,7 +205,7 @@ 237 Add<br>Digest Subscriber 238 Delete<br>Digest Subscriber 239 Show<br>Digest Subscribers -240 Email address added as a digest subscriber to mailing list +240 added as a digest subscriber to mailing list 241 Add Digest Subscriber to mailing list 242 removed from digest mailing list 243 Delete digest subscriber from mailing list |
Update of /cvsroot/qmailadmin/qmailadmin/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5113/html Modified Files: Tag: stable-1_2 add_autorespond.html add_forward.html add_listdig.html add_listmod.html add_listuser.html add_mailinglist-idx.html add_mailinglist-no-idx.html add_user.html del_autorespond_confirm.html del_forward_confirm.html del_listdig.html del_listmod.html del_listuser.html del_mailinglist_confirm.html del_user_confirm.html mod_autorespond.html mod_dotqmail.html mod_mailinglist-idx.html mod_user.html setremotecatchall.html show_login.html Log Message: Remove unnecessary name attributes in SUBMIT buttons. [869292] Index: add_forward.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_forward.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_forward.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_forward.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -54,7 +54,7 @@ <td> </td> <td> </td> <td align="right"> - <input type="submit" value="##X060" name="##X060"> + <input type="submit" value="##X060"> </td> </tr> </table> Index: del_forward_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_forward_confirm.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- del_forward_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 +++ del_forward_confirm.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -25,7 +25,7 @@ <h3>##X100 ##A@##D?</h3> <form method="post" name="deleteforwar" action="##C/com/deldotqmailnow?##&"> <input type="hidden" name="modu" value="##A"> - <input type="submit" name="##X097" value="##X097"> + <input type="submit" value="##X097"> </form> <div align="right"> <hr> Index: mod_autorespond.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_autorespond.html,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -u -d -r1.1.1.1.2.3 -r1.1.1.1.2.4 --- mod_autorespond.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.3 +++ mod_autorespond.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.4 @@ -42,7 +42,7 @@ <td align=right><b>##X005</b> </td> <td><input type="text" size="40" name="owner" maxlength="128" ##F <input type="hidden" name="newu" value="##A"> - <input type="submit" name="do.login" value="##X105"> + <input type="submit" value="##X105"> </form> <div align="right"> <hr> Index: add_listuser.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_listuser.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_listuser.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_listuser.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -41,7 +41,7 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="submit" value="##X060" name="do.login"> + <input type="submit" value="##X060"> </form> <div align="right"> <hr> Index: add_autorespond.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_autorespond.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_autorespond.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_autorespond.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -48,7 +48,7 @@ </tr> </table> <textarea cols="80" rows="10" name="message"></textarea> - <input type="submit" value="##X060" name="##X060"> + <input type="submit" value="##X060"> </form> <div align="right"> <hr> Index: mod_mailinglist-idx.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_mailinglist-idx.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- mod_mailinglist-idx.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ mod_mailinglist-idx.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -48,7 +48,7 @@ <!-- options for the mailing list --> ##E <input type="hidden" name="newu" value="##A"> - <DIV ALIGN=RIGHT><input type="submit" name="##X071" value="##X071"></DIV> + <DIV ALIGN=RIGHT><input type="submit" value="##X071"></DIV> </form> <div align="right"> <hr> Index: mod_user.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_user.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- mod_user.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ mod_user.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -204,7 +204,7 @@ <tr> <td colspan=2 align=right> - <input type="submit" name="##X111" value="##X111"> + <input type="submit" value="##X111"> </td> </tr> </table> Index: add_mailinglist-no-idx.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_mailinglist-no-idx.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_mailinglist-no-idx.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_mailinglist-no-idx.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -46,7 +46,7 @@ checked> ##X039</td> </tr> </table> - <input type="submit" value="##X060" name="##X060"> + <input type="submit" value="##X060"> </form> <div align="right"> <hr> Index: del_autorespond_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_autorespond_confirm.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- del_autorespond_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 +++ del_autorespond_confirm.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -25,7 +25,7 @@ <h3>##X098 ##A@##D?</h3> <form method="post" name="logon" action="##C/com/delautorespondnow?##&"> <input type="hidden" name="modu" value="##A"> - <input type="submit" name="##X097" value="##X098"> + <input type="submit" value="##X098"> </form> <div align="right"> <hr> Index: show_login.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_login.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- show_login.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ show_login.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -47,7 +47,7 @@ <td colspan="2" align="right"> <input type="hidden" name="returnhttp" value="##y"> <input type="hidden" name="returntext" value="##Y"> - <input type="submit" name="##X114" value="##X114"> + <input type="submit" value="##X114"> </td> </tr> </table> Index: del_mailinglist_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_mailinglist_confirm.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- del_mailinglist_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 +++ del_mailinglist_confirm.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -25,7 +25,7 @@ <h3>##X101 ##A@##D?</h3> <form method="post" name="logon" action="##C/com/delmailinglistnow?##&"> <input type="hidden" name="modu" value="##A"> - <input type="submit" name="##X097" value="##X097"> + <input type="submit" value="##X097"> </form> <div align="right"> <hr> Index: add_mailinglist-idx.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_mailinglist-idx.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_mailinglist-idx.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_mailinglist-idx.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -49,7 +49,7 @@ </table> <!-- options for the mailing list --> ##E - <DIV ALIGN=RIGHT><input type="submit" value="##X060" name="##X060"></DIV> + <DIV ALIGN=RIGHT><input type="submit" value="##X060"></DIV> </form> <div align="right"> <hr> Index: del_listdig.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_listdig.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- del_listdig.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 +++ del_listdig.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -31,7 +31,7 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="submit" name="do.login" value="##X072"> + <input type="submit" value="##X072"> </form> <div align="right"> <hr> Index: del_listuser.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_listuser.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- del_listuser.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 +++ del_listuser.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -31,7 +31,7 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="submit" name="do.login" value="##X072"> + <input type="submit" value="##X072"> </form> <div align="right"> <hr> Index: del_listmod.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_listmod.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- del_listmod.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 +++ del_listmod.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -31,7 +31,7 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="submit" name="do.login" value="##X072"> + <input type="submit" value="##X072"> </form> <div align="right"> <hr> Index: add_listdig.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_listdig.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_listdig.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_listdig.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -41,7 +41,7 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="submit" value="##X060" name="do.login"> + <input type="submit" value="##X060"> </form> <div align="right"> <hr> Index: add_user.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_user.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_user.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_user.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -66,7 +66,7 @@ ##tt </table> ##c - <input type="submit" value="##X060" name="##X060"> + <input type="submit" value="##X060"> </form> <div align="right"> <hr> Index: setremotecatchall.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/setremotecatchall.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- setremotecatchall.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ setremotecatchall.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -39,7 +39,7 @@ <td><input type="text" name="newu" size="16" maxlength="128"></td> </tr> </table> - <input type="submit" name="##X060" value="##X060"> + <input type="submit" value="##X060"> </form> <div align="right"> <hr> Index: mod_dotqmail.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_dotqmail.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- mod_dotqmail.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ mod_dotqmail.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -53,7 +53,7 @@ <td align="right"> <input type="hidden" name="modu" value="##A"> <input type="hidden" name="action" value="add"> - <input type="submit" value="##X060" name="##X060"></td> + <input type="submit" value="##X060"></td> </tr> </form> <tr> Index: add_listmod.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_listmod.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- add_listmod.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 +++ add_listmod.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.3 @@ -41,7 +41,7 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="submit" value="##X060" name="##X060"> + <input type="submit" value="##X060"> </form> <div align="right"> <hr> Index: del_user_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_user_confirm.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- del_user_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 +++ del_user_confirm.html 15 Nov 2004 19:23:16 -0000 1.1.1.1.2.2 @@ -32,7 +32,7 @@ </tr> </table> <input type="hidden" name="deluser" value="##A"> - <input type="submit" name="##097" value="##X097"> + <input type="submit" value="##X097"> </form> <div align="right"> <hr> |
|
From: Tom C. <tom...@us...> - 2004-11-15 19:23:26
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5113 Modified Files: Tag: stable-1_2 ChangeLog Log Message: Remove unnecessary name attributes in SUBMIT buttons. [869292] Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.31 retrieving revision 1.15.2.32 diff -u -d -r1.15.2.31 -r1.15.2.32 --- ChangeLog 15 Nov 2004 19:04:46 -0000 1.15.2.31 +++ ChangeLog 15 Nov 2004 19:23:07 -0000 1.15.2.32 @@ -3,6 +3,9 @@ 1.2.5 - unreleased + Tom Collins + - Remove unnecessary name attributes in SUBMIT buttons. [869292] + 1.2.4 - released 15-Nov-04 Tom Collins |
|
From: Tom C. <tom...@us...> - 2004-11-15 19:05:31
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv719 Modified Files: Tag: stable-1_2 ChangeLog configure.in configure Log Message: Start 1.2.5 release Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.30 retrieving revision 1.15.2.31 diff -u -d -r1.15.2.30 -r1.15.2.31 --- ChangeLog 15 Nov 2004 18:41:12 -0000 1.15.2.30 +++ ChangeLog 15 Nov 2004 19:04:46 -0000 1.15.2.31 @@ -1,6 +1,8 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. +1.2.5 - unreleased + 1.2.4 - released 15-Nov-04 Tom Collins Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.14.2.7 retrieving revision 1.14.2.8 diff -u -d -r1.14.2.7 -r1.14.2.8 --- configure 19 Oct 2004 15:39:42 -0000 1.14.2.7 +++ configure 15 Nov 2004 19:04:51 -0000 1.14.2.8 @@ -1647,7 +1647,7 @@ QA_PACKAGE="qmailadmin" -QA_VERSION="1.2.4" +QA_VERSION="1.2.5" cat >>confdefs.h <<_ACEOF Index: configure.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v retrieving revision 1.15.2.7 retrieving revision 1.15.2.8 diff -u -d -r1.15.2.7 -r1.15.2.8 --- configure.in 19 Oct 2004 15:39:42 -0000 1.15.2.7 +++ configure.in 15 Nov 2004 19:04:50 -0000 1.15.2.8 @@ -6,7 +6,7 @@ AC_CANONICAL_HOST QA_PACKAGE="qmailadmin" -QA_VERSION="1.2.4" +QA_VERSION="1.2.5" AC_DEFINE_UNQUOTED(QA_PACKAGE,"$QA_PACKAGE","") AC_DEFINE_UNQUOTED(QA_VERSION,"$QA_VERSION","") |
|
From: Tom C. <tom...@us...> - 2004-11-15 18:41:21
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28077 Modified Files: Tag: stable-1_2 ChangeLog Log Message: set release date of 1.2.4 Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.29 retrieving revision 1.15.2.30 diff -u -d -r1.15.2.29 -r1.15.2.30 --- ChangeLog 14 Nov 2004 18:05:54 -0000 1.15.2.29 +++ ChangeLog 15 Nov 2004 18:41:12 -0000 1.15.2.30 @@ -1,7 +1,7 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. -1.2.4 - unreleased +1.2.4 - released 15-Nov-04 Tom Collins - Modify contrib/alias2forward.pl to work with '/Maildir' or |
Update of /cvsroot/qmailadmin/qmailadmin/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19361/html Modified Files: Tag: stable-1_2 add_autorespond.html add_forward.html add_listdig.html add_listmod.html add_listuser.html add_mailinglist-idx.html add_mailinglist-no-idx.html add_user.html del_autorespond_confirm.html del_forward_confirm.html del_listdig.html del_listmod.html del_listuser.html del_mailinglist_confirm.html del_user_confirm.html main_menu.html mod_autorespond.html mod_dotqmail.html mod_mailinglist-idx.html mod_user.html setremotecatchall.html show_autorespond.html show_digest_subscribers.html show_forwards.html show_mailinglist.html show_moderators.html show_subscribers.html show_users.html Log Message: Major update to code and html files to properly escape strings for HTML display and as paramters to cgi scripts. See ChangeLog for details. Index: add_forward.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_forward.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_forward.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_forward.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -32,7 +32,7 @@ <!-- Form fields --> <tr> <td align="left"> - <form method="post" name="addforward" action="##C/com/adddotqmailnow"> + <form method="post" name="addforward" action="##C/com/adddotqmailnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td align=left><b>##X106</b></td> @@ -54,9 +54,6 @@ <td> </td> <td> </td> <td align="right"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" value="##X060" name="##X060"> </td> </tr> @@ -66,9 +63,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showforwards?user=##U&dom=##D&time=##T&">##X122</a> + <a href="##C/com/showforwards?##&">##X122</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: mod_mailinglist-idx.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_mailinglist-idx.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- mod_mailinglist-idx.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ mod_mailinglist-idx.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -34,7 +34,7 @@ <!-- Form fields --> <tr> <td align="left"> - <form method="get" name="modmailinglistnow" action="##C/com/modmailinglistnow"> + <form method="post" name="modmailinglistnow" action="##C/com/modmailinglistnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td ALIGN=RIGHT><b>##X017</b></td> @@ -48,18 +48,15 @@ <!-- options for the mailing list --> ##E <input type="hidden" name="newu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <DIV ALIGN=RIGHT><input type="submit" name="##X071" value="##X071"></DIV> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: show_mailinglist.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_mailinglist.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- show_mailinglist.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ show_mailinglist.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -27,9 +27,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/addmailinglist?user=##U&dom=##D&time=##T">##X089</a> + <a href="##C/com/addmailinglist?##&">##X089</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: add_autorespond.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_autorespond.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_autorespond.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_autorespond.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -32,7 +32,7 @@ <!-- Form fields --> <tr> <td align="left"> - <form method="post" name="addautorespond" action="##C/com/addautorespondnow"> + <form method="post" name="addautorespond" action="##C/com/addautorespondnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td align="right"><b>##X004 </b></td> @@ -48,18 +48,15 @@ </tr> </table> <textarea cols="80" rows="10" name="message"></textarea> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" value="##X060" name="##X060"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showautoresponders?user=##U&dom=##D&time=##T&">##X077</a> + <a href="##C/com/showautoresponders?##&">##X077</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: del_listmod.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_listmod.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- del_listmod.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ del_listmod.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -23,7 +23,7 @@ <tr> <td> <h3>##X196 ##A@##D?</h3> - <form method="post" name="dellistusernow" action="##C/com/dellistmodnow"> + <form method="post" name="dellistusernow" action="##C/com/dellistmodnow?##&"> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td><b>##X013</b> </td> @@ -31,18 +31,15 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" name="do.login" value="##X072"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: del_autorespond_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_autorespond_confirm.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- del_autorespond_confirm.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ del_autorespond_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -23,11 +23,7 @@ <tr> <td> <h3>##X098 ##A@##D?</h3> - <form method="post" name="logon" action="##C/com/delautorespondnow"> - <input type="hidden" name="do.login" value="Delete Autorespond"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> + <form method="post" name="logon" action="##C/com/delautorespondnow?##&"> <input type="hidden" name="modu" value="##A"> <input type="submit" name="##X097" value="##X098"> </form> @@ -35,9 +31,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showautoresponders?user=##U&dom=##D&time=##T&">##X077</a> + <a href="##C/com/showautoresponders?##&">##X077</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: mod_autorespond.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_autorespond.html,v retrieving revision 1.1.1.1.2.2 retrieving revision 1.1.1.1.2.3 diff -u -d -r1.1.1.1.2.2 -r1.1.1.1.2.3 --- mod_autorespond.html 7 Sep 2004 05:07:45 -0000 1.1.1.1.2.2 +++ mod_autorespond.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.3 @@ -32,7 +32,7 @@ <!-- Form fields --> <tr> <td> - <form method="post" name="modautorespond" action="##C/com/modautorespondnow"> + <form method="post" name="modautorespond" action="##C/com/modautorespondnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td align=right><b>##X004</b> </td> @@ -42,18 +42,15 @@ <td align=right><b>##X005</b> </td> <td><input type="text" size="40" name="owner" maxlength="128" ##F <input type="hidden" name="newu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" name="do.login" value="##X105"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showautoresponders?user=##U&dom=##D&time=##T&">##X077</a> + <a href="##C/com/showautoresponders?##&">##X077</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: show_digest_subscribers.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_digest_subscribers.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- show_digest_subscribers.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ show_digest_subscribers.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -34,9 +34,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: del_listuser.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_listuser.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- del_listuser.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ del_listuser.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -23,7 +23,7 @@ <tr> <td> <h3>##X195 ##A@##D?</h3> - <form method="post" name="dellistusernow" action="##C/com/dellistusernow"> + <form method="post" name="dellistusernow" action="##C/com/dellistusernow?##&"> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td><b>##X013</b> </td> @@ -31,18 +31,15 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" name="do.login" value="##X072"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: add_mailinglist-no-idx.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_mailinglist-no-idx.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_mailinglist-no-idx.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_mailinglist-no-idx.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -32,7 +32,7 @@ <!-- Form fields --> <tr> <td align="left"> - <form method="get" name="addmailinglist" action="##C/com/addmailinglistnow"> + <form method="post" name="addmailinglist" action="##C/com/addmailinglistnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td align=right><b>##X016 </b></td> @@ -46,18 +46,15 @@ checked> ##X039</td> </tr> </table> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" value="##X060" name="##X060"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: add_listdig.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_listdig.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_listdig.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_listdig.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -33,7 +33,7 @@ <tr> <td> <center><h3>##X241 ##A@##D</h3></center> - <form method="post" name="addlistdignow" action="##C/com/addlistdignow"> + <form method="post" name="addlistdignow" action="##C/com/addlistdignow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td><b>##X013 </b></td> @@ -41,18 +41,15 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" value="##X060" name="do.login"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: show_moderators.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_moderators.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- show_moderators.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ show_moderators.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -34,9 +34,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: mod_dotqmail.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_dotqmail.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- mod_dotqmail.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ mod_dotqmail.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -38,7 +38,7 @@ </table> <table cellpadding="5" cellspacing="1" border="0" width="100%"> <!-- Form fields --> - <form method="post" name="moddotqmail" action="##C/com/moddotqmailnow"> + <form method="post" name="moddotqmail" action="##C/com/moddotqmailnow?##&"> <tr> <td valign=top> <b>##X108</b> @@ -51,9 +51,6 @@ <tr> <td> </td> <td align="right"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="hidden" name="modu" value="##A"> <input type="hidden" name="action" value="add"> <input type="submit" value="##X060" name="##X060"></td> @@ -65,9 +62,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showforwards?user=##U&dom=##D&time=##T&">##X122</a> + <a href="##C/com/showforwards?##&">##X122</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: del_user_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_user_confirm.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- del_user_confirm.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ del_user_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -23,7 +23,7 @@ <tr> <td> <h3>##X102 ##A@##D?</h3> - <form method="post" name="logon" action="##C/com/delusernow"> + <form method="post" name="logon" action="##C/com/delusernow?##&"> <input type="checkbox" name="forward"> ##X103<br> <table border="0" cellspacing="0" cellpadding="0"> <tr> @@ -31,10 +31,6 @@ <td><input type="text" name="forwardto" value=""></td> </tr> </table> - <input type="hidden" name="do.login" value="DeleteUser"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="hidden" name="deluser" value="##A"> <input type="submit" name="##097" value="##X097"> </form> @@ -42,9 +38,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showusers?user=##U&dom=##D&time=##T&">##X061</a> + <a href="##C/com/showusers?##&">##X061</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: del_forward_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_forward_confirm.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- del_forward_confirm.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ del_forward_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -23,11 +23,7 @@ <tr> <td> <h3>##X100 ##A@##D?</h3> - <form method="post" name="deleteforwar" action="##C/com/deldotqmailnow"> - <input type="hidden" name="do.login" value="Delete Forward"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> + <form method="post" name="deleteforwar" action="##C/com/deldotqmailnow?##&"> <input type="hidden" name="modu" value="##A"> <input type="submit" name="##X097" value="##X097"> </form> @@ -35,9 +31,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showforwards?user=##U&dom=##D&time=##T&">##X122</a> + <a href="##C/com/showforwards?##&">##X122</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: show_autorespond.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_autorespond.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- show_autorespond.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ show_autorespond.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -33,9 +33,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/addautorespond?user=##U&dom=##D&time=##T">##X079</a> + <a href="##C/com/addautorespond?##&">##X079</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: show_forwards.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_forwards.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- show_forwards.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ show_forwards.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -34,9 +34,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/adddotqmail?atype=forward&user=##U&dom=##D&time=##T">##X076</a> + <a href="##C/com/adddotqmail?atype=forward&##&">##X076</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: show_users.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_users.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- show_users.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ show_users.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -40,9 +40,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/adduser?user=##U&time=##T&dom=##D">##X067</a> + <a href="##C/com/adduser?##&">##X067</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: mod_user.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/mod_user.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- mod_user.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ mod_user.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -91,12 +91,8 @@ <!-- Form fields --> <tr> <td> - <form method="post" name="logon" action="##C/com/modusernow"> + <form method="post" name="logon" action="##C/com/modusernow?##&"> <input type="hidden" name="modu" value="##A"> - <input type="hidden" name="do.login" value="ChangePassword"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <table cellpadding="1" cellspacing="1" border="0"> <tr> <td align="right">##X092:</td> @@ -228,9 +224,9 @@ <font size="2"><b> [ ##ta - <a href="##C/com/showusers?user=##U&dom=##D&time=##T&">##X061</a> + <a href="##C/com/showusers?##&">##X061</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##tt ##x Index: add_listuser.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_listuser.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_listuser.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_listuser.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -33,7 +33,7 @@ <tr> <td> <center><h3>##X014 ##A@##D</h3></center> - <form method="post" name="addlistusernow" action="##C/com/addlistusernow"> + <form method="post" name="addlistusernow" action="##C/com/addlistusernow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td><b>##X013 </b></td> @@ -41,18 +41,15 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" value="##X060" name="do.login"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: del_mailinglist_confirm.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_mailinglist_confirm.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- del_mailinglist_confirm.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ del_mailinglist_confirm.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -23,11 +23,7 @@ <tr> <td> <h3>##X101 ##A@##D?</h3> - <form method="post" name="logon" action="##C/com/delmailinglistnow"> - <input type="hidden" name="do.login" value="Delete Forward"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> + <form method="post" name="logon" action="##C/com/delmailinglistnow?##&"> <input type="hidden" name="modu" value="##A"> <input type="submit" name="##X097" value="##X097"> </form> @@ -35,9 +31,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: add_user.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_user.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_user.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_user.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -32,7 +32,7 @@ <!-- Form fields --> <tr> <td> - <form method="post" name="logon" action="##C/com/addusernow"> + <form method="post" name="logon" action="##C/com/addusernow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td align=right><b>##X002: </b></td> @@ -66,19 +66,15 @@ ##tt </table> ##c - <input type="hidden" name="do.login" value="Add"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" value="##X060" name="##X060"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showusers?user=##U&dom=##D&time=##T&">##X061</a> + <a href="##C/com/showusers?##&">##X061</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: del_listdig.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/del_listdig.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- del_listdig.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ del_listdig.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -23,7 +23,7 @@ <tr> <td> <h3>##X243 ##A@##D?</h3> - <form method="post" name="dellistdignow" action="##C/com/dellistdignow"> + <form method="post" name="dellistdignow" action="##C/com/dellistdignow?##&"> <table border="0" cellspacing="0" cellpadding="0"> <tr> <td><b>##X013</b> </td> @@ -31,18 +31,15 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" name="do.login" value="##X072"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: add_mailinglist-idx.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_mailinglist-idx.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_mailinglist-idx.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_mailinglist-idx.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -32,7 +32,7 @@ <!-- Form fields --> <tr> <td align="left"> - <form method="get" name="addmailinglist" action="##C/com/addmailinglistnow"> + <form method="post" name="addmailinglist" action="##C/com/addmailinglistnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td ALIGN=RIGHT><b>##X016</b></td> @@ -49,18 +49,15 @@ </table> <!-- options for the mailing list --> ##E - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <DIV ALIGN=RIGHT><input type="submit" value="##X060" name="##X060"></DIV> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: show_subscribers.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/show_subscribers.html,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- show_subscribers.html 8 Dec 2003 17:54:37 -0000 1.2 +++ show_subscribers.html 14 Nov 2004 18:05:55 -0000 1.2.2.1 @@ -34,9 +34,9 @@ <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: setremotecatchall.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/setremotecatchall.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- setremotecatchall.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ setremotecatchall.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -32,25 +32,22 @@ <!-- Form fields --> <tr> <td> - <form method="post" name="addforward" action="##C/com/setremotecatchallnow"> + <form method="post" name="addforward" action="##C/com/setremotecatchallnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td>##X208 </td> <td><input type="text" name="newu" size="16" maxlength="128"></td> </tr> </table> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" name="##X060" value="##X060"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showusers?user=##U&dom=##D&time=##T&">##X061</a> + <a href="##C/com/showusers?##&">##X061</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: add_listmod.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/add_listmod.html,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- add_listmod.html 18 Feb 2004 18:44:39 -0000 1.1.1.1.2.1 +++ add_listmod.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.2 @@ -33,7 +33,7 @@ <tr> <td> <center><h3>##X012 ##A@##D</h3></center> - <form method="post" name="addlistmodnow" action="##C/com/addlistmodnow"> + <form method="post" name="addlistmodnow" action="##C/com/addlistmodnow?##&"> <table cellpadding="0" cellspacing="0" border="0"> <tr> <td><b>##X013 </b></td> @@ -41,18 +41,15 @@ </tr> </table> <input type="hidden" name="modu" value="##A"> - <input type="hidden" name="user" value="##U"> - <input type="hidden" name="dom" value="##D"> - <input type="hidden" name="time" value="##T"> <input type="submit" value="##X060" name="##X060"> </form> <div align="right"> <hr> <font size="2"><b> [ - <a href="##C/com/showmailinglists?user=##U&dom=##D&time=##T&">##X080</a> + <a href="##C/com/showmailinglists?##&">##X080</a> | - <a href="##C/com/showmenu?user=##U&dom=##D&time=##T&">##X001</a> + <a href="##C/com/showmenu?##&">##X001</a> | ##x ] Index: main_menu.html =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/html/main_menu.html,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- main_menu.html 10 Sep 2003 21:38:44 -0000 1.1.1.1 +++ main_menu.html 14 Nov 2004 18:05:55 -0000 1.1.1.1.2.1 @@ -24,7 +24,7 @@ <br> <br> <br> - <br><a href="##C/com/showmenu?user=##U&dom=##D&time=##T&"><font size="2" color="#000000"><b>##X217</b></font></a> + <br><a href="##C/com/showmenu?##&"><font size="2" color="#000000"><b>##X217</b></font></a> <br><span style="font-weight: bold; font-size: medium;">##x</span> <br> </td> |
|
From: Tom C. <tom...@us...> - 2004-11-14 18:06:08
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19361 Modified Files: Tag: stable-1_2 ChangeLog alias.c auth.c autorespond.c cgi.c command.c forward.c mailinglist.c printh.c qmailadmin.c template.c user.c util.c Log Message: Major update to code and html files to properly escape strings for HTML display and as paramters to cgi scripts. See ChangeLog for details. Index: forward.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/forward.c,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -d -r1.2.2.2 -r1.2.2.3 --- forward.c 24 Apr 2004 01:06:40 -0000 1.2.2.2 +++ forward.c 14 Nov 2004 18:05:54 -0000 1.2.2.3 @@ -36,7 +36,7 @@ int show_forwards(char *user, char *dom, time_t mytime, char *dir) { if (AdminType != DOMAIN_ADMIN) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -44,7 +44,7 @@ count_forwards(); if(CurForwards == 0 && CurBlackholes == 0) { - sprintf(StatusMessage,"%s", get_html_text("232")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("232")); show_menu(Username, Domain, Mytime); vclose(); exit(0); Index: mailinglist.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -u -d -r1.5 -r1.5.2.1 --- mailinglist.c 4 Dec 2003 15:22:33 -0000 1.5 +++ mailinglist.c 14 Nov 2004 18:05:54 -0000 1.5.2.1 @@ -47,7 +47,7 @@ int show_mailing_lists(char *user, char *dom, time_t mytime) { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -55,7 +55,7 @@ /* see if there's anything to display */ count_mailinglists(); if ( CurMailingLists == 0 ) { - sprintf(StatusMessage,"%s", get_html_text("231")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("231")); show_menu(); vclose(); exit(0); @@ -77,7 +77,7 @@ int i,j; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -87,29 +87,29 @@ } if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"<tr><td>%s %d</tr><td>", get_html_text("143"), 1); + printf ("<tr><td>%s %d</tr><td>", get_html_text("143"), 1); return(0); } /* First display the title row */ - fprintf(actout, "<tr bgcolor=\"#cccccc\">"); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("072")); + printf ("<tr bgcolor=\"#cccccc\">"); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("072")); #ifdef EZMLMIDX - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("071")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("071")); #endif - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("081")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("083")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("084")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("085")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("081")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("083")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("084")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("085")); #ifdef EZMLMIDX - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("086")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("087")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("088")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("237")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("238")); - fprintf(actout, "<th align=center><font size=2>%s</font></th>", get_html_text("239")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("086")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("087")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("088")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("237")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("238")); + printf ("<th align=center><font size=2>%s</font></th>", get_html_text("239")); #endif - fprintf(actout, "</tr>\n"); + printf ("</tr>\n"); sort_init(); @@ -118,9 +118,9 @@ if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { #ifdef EZMLMIDX - fprintf(actout, "<tr><td colspan=12>%s %s</td></tr>\n", get_html_text("144"), mydirent->d_name); + printf ("<tr><td colspan=12>%s %s</td></tr>\n", get_html_text("144"), mydirent->d_name); #else - fprintf(actout, "<tr><td colspan=5>%s %s</td></tr>\n", get_html_text("144"), mydirent->d_name); + printf ("<tr><td colspan=5>%s %s</td></tr>\n", get_html_text("144"), mydirent->d_name); #endif continue; } @@ -139,13 +139,13 @@ /* convert ':' in addr to '.' */ str_replace (addr, ':', '.'); - fprintf(actout,"<tr>"); + printf ("<tr>"); qmail_button(addr, "delmailinglist", user, dom, mytime, "trash.png"); #ifdef EZMLMIDX qmail_button(addr, "modmailinglist", user, dom, mytime, "modify.png"); #endif - fprintf(actout,"<td align=left>%s</td>\n", addr); + printh ("<td align=left>%H</td>\n", addr); qmail_button(addr, "addlistuser", user, dom, mytime, "delete.png"); qmail_button(addr, "dellistuser", user, dom, mytime, "delete.png"); @@ -159,7 +159,7 @@ /* Is it a digest list? */ if ( (fs=fopen(testfn,"r"))==NULL) { /* not a digest list */ - fprintf (actout, "<TD COLSPAN=3> </TD>"); + printf ("<TD COLSPAN=3> </TD>"); } else { qmail_button(addr, "addlistdig", user, dom, mytime, "delete.png"); qmail_button(addr, "dellistdig", user, dom, mytime, "delete.png"); @@ -167,7 +167,7 @@ fclose(fs); } #endif - fprintf(actout, "</tr>\n"); + printf ("</tr>\n"); } sort_cleanup(); } @@ -194,7 +194,7 @@ int listcount; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -204,7 +204,7 @@ } if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"%s %d<BR>\n", get_html_text("143"), 1); + printf ("%s %d<BR>\n", get_html_text("143"), 1); return(0); } @@ -214,7 +214,7 @@ while( (mydirent=readdir(mydir)) != NULL ) { if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout,"%s %s<br>\n", + printf ("%s %s<br>\n", get_html_text("144"), mydirent->d_name); continue; } @@ -234,24 +234,24 @@ return 0; } - fprintf(actout,"<hr><table width=100%% cellpadding=1 cellspacing=0 border=0"); - fprintf(actout," align=center bgcolor=\"#000000\"><tr><td>"); - fprintf(actout,"<table width=100%% cellpadding=0 cellspacing=0 border=0 bgcolor=\"#e6e6e6\">"); - fprintf(actout,"<tr><th bgcolor=\"#000000\" colspan=2>"); - fprintf(actout,"<font color=\"#ffffff\">%s</font></th>\n", + printf ("<hr><table width=100%% cellpadding=1 cellspacing=0 border=0"); + printf (" align=center bgcolor=\"#000000\"><tr><td>"); + printf ("<table width=100%% cellpadding=0 cellspacing=0 border=0 bgcolor=\"#e6e6e6\">"); + printf ("<tr><th bgcolor=\"#000000\" colspan=2>"); + printf ("<font color=\"#ffffff\">%s</font></th>\n", get_html_text("095")); sort_dosort(); - fprintf(actout, "<INPUT NAME=number_of_mailinglist TYPE=hidden VALUE=%d>\n", listcount); + printf ("<INPUT NAME=number_of_mailinglist TYPE=hidden VALUE=%d>\n", listcount); for (i = 0; i < listcount; ++i) { addr = sort_get_entry(i); str_replace (addr, ':', '.'); - fprintf(actout,"<TR><TD ALIGN=RIGHT><INPUT NAME=\"subscribe%d\" TYPE=checkbox VALUE=%s></TD>", i, addr); - fprintf(actout,"<TD align=LEFT>%s@%s</TD></TR>", addr, Domain); + printh ("<TR><TD ALIGN=RIGHT><INPUT NAME=\"subscribe%d\" TYPE=checkbox VALUE=\"%H\"></TD>", i, addr); + printh ("<TD align=LEFT>%H@%H</TD></TR>", addr, Domain); } - fprintf(actout,"</table></td></tr></table>\n"); + printf ("</table></td></tr></table>\n"); sort_cleanup(); } @@ -259,7 +259,7 @@ int addmailinglist(void) { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -267,7 +267,7 @@ count_mailinglists(); load_limits(); if ( MaxMailingLists != -1 && CurMailingLists >= MaxMailingLists ) { - fprintf(actout, "%s %d\n", get_html_text("184"), + printf ("%s %d\n", get_html_text("184"), MaxMailingLists); show_menu(); vclose(); @@ -288,7 +288,7 @@ int delmailinglist(void) { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -303,14 +303,14 @@ struct dirent *mydirent; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"%s %d<BR>\n", get_html_text("143"), 1); - fprintf(actout,"</table>"); + printf ("%s %d<BR>\n", get_html_text("143"), 1); + printf ("</table>"); return 0; } @@ -344,7 +344,7 @@ vdelfiles(TmpBuf2); count_mailinglists(); - sprintf(StatusMessage, "%s %s\n", get_html_text("186"), ActionUser); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("186"), ActionUser); if ( CurMailingLists == 0 ) { show_menu(); } else { @@ -413,13 +413,13 @@ char listopt[] = "A D hIj L N pQRST "; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } if ( fixup_local_name(ActionUser) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("188"), ActionUser); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("188"), ActionUser); addmailinglist(); vclose(); exit(0); @@ -593,7 +593,7 @@ count_mailinglists(); load_limits(); if ( MaxMailingLists != -1 && CurMailingLists >= MaxMailingLists ) { - fprintf(actout, "%s %d\n", get_html_text("184"), + printf ("%s %d\n", get_html_text("184"), MaxMailingLists); show_menu(); vclose(); @@ -601,7 +601,7 @@ } if ( check_local_user(ActionUser) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("175"), ActionUser); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("175"), ActionUser); addmailinglist(); vclose(); exit(0); @@ -609,7 +609,7 @@ ezmlm_make(1); - sprintf(StatusMessage, "%s %s@%s\n", get_html_text("187"), + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H\n", get_html_text("187"), ActionUser, Domain); show_mailing_lists(Username, Domain, Mytime); } @@ -624,7 +624,7 @@ char *addr; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -672,16 +672,16 @@ /* strcpy(TmpBuf2, "084"); */ } strcpy(TmpBuf2, "072"); - fprintf(actout,"<TABLE border=0 width=\"100%%\">\n"); - fprintf(actout," <TR>\n"); - fprintf(actout," <TH align=left COLSPAN=4><B>%s</B> %d<BR><BR></TH>\n", get_html_text(TmpBuf), subuser_count); - fprintf(actout," </TR>\n"); - fprintf(actout," <TR align=center bgcolor=%s>\n", get_color_text("002")); - fprintf(actout," <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf2)); - fprintf(actout," <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf1)); - fprintf(actout," <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf2)); - fprintf(actout," <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf1)); - fprintf(actout," </TR>\n"); + printf ("<TABLE border=0 width=\"100%%\">\n"); + printf (" <TR>\n"); + printf (" <TH align=left COLSPAN=4><B>%s</B> %d<BR><BR></TH>\n", get_html_text(TmpBuf), subuser_count); + printf (" </TR>\n"); + printf (" <TR align=center bgcolor=%s>\n", get_color_text("002")); + printf (" <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf2)); + printf (" <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf1)); + printf (" <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf2)); + printf (" <TH align=center><b><font size=2>%s</font></b></TH>\n", get_html_text(TmpBuf1)); + printf (" </TR>\n"); if(mod == 1) { strcpy(TmpBuf, "dellistmodnow"); @@ -691,28 +691,28 @@ strcpy(TmpBuf, "dellistusernow"); } for(z = 0; addr = sort_get_entry(z); ++z) { - fprintf(actout," <TR align=center>"); - fprintf(actout," <TD align=right><A href=\"%s/com/%s?modu=%s&newu=%s&dom=%s&user=%s&time=%d\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", + printf (" <TR align=center>"); + printh (" <TD align=right><A href=\"%s/com/%s?modu=%C&newu=%C&dom=%C&user=%C&time=%d\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", CGIPATH, TmpBuf, ActionUser, addr, Domain, Username, Mytime, IMAGEURL); - fprintf(actout," <TD align=left>%s</TD>\n", addr); + printh (" <TD align=left>%H</TD>\n", addr); ++z; if(addr = sort_get_entry(z)) { - fprintf(actout," <TD align=right><A href=\"%s/com/%s?modu=%s&newu=%s&dom=%s&user=%s&time=%d\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", + printh (" <TD align=right><A href=\"%s/com/%s?modu=%C&newu=%C&dom=%C&user=%C&time=%d\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", CGIPATH, TmpBuf, ActionUser, addr, Domain, Username, Mytime, IMAGEURL); - fprintf(actout," <TD align=left>%s</TD>\n", addr); + printh (" <TD align=left>%H</TD>\n", addr); } else { - fprintf(actout," <TD COLSPAN=2> </TD>"); + printf (" <TD COLSPAN=2> </TD>"); } - fprintf(actout," </TR>"); + printf (" </TR>"); } sort_cleanup(); - fprintf(actout,"</TABLE>"); + printf ("</TABLE>"); fclose(fs); close(handles[0]); wait(&pid); - sprintf(StatusMessage, "%s\n", get_html_text("190")); - fprintf(actout, get_html_text("END_LIST_NAMES")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("190")); + /* printf (get_html_text("END_LIST_NAMES")); */ } } @@ -726,7 +726,7 @@ int show_list_group(char *template) { if (AdminType != DOMAIN_ADMIN) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -747,7 +747,7 @@ addlistgroup (char *template) { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -766,7 +766,7 @@ int pid; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -774,7 +774,7 @@ lowerit(ActionUser); if ( check_email_addr(Newu) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("148"), Newu); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("148"), Newu); if (mod == 1) { addlistmod(); } else if (mod == 2) { @@ -801,15 +801,15 @@ } else wait(&pid); if(mod == 1 ) { - sprintf(StatusMessage, "%s %s %s@%s\n", Newu, + snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("194"), ActionUser, Domain); send_template( "add_listmod.html" ); } else if(mod == 2) { - sprintf(StatusMessage, "%s %s %s@%s\n", Newu, + snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("240"), ActionUser, Domain); send_template( "add_listdig.html" ); } else { - sprintf(StatusMessage, "%s %s %s@%s\n", Newu, + snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("193"), ActionUser, Domain); send_template( "add_listuser.html" ); } @@ -826,7 +826,7 @@ dellistgroup(char *template) { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -844,7 +844,7 @@ int pid; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -866,13 +866,13 @@ } else wait(&pid); if(mod == 1) { - sprintf(StatusMessage, "%s %s %s@%s\n", Newu, get_html_text("197"), + snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("197"), ActionUser, Domain); } else if(mod == 2) { - sprintf(StatusMessage, "%s %s %s@%s\n", Newu, get_html_text("242"), + snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("242"), ActionUser, Domain); } else { - sprintf(StatusMessage, "%s %s %s@%s\n", Newu, get_html_text("203"), + snprinth (StatusMessage, sizeof(StatusMessage), "%H %s %H@%H\n", Newu, get_html_text("203"), ActionUser, Domain); } show_mailing_lists(Username, Domain, Mytime); @@ -893,8 +893,8 @@ FILE *fs; if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"%s %d<BR>\n", get_html_text("143"), 1); - fprintf(actout,"</table>"); + printf ("%s %d<BR>\n", get_html_text("143"), 1); + printf ("</table>"); return(0); } @@ -903,7 +903,7 @@ while( (mydirent=readdir(mydir)) != NULL ) { if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout, get_html_text("144"), + printf (get_html_text("144"), mydirent->d_name); continue; } @@ -925,7 +925,7 @@ FILE *fs; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -982,21 +982,21 @@ { ezmlm_make(0); - sprintf(StatusMessage, "%s %s@%s\n", get_html_text("226"), + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H\n", get_html_text("226"), ActionUser, Domain); show_mailing_lists(Username, Domain, Mytime); } build_list_value(char *param, char *color, char *opt1, char *desc1, char *opt2, char *desc2, int checked) { - fprintf(actout, "<tr bgcolor=%s>\n", get_color_text(color)); - fprintf(actout, " <td>\n"); - fprintf(actout, " <input type=radio name=%s value=%s%s></td>\n", param, opt1, checked ? "" : " CHECKED"); - fprintf(actout, " <td>%s</td>\n", get_html_text(desc1)); - fprintf(actout, " <td>\n"); - fprintf(actout, " <input type=radio name=%s value=%s%s></td>\n", param, opt2, checked ? " CHECKED" : ""); - fprintf(actout, " <td>%s</td>\n", get_html_text(desc2)); - fprintf(actout, "</tr>\n"); + printf ("<tr bgcolor=%s>\n", get_color_text(color)); + printf (" <td>\n"); + printf (" <input type=radio name=%s value=%s%s></td>\n", param, opt1, checked ? "" : " CHECKED"); + printf (" <td>%s</td>\n", get_html_text(desc1)); + printf (" <td>\n"); + printf (" <input type=radio name=%s value=%s%s></td>\n", param, opt2, checked ? " CHECKED" : ""); + printf (" <td>%s</td>\n", get_html_text(desc2)); + printf ("</tr>\n"); } build_option_str (char *type, char *param, char *options, char *description) @@ -1011,7 +1011,7 @@ } /* selected is now true if all options for this radio button are true */ - fprintf(actout, "<INPUT TYPE=%s NAME=\"%s\" VALUE=\"%s\"%s> %s\n", + printh ("<INPUT TYPE=%s NAME=\"%H\" VALUE=\"%H\"%s> %s\n", type, param, options, selected ? " CHECKED" : "", description); } @@ -1223,95 +1223,95 @@ */ if (*dotqmail_name) { /* modifying an existing list */ - strcpy (listname, dotqmail_name); + snprinth (listname, sizeof(listname), "%H", dotqmail_name); str_replace (listname, ':', '.'); } else { sprintf (listname, "<I>%s</I>", get_html_text("261")); } /* Posting Messages */ - fprintf(actout, "<P><B><U>%s</U></B><BR>\n", get_html_text("262")); + printf ("<P><B><U>%s</U></B><BR>\n", get_html_text("262")); build_option_str ("RADIO", "opt1", "MU", get_html_text("263")); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); build_option_str ("RADIO", "opt1", "Mu", get_html_text("264")); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); build_option_str ("RADIO", "opt1", "mu", get_html_text("265")); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); build_option_str ("RADIO", "opt1", "mUo", get_html_text("266")); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); build_option_str ("RADIO", "opt1", "mUO", get_html_text("267")); - fprintf(actout, "</P>\n"); + printf ("</P>\n"); /* List Options */ - fprintf(actout, "<P><B><U>%s</U></B><BR>\n", get_html_text("268")); + printf ("<P><B><U>%s</U></B><BR>\n", get_html_text("268")); /* this next option isn't necessary since we use the edit box to * set/delete the prefix sprintf (TmpBuf, get_html_text("269"), listname); build_option_str ("CHECKBOX", "opt3", "f", TmpBuf); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); */ - fprintf(actout, "<TABLE><TR><TD ROWSPAN=3 VALIGN=TOP>%s</TD>", + printf ("<TABLE><TR><TD ROWSPAN=3 VALIGN=TOP>%s</TD>", get_html_text("310")); - fprintf(actout, "<TD><INPUT TYPE=RADIO NAME=\"replyto\" VALUE=\"%d\"%s>%s</TD></TR>\n", + printf ("<TD><INPUT TYPE=RADIO NAME=\"replyto\" VALUE=\"%d\"%s>%s</TD></TR>\n", REPLYTO_SENDER, (replyto == REPLYTO_SENDER) ? " CHECKED" : "", get_html_text("311")); - fprintf(actout, "<TR><TD><INPUT TYPE=RADIO NAME=\"replyto\" VALUE=\"%d\"%s>%s</TD></TR>\n", + printf ("<TR><TD><INPUT TYPE=RADIO NAME=\"replyto\" VALUE=\"%d\"%s>%s</TD></TR>\n", REPLYTO_LIST, (replyto == REPLYTO_LIST) ? " CHECKED" : "", get_html_text("312")); - fprintf(actout, "<TR><TD><INPUT TYPE=RADIO NAME=\"replyto\" VALUE=\"%d\"%s>%s ", + printf ("<TR><TD><INPUT TYPE=RADIO NAME=\"replyto\" VALUE=\"%d\"%s>%s ", REPLYTO_ADDRESS, (replyto == REPLYTO_ADDRESS) ? " CHECKED" : "", get_html_text("313")); - fprintf(actout, "<INPUT TYPE=TEXT NAME=\"replyaddr\" VALUE=\"%s\" SIZE=30></TD></TR>\n", + printh ("<INPUT TYPE=TEXT NAME=\"replyaddr\" VALUE=\"%H\" SIZE=30></TD></TR>\n", replyto_addr); - fprintf(actout, "</TABLE><BR>\n"); + printf ("</TABLE><BR>\n"); build_option_str ("CHECKBOX", "opt4", "t", get_html_text("270")); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); build_option_str ("CHECKBOX", "opt5", "d", get_html_text("271")); sprintf (TmpBuf, get_html_text("272"), listname); - fprintf(actout, "<SMALL>(%s)</SMALL>", TmpBuf); - fprintf(actout, "<BR>\n"); + printf ("<SMALL>(%s)</SMALL>", TmpBuf); + printf ("<BR>\n"); sprintf (TmpBuf, get_html_text("273"), listname); build_option_str ("CHECKBOX", "opt6", "q", TmpBuf); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); sprintf (TmpBuf, get_html_text("274"), listname, listname, listname); - fprintf(actout, " <SMALL>(%s)</SMALL></P>", TmpBuf); + printf (" <SMALL>(%s)</SMALL></P>", TmpBuf); /* Remote Administration */ - fprintf(actout, "<P><B><U>%s</U></B><BR>\n", get_html_text("275")); + printf ("<P><B><U>%s</U></B><BR>\n", get_html_text("275")); build_option_str ("CHECKBOX", "opt7", "r", get_html_text("276")); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); build_option_str ("CHECKBOX", "opt8", "P", get_html_text("277")); - fprintf(actout, "<SMALL>(%s)</SMALL><BR>", get_html_text("278")); - fprintf(actout, "<TABLE><TR><TD ROWSPAN=2 VALIGN=TOP>%s</TD>", + printf ("<SMALL>(%s)</SMALL><BR>", get_html_text("278")); + printf ("<TABLE><TR><TD ROWSPAN=2 VALIGN=TOP>%s</TD>", get_html_text("279")); - fprintf(actout, "<TD>"); + printf ("<TD>"); build_option_str ("CHECKBOX", "opt9", "l", get_html_text("280")); - fprintf(actout, "</TD>\n</TR><TR>\n<TD>"); + printf ("</TD>\n</TR><TR>\n<TD>"); build_option_str ("CHECKBOX", "opt10", "n", get_html_text("281")); - fprintf(actout, "<SMALL>(%s)</SMALL>.</TD>\n", get_html_text("282")); - fprintf(actout, "</TR></TABLE>\n</P>\n"); + printf ("<SMALL>(%s)</SMALL>.</TD>\n", get_html_text("282")); + printf ("</TR></TABLE>\n</P>\n"); - fprintf(actout, "<P><B><U>%s</U></B><BR>\n", get_html_text("283")); - fprintf(actout, "%s<BR>\n ", get_html_text("284")); + printf ("<P><B><U>%s</U></B><BR>\n", get_html_text("283")); + printf ("%s<BR>\n ", get_html_text("284")); build_option_str ("CHECKBOX", "opt11", "H", get_html_text("285")); - fprintf(actout, "<BR>\n "); + printf ("<BR>\n "); build_option_str ("CHECKBOX", "opt12", "s", get_html_text("286")); - fprintf(actout, "<BR>\n%s<BR>\n ", get_html_text("287")); + printf ("<BR>\n%s<BR>\n ", get_html_text("287")); build_option_str ("CHECKBOX", "opt13", "J", get_html_text("285")); - fprintf(actout, "<BR>\n"); - fprintf(actout, "<SMALL>%s</SMALL>\n</P>\n", get_html_text("288")); + printf ("<BR>\n"); + printf ("<SMALL>%s</SMALL>\n</P>\n", get_html_text("288")); - fprintf(actout, "<P><B><U>%s</U></B><BR>\n", get_html_text("289")); + printf ("<P><B><U>%s</U></B><BR>\n", get_html_text("289")); build_option_str ("CHECKBOX", "opt14", "a", get_html_text("290")); - fprintf(actout, "<BR>\n"); + printf ("<BR>\n"); /* note that if user doesn't have ezmlm-cgi installed, it might be a good idea to default to having option i off. */ build_option_str ("CHECKBOX", "opt15", "i", get_html_text("291")); - fprintf(actout, "<BR>\n%s\n<SELECT NAME=\"opt15\">", get_html_text("292")); - fprintf(actout, "<OPTION VALUE=\"BG\"%s>%s\n", + printf ("<BR>\n%s\n<SELECT NAME=\"opt15\">", get_html_text("292")); + printf ("<OPTION VALUE=\"BG\"%s>%s\n", checkopt['B'] && checkopt['G'] ? " SELECTED" : "", get_html_text("293")); - fprintf(actout, "<OPTION VALUE=\"Bg\"%s>%s\n", + printf ("<OPTION VALUE=\"Bg\"%s>%s\n", checkopt['B'] && checkopt['g'] ? " SELECTED" : "", get_html_text("294")); - fprintf(actout, "<OPTION VALUE=\"b\"%s>%s\n", + printf ("<OPTION VALUE=\"b\"%s>%s\n", checkopt['b'] ? " SELECTED" : "", get_html_text("295")); - fprintf(actout, "</SELECT>.</P>\n"); + printf ("</SELECT>.</P>\n"); /***********************/ /* begin MySQL options */ @@ -1333,15 +1333,15 @@ fclose(fs); } #ifdef ENABLE_MYSQL - fprintf(actout, "<P><B><U>%s</U></B><BR>\n", get_html_text("099")); - fprintf(actout, "<input type=checkbox name=\"sqlsupport\" value=\"-6\"%s> %s", + printf ("<P><B><U>%s</U></B><BR>\n", get_html_text("099")); + printf ("<input type=checkbox name=\"sqlsupport\" value=\"-6\"%s> %s", checked ? " CHECKED" : "", get_html_text("053")); /* parse dir/sql file for SQL settings */ - fprintf(actout, " <table cellpadding=0 cellspacing=2 border=0>\n"); + printf (" <table cellpadding=0 cellspacing=2 border=0>\n"); #else if (checked) - fprintf(actout, "<INPUT TYPE=HIDDEN NAME=sqlsupport VALUE=\"-6\">\n"); + printf ("<INPUT TYPE=HIDDEN NAME=sqlsupport VALUE=\"-6\">\n"); #endif /* get hostname */ @@ -1355,12 +1355,12 @@ } #ifdef ENABLE_MYSQL - fprintf(actout, " <tr>\n"); - fprintf(actout, " <td ALIGN=RIGHT>%s:\n", get_html_text("054")); - fprintf(actout, " </td><td>\n"); - fprintf(actout, " <input type=text name=sql1 value=\"%s\"></td>\n", checked1); + printf (" <tr>\n"); + printf (" <td ALIGN=RIGHT>%s:\n", get_html_text("054")); + printf (" </td><td>\n"); + printh (" <input type=text name=sql1 value=\"%H\"></td>\n", checked1); #else - fprintf(actout, "<INPUT TYPE=HIDDEN NAME=sql1 VALUE=\"%s\">\n", checked1); + printh ("<INPUT TYPE=HIDDEN NAME=sql1 VALUE=\"%H\">\n", checked1); #endif /* get port */ @@ -1373,12 +1373,12 @@ } } #ifdef ENABLE_MYSQL - fprintf(actout, " <td ALIGN=RIGHT>%s:\n", get_html_text("055")); - fprintf(actout, " </td><td>\n"); - fprintf(actout, " <input type=text size=7 name=sql2 value=\"%s\"></td>\n", checked1); - fprintf(actout, " </tr>\n"); + printf (" <td ALIGN=RIGHT>%s:\n", get_html_text("055")); + printf (" </td><td>\n"); + printh (" <input type=text size=7 name=sql2 value=\"%H\"></td>\n", checked1); + printf (" </tr>\n"); #else - fprintf(actout, "<INPUT TYPE=HIDDEN NAME=sql2 VALUE=\"%s\">\n", checked1); + printh ("<INPUT TYPE=HIDDEN NAME=sql2 VALUE=\"%H\">\n", checked1); #endif /* get user */ @@ -1391,12 +1391,12 @@ } } #ifdef ENABLE_MYSQL - fprintf(actout, " <tr>\n"); - fprintf(actout, " <td ALIGN=RIGHT>%s:\n", get_html_text("056")); - fprintf(actout, " </td><td>\n"); - fprintf(actout, " <input type=text name=sql3 value=\"%s\"></td>\n", checked1); + printf (" <tr>\n"); + printf (" <td ALIGN=RIGHT>%s:\n", get_html_text("056")); + printf (" </td><td>\n"); + printh (" <input type=text name=sql3 value=\"%H\"></td>\n", checked1); #else - fprintf(actout, "<INPUT TYPE=HIDDEN NAME=sql3 VALUE=\"%s\">\n", checked1); + printh ("<INPUT TYPE=HIDDEN NAME=sql3 VALUE=\"%H\">\n", checked1); #endif /* get password */ @@ -1409,12 +1409,12 @@ } } #ifdef ENABLE_MYSQL - fprintf(actout, " <td ALIGN=RIGHT>%s:\n", get_html_text("057")); - fprintf(actout, " </td><td>\n"); - fprintf(actout, " <input type=text name=sql4 value=\"%s\"></td>\n", checked1); - fprintf(actout, " </tr>\n"); + printf (" <td ALIGN=RIGHT>%s:\n", get_html_text("057")); + printf (" </td><td>\n"); + printh (" <input type=text name=sql4 value=\"%H\"></td>\n", checked1); + printf (" </tr>\n"); #else - fprintf(actout, "<INPUT TYPE=HIDDEN NAME=sql4 VALUE=\"%s\">\n", checked1); + printh ("<INPUT TYPE=HIDDEN NAME=sql4 VALUE=\"%H\">\n", checked1); #endif /* get database name */ @@ -1427,12 +1427,12 @@ } } #ifdef ENABLE_MYSQL - fprintf(actout, " <tr>\n"); - fprintf(actout, " <td ALIGN=RIGHT>%s:\n", get_html_text("058")); - fprintf(actout, " </td><td>\n"); - fprintf(actout, " <input type=text name=sql5 value=\"%s\"></td>\n", checked1); + printf (" <tr>\n"); + printf (" <td ALIGN=RIGHT>%s:\n", get_html_text("058")); + printf (" </td><td>\n"); + printh (" <input type=text name=sql5 value=\"%H\"></td>\n", checked1); #else - fprintf(actout, "<INPUT TYPE=HIDDEN NAME=sql5 VALUE=\"%s\">\n", checked1); + printh ("<INPUT TYPE=HIDDEN NAME=sql5 VALUE=\"%H\">\n", checked1); #endif /* get table name */ @@ -1445,13 +1445,13 @@ } } #ifdef ENABLE_MYSQL - fprintf(actout, " <td ALIGN=RIGHT>%s:\n", get_html_text("059")); - fprintf(actout, " </td><td>\n"); - fprintf(actout, " <input type=text name=\"sql6\" value=\"%s\"></td>\n", checked1); - fprintf(actout, " </tr>\n"); - fprintf(actout, " </table>\n"); + printf (" <td ALIGN=RIGHT>%s:\n", get_html_text("059")); + printf (" </td><td>\n"); + printh (" <input type=text name=\"sql6\" value=\"%H\"></td>\n", checked1); + printf (" </tr>\n"); + printf (" </table>\n"); #else - fprintf(actout, "<INPUT TYPE=HIDDEN NAME=sql6 VALUE=\"%s\">\n", checked1); + printh ("<INPUT TYPE=HIDDEN NAME=sql6 VALUE=\"%H\">\n", checked1); #endif } Index: autorespond.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/autorespond.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- autorespond.c 2 Feb 2004 00:39:47 -0000 1.3.2.1 +++ autorespond.c 14 Nov 2004 18:05:54 -0000 1.3.2.2 @@ -42,7 +42,7 @@ count_autoresponders(); if(CurAutoResponders == 0) { - sprintf(StatusMessage,"%s", get_html_text("233")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("233")); show_menu(Username, Domain, Mytime); } else { send_template( "show_autorespond.html" ); @@ -69,23 +69,23 @@ sort_dosort(); for (i = 0; addr = sort_get_entry(i); ++i) { - fprintf(actout, "<tr>"); + printf ("<tr>"); - fprintf(actout, "<td align=\"center\">"); - fprintf(actout, "<a href=\"%s/com/delautorespond?user=%s&dom=%s&time=%d&modu=%s\">", - CGIPATH,user,dom,mytime,addr); - fprintf(actout, "<img src=\"%s/trash.png\" border=\"0\"></a>", IMAGEURL); - fprintf(actout, "</td>"); + printf ("<td align=\"center\">"); + printh ("<a href=\"%s/com/delautorespond?user=%C&dom=%C&time=%d&modu=%C\">", + CGIPATH, user, dom, mytime, addr); + printf ("<img src=\"%s/trash.png\" border=\"0\"></a>", IMAGEURL); + printf ("</td>"); - fprintf(actout, "<td align=\"center\">"); - fprintf(actout, "<a href=\"%s/com/modautorespond?user=%s&dom=%s&time=%d&modu=%s\">", - CGIPATH,user,dom,mytime,addr); - fprintf(actout, "<img src=\"%s/modify.png\" border=\"0\"></a>", IMAGEURL); - fprintf(actout, "</td>"); + printf ("<td align=\"center\">"); + printh ("<a href=\"%s/com/modautorespond?user=%C&dom=%C&time=%d&modu=%C\">", + CGIPATH, user, dom, mytime, addr); + printf ("<img src=\"%s/modify.png\" border=\"0\"></a>", IMAGEURL); + printf ("</td>"); - fprintf(actout, "<td align=\"left\">%s@%s</td>", addr, Domain); + printh ("<td align=\"left\">%H@%H</td>", addr, Domain); - fprintf(actout, "</tr>\n"); + printf ("</tr>\n"); } sort_cleanup(); } @@ -94,7 +94,7 @@ { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -102,7 +102,7 @@ count_autoresponders(); load_limits(); if ( MaxAutoResponders != -1 && CurAutoResponders >= MaxAutoResponders ) { - fprintf(actout, "%s %d\n", get_html_text("158"), MaxAutoResponders); + printf ("%s %d\n", get_html_text("158"), MaxAutoResponders); show_menu(); vclose(); exit(0); @@ -119,7 +119,7 @@ struct vqpasswd *vpw; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -127,55 +127,34 @@ count_autoresponders(); load_limits(); if ( MaxAutoResponders != -1 && CurAutoResponders >= MaxAutoResponders ) { - fprintf(actout, "%s %d\n", get_html_text("158"), MaxAutoResponders); + printf ("%s %d\n", get_html_text("158"), MaxAutoResponders); show_menu(); vclose(); exit(0); } - if ( fixup_local_name(ActionUser) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("174"), ActionUser); - addautorespond(); - vclose(); - exit(0); - } - - if ( check_local_user(ActionUser) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("175"), ActionUser); - addautorespond(); - vclose(); - exit(0); - } - - if ( strlen(ActionUser) == 0 ) { - sprintf(StatusMessage, "%s\n", get_html_text("176")); - addautorespond(); - vclose(); - exit(0); - } - - if ( strlen(Newu)>0 && check_email_addr(Newu) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("177"), Newu); - addautorespond(); - vclose(); - exit(0); - } - - if (strlen(Alias) <= 1) { - sprintf(StatusMessage, "%s %s\n", get_html_text("178"), ActionUser); - addautorespond(); - vclose(); - exit(0); - } + *StatusMessage = '\0'; + + if ( fixup_local_name(ActionUser) ) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("174"), ActionUser); + else if ( check_local_user(ActionUser) ) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("175"), ActionUser); + else if ( strlen(ActionUser) == 0 ) + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("176")); + else if ( strlen(Newu)>0 && check_email_addr(Newu) ) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("177"), Newu); + else if (strlen(Alias) <= 1) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("178"), ActionUser); + else if (strlen(Message) <= 1) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("179"), ActionUser); - if (strlen(Message) <= 1) { - sprintf(StatusMessage, "%s %s\n", get_html_text("179"), ActionUser); + /* if there was an error, go back to the add screen */ + if (*StatusMessage != '\0') { addautorespond(); vclose(); exit(0); } - /* * Make the autoresponder directory */ @@ -209,15 +188,15 @@ /* * Report success */ - sprintf(StatusMessage, "%s %s@%s\n", get_html_text("180"), - ActionUser, Domain); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H\n", + get_html_text("180"), ActionUser, Domain); show_autoresponders(Username, Domain, Mytime); } delautorespond() { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -230,7 +209,7 @@ int pid; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -250,7 +229,7 @@ /* delete the autoresponder directory */ sprintf(TmpBuf, "%s/%s", RealDir, TmpBuf2); vdelfiles(TmpBuf); - sprintf(StatusMessage, "%s %s\n", get_html_text("182"), ActionUser); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("182"), ActionUser); count_autoresponders(); @@ -264,7 +243,7 @@ modautorespond() { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -280,40 +259,29 @@ struct vqpasswd *vpw; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); - vclose(); - exit(0); - } - - if ( fixup_local_name(ActionUser) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("174"), ActionUser); - modautorespond(); - vclose(); - exit(0); - } - - if ( strlen(Newu)>0 && check_email_addr(Newu) ) { - sprintf(StatusMessage, "%s %s\n", get_html_text("177"), Newu); - modautorespond(); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } - if (strlen(Alias) <= 1) { - sprintf(StatusMessage, "%s %s\n", get_html_text("178"), ActionUser); - modautorespond(); - vclose(); - exit(0); - } + *StatusMessage = '\0'; + + if ( fixup_local_name(ActionUser) ) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("174"), ActionUser); + else if ( strlen(Newu)>0 && check_email_addr(Newu) ) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("177"), Newu); + else if (strlen(Alias) <= 1) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("178"), ActionUser); + else if (strlen(Message) <= 1) + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("179"), ActionUser); - if (strlen(Message) <= 1) { - sprintf(StatusMessage, "%s %s\n", get_html_text("179"), ActionUser); + /* exit on errors */ + if (*StatusMessage != '\0') { modautorespond(); vclose(); exit(0); } - /* * Make the autoresponder directory */ @@ -347,8 +315,8 @@ /* * Report success */ - sprintf(StatusMessage, "%s %s@%s\n", get_html_text("183"), - ActionUser, Domain); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H\n", + get_html_text("183"), ActionUser, Domain); show_autoresponders(Username, Domain, Mytime); } Index: cgi.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/cgi.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- cgi.c 10 Oct 2003 16:36:24 -0000 1.2 +++ cgi.c 14 Nov 2004 18:05:54 -0000 1.2.2.1 @@ -33,11 +33,15 @@ { int count; int i,j; - + char *qs; + int qslen = 0; + + qs = getenv("QUERY_STRING"); + if (qs != NULL) qslen = strlen (qs); count = atoi( safe_getenv("CONTENT_LENGTH")); - TmpCGI = malloc(count+1); - memset(TmpCGI,0,count+1); + TmpCGI = malloc(count+qslen+2); + memset(TmpCGI,0,count+qslen+2); i = 0; do { @@ -45,8 +49,17 @@ if ( j >= 0 ) i += j; else break; } while (j > 0 && i < count ); + + /* append query string to end */ + if (qslen > 0) { + sprintf (&TmpCGI[i], "&%s", qs); + } + } +/* source is encoded cgi parameters, name is "fieldname=" + * copies value of fieldname into dest + */ int GetValue(source,dest,name,dest_max) char *source; char *dest; @@ -55,11 +68,14 @@ { int i,j,k; - memset(dest,0,dest_max); - for(i=0; strstart(&source[i],name)!=&source[i] && source[i]!=0; ++i); + for (i = 0; source[i] != '\0'; i++) { + if ((i == 0) || (source[i-1] == '&')) { + if (strstart (&source[i], name) != NULL) break; + } + } - if( source[i] != 0 ) { + if( source[i] != '\0' ) { i+=strlen(name); } else { return( -1 ); @@ -88,5 +104,8 @@ dest[k] = 0; --k; } + + /* uncomment next line to dump cgi values to error log */ +// fprintf (stderr, "%s%s\n", name, dest); return(0); } Index: alias.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v retrieving revision 1.4.2.9 retrieving revision 1.4.2.10 diff -u -d -r1.4.2.9 -r1.4.2.10 --- alias.c 23 Oct 2004 20:49:56 -0000 1.4.2.9 +++ alias.c 14 Nov 2004 18:05:54 -0000 1.4.2.10 @@ -37,6 +37,7 @@ #include "config.h" #include "qmailadmin.h" #include "qmailadminx.h" +#include "printh.h" char* dotqmail_alias_command(char* command); int bkscandir(const char *dirname, @@ -47,7 +48,7 @@ int show_aliases(void) { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage, "%s", get_html_text("142")); + snprintf(StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -110,7 +111,7 @@ struct stat sbuf; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf(StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -168,9 +169,8 @@ then qmailadmin could use the single set of valias_ functions above. */ if ( (mydir = opendir(".")) == NULL ) { - fprintf(actout,"<tr><td colspan=\"4\">"); - fprintf(actout,"%s %d", get_html_text("143"), 1); - fprintf(actout,"</td></tr>"); + printf ("<tr><td colspan=\"4\">"); + printf ("%s %d</td></tr>", get_html_text("143"), 1); return(0); } @@ -188,9 +188,9 @@ } if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { - fprintf(actout,"<tr><td colspan=4>"); - fprintf(actout,"%s %s", get_html_text("144"), mydirent->d_name); - fprintf(actout,"</td></tr>\n"); + printf ("<tr><td colspan=4>"); + printf ("%s %s", get_html_text("144"), mydirent->d_name); + printf ("</td></tr>\n"); continue; } @@ -253,24 +253,24 @@ * This is a big assumption, and may cause problems at some point. */ - fprintf(actout, "<tr>\n"); + printf ("<tr>\n"); qmail_button (this_alias, "deldotqmail", user, dom, mytime, "trash.png"); if (*curalias->alias_command == '#') - fprintf(actout, "<td> </td>"); /* don't allow modify on blackhole */ + printf ("<td> </td>"); /* don't allow modify on blackhole */ else qmail_button (this_alias, "moddotqmail", user, dom, mytime, "modify.png"); - fprintf(actout, "<td align=left>%s</td>\n", this_alias); - fprintf(actout, "<td align=left>"); + printh ("<td align=left>%H</td>\n", this_alias); + printf ("<td align=left>"); stop=0; if (*curalias->alias_command == '#') { /* this is a blackhole account */ - fprintf (actout, "<I>%s</I>", get_html_text("303")); + printf ("<I>%s</I>", get_html_text("303")); stop = 1; } - while (!stop) { - strcpy(alias_user, curalias->alias_command); + while (!stop) { + strcpy (alias_user, curalias->alias_command); /* get the domain alone from alias_user */ for(alias_domain = alias_user; *alias_domain != '\0' && *alias_domain != '@' && *alias_domain != ' '; @@ -283,7 +283,7 @@ if (!check_local_user(alias_user)) { /* make it red so it jumps out -- this is no longer a valid forward */ - sprintf(alias_user, "<font color=\"red\">%s</font>", + snprintf(alias_user, sizeof(alias_user), "<font color=\"red\">%s</font>", curalias->alias_command); } } @@ -295,11 +295,11 @@ /* exit if we run out of alias lines, or go to a new alias name */ if ((curalias == NULL) || (strcmp (this_alias, curalias->alias_name) != 0)) { stop = 1; - fprintf (actout, "%s", alias_user); + printf ("%s", alias_user); break; } - fprintf (actout, "%s, ", alias_user); + printf ("%s, ", alias_user); break; } } @@ -307,26 +307,26 @@ while ((curalias != NULL) && (strcmp (this_alias, curalias->alias_name) == 0)) { curalias = get_alias_entry(); } - fprintf(actout, "</td>\n</tr>\n"); + printf ("</td>\n</tr>\n"); } if (AdminType == DOMAIN_ADMIN) { - fprintf(actout, "<tr><td align=\"right\" colspan=\"4\">"); - fprintf(actout, "[ "); + printf ("<tr><td align=\"right\" colspan=\"4\">"); + printf ("[ "); if(page > 1 ) { - fprintf(actout, "<a href=\"%s/com/showforwards?user=%s&dom=%s&time=%d&page=%d\">%s</a>", + printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&page=%d\">%s</a>", CGIPATH,user,dom,mytime,page - 1,get_html_text("135")); - fprintf(actout, " | "); + printf (" | "); } - fprintf(actout, "<a href=\"%s/com/showforwards?user=%s&dom=%s&time=%d&page=%d\">%s</a>", + printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&page=%d\">%s</a>", CGIPATH,user,dom,mytime,page,get_html_text("136")); - fprintf(actout, " | "); + printf (" | "); if (moreusers) { - fprintf(actout, "<a href=\"%s/com/showforwards?user=%s&dom=%s&time=%d&page=%d\">%s</a>", + printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&page=%d\">%s</a>", CGIPATH,user,dom,mytime,page+1,get_html_text("137")); - fprintf(actout, " ]"); + printf (" ]"); } - fprintf(actout, "</td></tr>"); + printf ("</td></tr>"); } } @@ -344,13 +344,13 @@ int j; if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } - fprintf(actout, "<tr>"); - fprintf(actout, "<td align=\"center\" valign=\"top\"><b>%s</b></td>", user); + printf ("<tr>"); + printh ("<td align=\"center\" valign=\"top\"><b>%H</b></td>", user); alias_line = valias_select (user, Domain); while (alias_line != NULL) { @@ -367,7 +367,7 @@ while (curalias != NULL) { alias_line = curalias->alias_command; alias_name_from_command = dotqmail_alias_command (alias_line); - strcpy(alias_user, alias_name_from_command); + strcpy (alias_user, alias_name_from_command); /* get the domain alone from alias_user */ alias_domain = alias_user; for(;*alias_domain != '\0' && *alias_domain != '@' @@ -379,42 +379,36 @@ for(j=0; TmpBuf3[j]!=0 && TmpBuf3[j]!='@';j++); TmpBuf3[j]=0; if (check_local_user(TmpBuf3)) { - strcpy(alias_user, TmpBuf3); + strcpy (alias_user, TmpBuf3); } else { /* make it red so it jumps out -- this is no longer a valid forward */ - sprintf(alias_user, "<font color=\"red\">%s</font>", + snprintf (alias_user, sizeof(alias_user), "<font color=\"red\">%s</font>", alias_name_from_command); } } - fprintf(actout, "<td align=\"center\" valign=\"top\">%s</td>\n", alias_user); - fprintf(actout, "<td align=\"center\" valign=\"top\">\n"); - fprintf(actout, "<form method=\"post\" name=\"moddotqmail\" action=\"%s/com/moddotqmailnow\">\n", CGIPATH); - fprintf(actout, "<input type=\"hidden\" name=\"user\" value=\"%s\">\n", - Username); - fprintf(actout, "<input type=\"hidden\" name=\"dom\" value=\"%s\">\n", - Domain); - fprintf(actout, "<input type=\"hidden\" name=\"time\" value=\"%i\">\n", - Mytime); - fprintf(actout, "<input type=\"hidden\" name=\"modu\" value=\"%s\">\n", - user); - fprintf(actout, "<input type=\"hidden\" name=\"linedata\" value=\"%s\">\n", - alias_line); - fprintf(actout, "<input type=\"hidden\" name=\"action\" value=\"delentry\">\n"); - fprintf(actout, "<input type=\"image\" border=\"0\" src=\"%s/delete.png\">\n", - IMAGEURL); - fprintf(actout, "</form>\n"); + printf ("<td align=\"center\" valign=\"top\">%s</td>\n", alias_user); + printf ("<td align=\"center\" valign=\"top\">\n"); + printf ("<form method=\"post\" name=\"moddotqmail\" action=\"%s/com/moddotqmailnow\">\n", CGIPATH); + printh ("<input type=\"hidden\" name=\"user\" value=\"%H\">\n", Username); + printh ("<input type=\"hidden\" name=\"dom\" value=\"%H\">\n", Domain); + printf ("<input type=\"hidden\" name=\"time\" value=\"%i\">\n", Mytime); + printh ("<input type=\"hidden\" name=\"modu\" value=\"%H\">\n", user); + printh ("<input type=\"hidden\" name=\"linedata\" value=\"%H\">\n", alias_line); + printf ("<input type=\"hidden\" name=\"action\" value=\"delentry\">\n"); + printf ("<input type=\"image\" border=\"0\" src=\"%s/delete.png\">\n", IMAGEURL); + printf ("</form>\n"); - fprintf(actout, "</td>\n"); - fprintf(actout, "</tr>\n"); - fprintf(actout, "<tr>\n"); - fprintf(actout, "<td align=\"left\"> </td>\n"); + printf ("</td>\n"); + printf ("</tr>\n"); + printf ("<tr>\n"); + printf ("<td align=\"left\"> </td>\n"); curalias = get_alias_entry(); } /* finish up the last line (all empty) */ - fprintf(actout, "<td align=\"left\"> </td>"); - fprintf(actout, "<td align=\"left\"> </td>"); - fprintf(actout, "</tr>"); + printf ("<td align=\"left\"> </td>"); + printf ("<td align=\"left\"> </td>"); + printf ("</tr>"); } int onevalidonly(char *user) { @@ -436,7 +430,7 @@ moddotqmail() { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -448,26 +442,26 @@ struct vqpasswd *pw; if ( strcmp(ActionUser,"default")==0) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } if (strcmp(Action,"delentry")==0) { if (onevalidonly(ActionUser) ) { - sprintf(StatusMessage, "%s\n", get_html_text("149")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("149")); moddotqmail(); vclose(); exit(0); } if (dotqmail_del_line(ActionUser,LineData) ) { - sprintf(StatusMessage, "%s %d\n", get_html_text("150"), 1); + snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", get_html_text("150"), 1); moddotqmail(); vclose(); exit(0); } - sprintf(StatusMessage, "%s\n", get_html_text("151") ); + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("151") ); moddotqmail(); vclose(); exit(0); @@ -478,13 +472,13 @@ vclose(); exit(0); } else { - sprintf(StatusMessage,"%s %s\n", get_html_text("152"), Newu); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("152"), Newu); moddotqmail(); vclose(); exit(0); } } else { - sprintf(StatusMessage, "%s\n", get_html_text("155")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("155")); vclose(); exit(0); } @@ -495,8 +489,8 @@ count_forwards(); load_limits(); if ( MaxForwards != -1 && CurForwards >= MaxForwards ) { - sprintf(StatusMessage, "%s %d\n", - get_html_text("157"), MaxForwards); + snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", + get_html_text("157"), MaxForwards); show_menu(); vclose(); exit(0); @@ -511,7 +505,7 @@ if (AdminType!=DOMAIN_ADMIN && !(AdminType==USER_ADMIN && strcmp(ActionUser, Username)==0)) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -519,7 +513,7 @@ count_forwards(); load_limits(); if ( MaxForwards != -1 && CurForwards >= MaxForwards ) { - sprintf(StatusMessage, "%s %d\n", get_html_text("157"), MaxForwards); + snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", get_html_text("157"), MaxForwards); send_template( "add_forward.html" ); vclose(); exit(0); @@ -533,7 +527,7 @@ exit(0); } else { - sprintf(StatusMessage, "%s\n", get_html_text("152")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("152")); show_forwards(Username,Domain,Mytime,RealDir); } } @@ -546,23 +540,23 @@ /* jef...@ma... */ if (strlen(forwardname)<=0) { - sprintf(StatusMessage, "%s %s\n", get_html_text("163"), forwardname); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("163"), forwardname); return(-1); /* make sure forwardname is valid */ } else if (fixup_local_name(forwardname)) { - sprintf(StatusMessage, "%s %s\n", get_html_text("163"), forwardname); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("163"), forwardname); return(-1); /* check to see if we already have a user with this name (only for create) */ } else if (create != 0 && check_local_user(forwardname)) { - sprintf(StatusMessage, "%s %s\n", get_html_text("175"), forwardname); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("175"), forwardname); return(-1); } if (strcmp (dest, "#") == 0) { if (dotqmail_add_line(forwardname, "#")) { - sprintf(StatusMessage, "%s %d\n", get_html_text("150"), 2); + snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", get_html_text("150"), 2); return(-1); } return 0; @@ -571,23 +565,23 @@ /* see if forwarding to a local user */ if (strstr(dest, "@") == NULL) { if (check_local_user(dest) == 0) { - sprintf(StatusMessage, "%s\n", get_html_text("161")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", get_html_text("161")); return(-1); } else { /* make it an email address */ - sprintf(dest, "%s@%s", dest, Domain); + sprintf (dest, "%s@%s", dest, Domain); } } /* check that it's a valid email address */ if (check_email_addr(dest)) { - sprintf(StatusMessage, "%s %s\n", get_html_text("162"), dest); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("162"), dest); return(-1); } - sprintf(TmpBuf2, "&%s", dest); + snprintf (TmpBuf2, sizeof(TmpBuf2), "&%s", dest); if (dotqmail_add_line(forwardname, TmpBuf2)) { - sprintf(StatusMessage, "%s %d\n", get_html_text("150"), 2); + snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", get_html_text("150"), 2); return(-1); } @@ -598,7 +592,7 @@ { if ( AdminType!=DOMAIN_ADMIN ) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); vclose(); exit(0); } @@ -611,7 +605,7 @@ if (AdminType!=DOMAIN_ADMIN && !(AdminType==USER_ADMIN && !strcmp(ActionUser, Username))) { - sprintf(StatusMessage,"%s", get_html_text("142")); + snprintf (StatusMessage, sizeof(StatusMessage), "%s", get_html_text("142")); show_menu(Username, Domain, Mytime); vclose(); exit(0); @@ -620,17 +614,17 @@ /* check to see if we already have a user with this name */ if (fixup_local_name(ActionUser)) { - sprintf(StatusMessage,"%s %s\n", get_html_text("160"), Alias); + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", get_html_text("160"), Alias); deldotqmail(); vclose(); exit(0); } if (!(dotqmail_delete_files(ActionUser))) { - sprintf(StatusMessage, "%s %s %s\n", get_html_text("167"), + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H %H\n", get_html_text("167"), Alias, ActionUser); } else { - sprintf(StatusMessage, "%s %s %s\n", get_html_text("168"), + snprinth (StatusMessage, sizeof(StatusMessage), "%s %H %H\n", get_html_text("168"), Alias, ActionUser); } @@ -678,8 +672,8 @@ *s = '\0'; if ((s = strrchr(user, '/')) == NULL) return NULL; - if (b != NULL) { sprintf (user, "%s <I>(%s)</I>", s+1, b); } - else { strcpy (user, s+1); } + if (b != NULL) { snprinth (user, sizeof(user), "%H <I>(%H)</I>", s+1, b); } + else { snprinth (user, sizeof(user), "%H", s+1); } return (user); @@ -702,7 +696,7 @@ /* back up to pipe or first slash to remove path */ while (line[len] != '/' && line[len] != '|') len--; len++; /* len is now first char of program name */ - sprintf (command, "<I>%s</I>", &line[len]); + snprinth (command, sizeof(command), "<I>%H</I>", &line[len]); return(command); } else { Index: printh.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Attic/printh.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -d -r1.1.2.1 -r1.1.2.2 --- printh.c 10 Nov 2004 05:24:11 -0000 1.1.2.1 +++ printh.c 14 Nov 2004 18:05:55 -0000 1.1.2.2 @@ -40,7 +40,7 @@ * format - a printf-... [truncated message content] |
|
From: Tom C. <tom...@us...> - 2004-11-11 07:21:59
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26686 Modified Files: Tag: stable-1_2 user.c qmailadmin.h Log Message: move hardcoded 5 (forwards per user) to define in qmailadmin.h (MAX_FORWARDS_PER_USER) Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.11.2.2 retrieving revision 1.11.2.3 diff -u -d -r1.11.2.2 -r1.11.2.3 --- user.c 19 Oct 2004 15:44:40 -0000 1.11.2.2 +++ user.c 11 Nov 2004 07:21:49 -0000 1.11.2.3 @@ -913,7 +913,7 @@ /* tmpstr points to first non-token */ count=0; - while( tmpstr != NULL && count < 5) { + while( tmpstr != NULL && count < MAX_FORWARD_PER_USER) { if ((*tmpstr != '|') && (*tmpstr != '/')) { fprintf(fs,"&%s\n", tmpstr); ++count; Index: qmailadmin.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.h,v retrieving revision 1.1.1.1.2.1 retrieving revision 1.1.1.1.2.2 diff -u -d -r1.1.1.1.2.1 -r1.1.1.1.2.2 --- qmailadmin.h 19 Oct 2004 15:44:40 -0000 1.1.1.1.2.1 +++ qmailadmin.h 11 Nov 2004 07:21:49 -0000 1.1.1.1.2.2 @@ -24,6 +24,9 @@ #define MAILDIR "Maildir" #endif +/* max # of forwards a user can set on the Modify User screen */ +#define MAX_FORWARD_PER_USER 5 + #define QMAILADMIN_TEMPLATEDIR "QMAILADMIN_TEMPLATEDIR" #define SHOW_VERSION_LINK 1 |
|
From: Tom C. <tom...@us...> - 2004-11-10 05:24:21
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15244 Modified Files: Tag: stable-1_2 ChangeLog Makefile.am Makefile.in Added Files: Tag: stable-1_2 printh.c printh.h Log Message: Add printh.c, new routines for generating HTML-safe and CGI-safe strings. Index: Makefile.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -u -d -r1.17.2.1 -r1.17.2.2 --- Makefile.in 7 Oct 2004 20:06:34 -0000 1.17.2.1 +++ Makefile.in 10 Nov 2004 05:24:11 -0000 1.17.2.2 @@ -107,7 +107,7 @@ qmailadmin_DEPENDENCIES = $(COMMONDEPENDENCIES) COMMONSOURCES = qmailadmin.c alias.c autorespond.c forward.c mailinglist.c \ - user.c util.c auth.c template.c \ + user.c util.c printh.c auth.c template.c \ command.c show.c cgi.c limits.c dotqmail.c \ qmailadmin.h qmailadminx.h @@ -127,9 +127,9 @@ am__objects_1 = qmailadmin.$(OBJEXT) alias.$(OBJEXT) \ autorespond.$(OBJEXT) forward.$(OBJEXT) mailinglist.$(OBJEXT) \ - user.$(OBJEXT) util.$(OBJEXT) auth.$(OBJEXT) template.$(OBJEXT) \ - command.$(OBJEXT) show.$(OBJEXT) cgi.$(OBJEXT) limits.$(OBJEXT) \ - dotqmail.$(OBJEXT) + user.$(OBJEXT) util.$(OBJEXT) printh.$(OBJEXT) auth.$(OBJEXT) \ + template.$(OBJEXT) command.$(OBJEXT) show.$(OBJEXT) \ + cgi.$(OBJEXT) limits.$(OBJEXT) dotqmail.$(OBJEXT) am_qmailadmin_OBJECTS = $(am__objects_1) qmailadmin_OBJECTS = $(am_qmailadmin_OBJECTS) qmailadmin_LDFLAGS = @@ -143,7 +143,7 @@ @AMDEP_TRUE@ ./$(DEPDIR)/autorespond.Po ./$(DEPDIR)/cgi.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/command.Po ./$(DEPDIR)/dotqmail.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/forward.Po ./$(DEPDIR)/limits.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/mailinglist.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/mailinglist.Po ./$(DEPDIR)/printh.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/qmailadmin.Po ./$(DEPDIR)/show.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/template.Po ./$(DEPDIR)/user.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/util.Po @@ -240,6 +240,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/forward.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/limits.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mailinglist.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printh.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qmailadmin.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/show.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/template.Po@am__quote@ @@ -480,6 +481,7 @@ mailinglist.o: config.h qmailadmin.h qmailadminx.h user.o: config.h qmailadmin.h qmailadminx.h util.o: config.h qmailadmin.h qmailadminx.h +printh.o: printh.h auth.o: config.h qmailadmin.h qmailadminx.h template.o: config.h qmailadmin.h qmailadminx.h command.o: qmailadmin.h qmailadminx.h --- NEW FILE: printh.c --- /* * $Id: printh.c,v 1.1.2.1 2004/11/10 05:24:11 tomcollins Exp $ * Copyright (C) 2004 Tom Logic LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include "printh.h" /* included from printh.h: #include <stdlib.h> #include <stdarg.h> */ #include <string.h> #include <stdio.h> #include <ctype.h> /* vsnprinth - Custom version of sprintf for escaping strings for use on HTML * pages and in cgi script parameters. * * (based on qnprintf from vpopmail) * * int vsnprinth (char *buffer, size_t size, const char *format, va_list ap) * int snprinth (char *buffer, size_t size, const char *format, ...); * int printh (const char *format, ...); * * buffer - buffer to print string to * size - size of buffer * format - a printf-style format string* * ... - variable arguments for the format string * * NOTE: Currently supported formats: %%, %s, %d/%i, %u, %ld/%li, %lu * Since this function was designed to escape strings for use on HTML pages, * the formats don't support any extended options. * * Extra formats: %C (like %s, but converts string to cgi-parameter safe * version) and %H (like %s, but converts to HTML-safe version) * * Returns the number of characters that would have been printed to buffer * if it was big enough. (i.e., if return value is larger than (size-1), * buffer received an incomplete copy of the formatted string). * * It is possible to call snprinth with a NULL buffer of 0 bytes to determine * how large the buffer needs to be. This is inefficient, as snprinth has * to run twice. * * snprinth written November 2004 by Tom Collins <to...@to...> * qnprintf written February 2004 by Tom Collins <to...@to...> */ int vsnprinth (char *buffer, size_t size, const char *format, va_list ap) { const char hex[] = "0123456789abcdef"; int printed; /* number of characters that would have been printed */ const char *f; /* current position in format string */ char *b; /* current position in output buffer */ char n[20]; /* buffer to hold string representation of number */ char *s; /* pointer to string to insert */ char *copy; /* pointer to replacement string for special char */ int stringtype; #define SPRINTH_NORMAL 0 #define SPRINTH_HTML 1 #define SPRINTH_CGI 2 if (buffer == NULL && size > 0) return -1; printed = 0; b = buffer; for (f = format; *f != '\0'; f++) { if (*f != '%') { if (++printed < size) *b++ = *f; } else { f++; s = n; stringtype = SPRINTH_NORMAL; switch (*f) { case '%': strcpy (n, "%"); break; case 'd': case 'i': snprintf (n, sizeof(n), "%d", va_arg (ap, int)); break; case 'u': snprintf (n, sizeof(n), "%u", va_arg (ap, unsigned int)); break; case 'l': f++; switch (*f) { case 'd': case 'i': snprintf (n, sizeof(n), "%ld", va_arg (ap, long)); break; case 'u': snprintf (n, sizeof(n), "%lu", va_arg (ap, unsigned long)); break; default: strcpy (n, "*"); } break; case 's': s = va_arg (ap, char *); break; case 'H': s = va_arg (ap, char *); stringtype = SPRINTH_HTML; break; case 'C': s = va_arg (ap, char *); stringtype = SPRINTH_CGI; break; default: strcpy (n, "*"); } /* now copy the string parameter into the buffer */ while (*s != '\0') { copy = NULL; /* default to no special handling */ if (stringtype == SPRINTH_HTML) { switch (*s) { case '"': copy = """; break; case '<': copy = "<"; break; case '>': copy = ">"; break; case '&': copy = "&"; break; } } else if (stringtype == SPRINTH_CGI) { if (*s == ' ') copy = strcpy (n, "+"); else if (! isalnum(*s)) { copy = n; sprintf (n, "%%%c%c", hex[*s >> 4 & 0x0F], hex[*s & 0x0F]); } } if (copy == NULL) { if (++printed < size) *b++ = *s; } else { /* replace *s with buffer pointed to by copy */ while (*copy != '\0') { if (++printed < size) *b++ = *copy; copy++; } } s++; } } } *b = '\0'; /* If the formatted string doesn't fit in the buffer, zero out the buffer. */ if (printed >= size) { memset (buffer, '\0', size); } return printed; } int snprinth (char *buffer, size_t size, const char *format, ...) { int ret; va_list argp; va_start (argp, format); ret = vsnprinth (buffer, size, format, argp); va_end (argp); return ret; } int printh (const char *format, ...) { int ret; char buffer[1024]; va_list argp; va_start (argp, format); ret = vsnprinth (buffer, sizeof(buffer), format, argp); va_end (argp); printf ("%s", buffer); return ret; } Index: Makefile.am =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.am,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -d -r1.12 -r1.12.2.1 --- Makefile.am 22 Jan 2004 04:43:12 -0000 1.12 +++ Makefile.am 10 Nov 2004 05:24:11 -0000 1.12.2.1 @@ -24,7 +24,7 @@ qmailadmin_DEPENDENCIES=$(COMMONDEPENDENCIES) COMMONSOURCES=qmailadmin.c alias.c autorespond.c forward.c mailinglist.c \ - user.c util.c auth.c template.c \ + user.c util.c printh.c auth.c template.c \ command.c show.c cgi.c limits.c dotqmail.c \ qmailadmin.h qmailadminx.h @@ -38,6 +38,7 @@ mailinglist.o: config.h qmailadmin.h qmailadminx.h user.o: config.h qmailadmin.h qmailadminx.h util.o: config.h qmailadmin.h qmailadminx.h +printh.o: printh.h auth.o: config.h qmailadmin.h qmailadminx.h template.o: config.h qmailadmin.h qmailadminx.h command.o: qmailadmin.h qmailadminx.h Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.27 retrieving revision 1.15.2.28 diff -u -d -r1.15.2.27 -r1.15.2.28 --- ChangeLog 23 Oct 2004 20:49:56 -0000 1.15.2.27 +++ ChangeLog 10 Nov 2004 05:24:11 -0000 1.15.2.28 @@ -11,6 +11,8 @@ - Better detect .qmail-alias files that are tied to mailing lists. (Aliases that end in "-owner" but aren't tied to ezmlm lists will now display properly.) + - Add printh.c, new routines for generating HTML-safe and CGI-safe + strings. 1.2.3 - released 7-Oct-04 --- NEW FILE: printh.h --- /* * $Id: printh.h,v 1.1.2.1 2004/11/10 05:24:11 tomcollins Exp $ * Copyright (C) 2004 Tom Logic LLC * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #include <stdlib.h> #include <stdarg.h> int vsnprinth (char *buffer, size_t size, const char *format, va_list ap); int snprinth (char *buffer, size_t size, const char *format, ...); int printh (const char *format, ...); |
|
From: Tom C. <tom...@us...> - 2004-10-23 20:50:18
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13111 Modified Files: Tag: stable-1_2 ChangeLog alias.c Log Message: Better detect .qmail-alias files that are tied to mailing lists. Index: alias.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v retrieving revision 1.4.2.8 retrieving revision 1.4.2.9 diff -u -d -r1.4.2.8 -r1.4.2.9 --- alias.c 19 Oct 2004 15:44:40 -0000 1.4.2.8 +++ alias.c 23 Oct 2004 20:49:56 -0000 1.4.2.9 @@ -20,6 +20,8 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#include <sys/stat.h> #include <unistd.h> #include <pwd.h> #include <errno.h> @@ -105,6 +107,7 @@ struct dirent **namelist; char this_alias[MAX_FILE_NAME]; char *alias_line; + struct stat sbuf; if ( AdminType!=DOMAIN_ADMIN ) { sprintf(StatusMessage,"%s", get_html_text("142")); @@ -178,22 +181,24 @@ if ( strncmp(".qmail-", mydirent->d_name, 7) == 0 ) { if ( strcmp(mydirent->d_name, ".qmail-default") == 0 ) continue; + /* check for ezmlm lists (file is symbolic link) */ + memset (&sbuf, 0, sizeof(sbuf)); + if (lstat (mydirent->d_name, &sbuf) == 0) { + if (sbuf.st_mode & S_IFLNK == S_IFLNK) continue; + } + if ( (fs=fopen(mydirent->d_name,"r"))==NULL) { fprintf(actout,"<tr><td colspan=4>"); fprintf(actout,"%s %s", get_html_text("144"), mydirent->d_name); fprintf(actout,"</td></tr>\n"); continue; } + for(i=7,j=0;j<MAX_FILE_NAME-1&&mydirent->d_name[i]!=0;++i,++j) { alias_name[j] = mydirent->d_name[i] == ':' ? '.' : mydirent->d_name[i]; } alias_name[j] = 0; - /* until there's a better solution, assume that all aliases ending - * with "-owner" are ezmlm lists and should be ignored. - */ - if (strcmp ("-owner", &alias_name[j-6]) == 0) continue; - memset(TmpBuf2, 0, sizeof(TmpBuf2)); fgets(TmpBuf2, sizeof(TmpBuf2), fs); alias_name_from_command = dotqmail_alias_command(TmpBuf2); Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.26 retrieving revision 1.15.2.27 diff -u -d -r1.15.2.26 -r1.15.2.27 --- ChangeLog 19 Oct 2004 15:44:40 -0000 1.15.2.26 +++ ChangeLog 23 Oct 2004 20:49:56 -0000 1.15.2.27 @@ -8,6 +8,9 @@ '/.maildir' directory names. - Add #define to qmailadmin.h for globally setting Maildir directory name (defaults to "/Maildir" but Gentoo can use ".maildir"). + - Better detect .qmail-alias files that are tied to mailing lists. + (Aliases that end in "-owner" but aren't tied to ezmlm lists + will now display properly.) 1.2.3 - released 7-Oct-04 |
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3044 Modified Files: Tag: stable-1_2 ChangeLog alias.c auth.c command.c qmailadmin.c qmailadmin.h template.c user.c Log Message: Add #define to qmailadmin.h for globally setting Maildir directory name (defaults to /Maildir but Gentoo can use .maildir). Index: qmailadmin.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- qmailadmin.h 10 Sep 2003 21:38:43 -0000 1.1.1.1 +++ qmailadmin.h 19 Oct 2004 15:44:40 -0000 1.1.1.1.2.1 @@ -16,6 +16,13 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ +/* Some platforms use '.maildir' instead of 'Maildir' as the mail directory + * name. Furture versions of Vpopmail might define it. Until then, change + * it below. + */ +#ifndef MAILDIR +#define MAILDIR "Maildir" +#endif #define QMAILADMIN_TEMPLATEDIR "QMAILADMIN_TEMPLATEDIR" Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.25 retrieving revision 1.15.2.26 diff -u -d -r1.15.2.25 -r1.15.2.26 --- ChangeLog 19 Oct 2004 15:42:36 -0000 1.15.2.25 +++ ChangeLog 19 Oct 2004 15:44:40 -0000 1.15.2.26 @@ -6,6 +6,8 @@ Tom Collins - Modify contrib/alias2forward.pl to work with '/Maildir' or '/.maildir' directory names. + - Add #define to qmailadmin.h for globally setting Maildir directory + name (defaults to "/Maildir" but Gentoo can use ".maildir"). 1.2.3 - released 7-Oct-04 Index: qmailadmin.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -d -r1.6.2.1 -r1.6.2.2 --- qmailadmin.c 24 Apr 2004 01:06:40 -0000 1.6.2.1 +++ qmailadmin.c 19 Oct 2004 15:44:40 -0000 1.6.2.2 @@ -232,11 +232,11 @@ exit(0); } - sprintf(TmpBuf, "%s/Maildir", pw->pw_dir); + sprintf(TmpBuf, "%s/" MAILDIR, pw->pw_dir); del_id_files( TmpBuf); Mytime = time(NULL); - sprintf(TmpBuf, "%s/Maildir/%d.qw", pw->pw_dir, Mytime); + sprintf(TmpBuf, "%s/" MAILDIR "/%d.qw", pw->pw_dir, Mytime); fs = fopen(TmpBuf, "w"); if ( fs == NULL ) { fprintf(actout,"%s %s<br>\n", get_html_text("144"), TmpBuf); Index: alias.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v retrieving revision 1.4.2.7 retrieving revision 1.4.2.8 diff -u -d -r1.4.2.7 -r1.4.2.8 --- alias.c 26 Aug 2004 00:12:03 -0000 1.4.2.7 +++ alias.c 19 Oct 2004 15:44:40 -0000 1.4.2.8 @@ -664,11 +664,11 @@ b = NULL; /* pointer to mailbox name */ if ((s = strrchr(user, '/')) == NULL) return NULL; - if (strcmp(s, "/Maildir") != 0) { + if (strcmp(s, "/" MAILDIR) != 0) { b = s + 2; /* point to name of submailbox */ *s = '\0'; /* add NULL */ if ((s = strrchr(user, '/')) == NULL) return NULL; - if (strcmp(s, "/Maildir") != 0) return NULL; + if (strcmp(s, "/" MAILDIR) != 0) return NULL; } *s = '\0'; Index: command.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/command.c,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -u -d -r1.2.2.1 -r1.2.2.2 --- command.c 1 Oct 2004 19:45:31 -0000 1.2.2.1 +++ command.c 19 Oct 2004 15:44:40 -0000 1.2.2.2 @@ -253,7 +253,7 @@ delautorespondnow(); } else if (strcmp(TmpBuf2, "logout") == 0 ) { - sprintf(TmpBuf, "%s/%s/Maildir", RealDir, Username ); + sprintf(TmpBuf, "%s/%s/" MAILDIR, RealDir, Username ); del_id_files(TmpBuf); show_login(); Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.11.2.1 retrieving revision 1.11.2.2 diff -u -d -r1.11.2.1 -r1.11.2.2 --- user.c 12 Jun 2004 21:28:04 -0000 1.11.2.1 +++ user.c 19 Oct 2004 15:44:40 -0000 1.11.2.2 @@ -167,7 +167,7 @@ fprintf(actout, "<td align=\"left\">%s</td>", pw->pw_gecos); /* display user's quota */ - snprintf(path, sizeof(path), "%s/Maildir", pw->pw_dir); + snprintf(path, sizeof(path), "%s/" MAILDIR, pw->pw_dir); readuserquota(path, &diskquota, &maxmsg); fprintf(actout, "<td align=\"right\">%-2.2lf / </td>", ((double)diskquota)/1048576.0); /* Convert to MB */ if (strncmp(pw->pw_shell, "NOQUOTA", 2) != 0) { @@ -928,7 +928,7 @@ /* if spam check is enabled, that will save the message*/ fprintf(fs, "%s\n", SPAM_COMMAND); } else { - fprintf(fs,"%s/Maildir/\n", vpw->pw_dir); + fprintf(fs,"%s/" MAILDIR "/\n", vpw->pw_dir); } } fclose(fs); @@ -962,7 +962,7 @@ if(spam_check==1) fprintf(fs, "%s\n", SPAM_COMMAND); else - fprintf(fs,"%s/Maildir/\n", vpw->pw_dir); + fprintf(fs,"%s/" MAILDIR "/\n", vpw->pw_dir); fclose(fs); /* set up the message file */ Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -d -r1.7.2.2 -r1.7.2.3 --- template.c 7 Sep 2004 05:07:45 -0000 1.7.2.2 +++ template.c 19 Oct 2004 15:44:40 -0000 1.7.2.3 @@ -521,7 +521,7 @@ fprintf(actout, "<font size=\"2\" color=\"#000000\"><b>%s:</b><br>%s %s %s", get_html_text("249"), get_html_text("253"), qconvert, qnote); fprintf(actout, "<br>%s ", get_html_text("254")); - snprintf(path, sizeof(path), "%s/Maildir", vpw->pw_dir); + snprintf(path, sizeof(path), "%s/" MAILDIR, vpw->pw_dir); readuserquota(path, &diskquota, &maxmsg); fprintf(actout, "%-2.2lf MB</font><br>", ((double)diskquota)/1048576.0); /* Convert to MB */ } @@ -962,7 +962,7 @@ memset(dir, 0, sizeof(dir)); retval = ""; if ( (vpw = vauth_getpw(Username, Domain)) != NULL ) { - sprintf(dir, "%s/Maildir/%d.qw", vpw->pw_dir, Mytime); + sprintf(dir, "%s/" MAILDIR "/%d.qw", vpw->pw_dir, Mytime); fs_qw = fopen(dir, "r"); if ( fs_qw != NULL ) { memset(TmpBuf, 0, sizeof(TmpBuf)); Index: auth.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/auth.c,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -u -d -r1.3.2.1 -r1.3.2.2 --- auth.c 6 Sep 2004 17:29:23 -0000 1.3.2.1 +++ auth.c 19 Oct 2004 15:44:40 -0000 1.3.2.2 @@ -49,7 +49,7 @@ exit(0); } - sprintf(TmpBuf1, "%s/Maildir/%s.qw", pw->pw_dir, Time); + sprintf(TmpBuf1, "%s/" MAILDIR "/%s.qw", pw->pw_dir, Time); fs = fopen(TmpBuf1, "r"); if ( fs == NULL ) { @@ -103,7 +103,7 @@ exit(0); } - sprintf(TmpBuf1, "%s/Maildir/%s.qw", pw->pw_dir, Time); + sprintf(TmpBuf1, "%s/" MAILDIR "/%s.qw", pw->pw_dir, Time); fs = fopen(TmpBuf1, "r"); if ( fs == NULL ) { |
|
From: Tom C. <tom...@us...> - 2004-10-19 15:42:45
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2459 Modified Files: Tag: stable-1_2 ChangeLog Log Message: Modify contrib/alias2forward.pl to work with '/Maildir' or '/.maildir' directory names. Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.24 retrieving revision 1.15.2.25 diff -u -d -r1.15.2.24 -r1.15.2.25 --- ChangeLog 19 Oct 2004 15:39:42 -0000 1.15.2.24 +++ ChangeLog 19 Oct 2004 15:42:36 -0000 1.15.2.25 @@ -3,6 +3,10 @@ 1.2.4 - unreleased + Tom Collins + - Modify contrib/alias2forward.pl to work with '/Maildir' or + '/.maildir' directory names. + 1.2.3 - released 7-Oct-04 Ken Jones |
|
From: Tom C. <tom...@us...> - 2004-10-19 15:42:45
|
Update of /cvsroot/qmailadmin/qmailadmin/contrib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2459/contrib Modified Files: Tag: stable-1_2 alias2forward.pl Log Message: Modify contrib/alias2forward.pl to work with '/Maildir' or '/.maildir' directory names. Index: alias2forward.pl =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/contrib/alias2forward.pl,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -u -d -r1.1.1.1 -r1.1.1.1.2.1 --- alias2forward.pl 10 Sep 2003 21:38:45 -0000 1.1.1.1 +++ alias2forward.pl 19 Oct 2004 15:42:36 -0000 1.1.1.1.2.1 @@ -93,7 +93,7 @@ $changed = 0; open (DOTQMAIL, "$path/$fn"); while ($line = <DOTQMAIL>) { - if ($line =~ /\/.*\/([^\/]{2,})\/(.\/)?([^\/]+)\/Maildir(\/)?$/) { + if ($line =~ /\/.*\/([^\/]{2,})\/(.\/)?([^\/]+)\/(Maildir|\.maildir)(\/)?$/) { chop $line; ($user, $domain) = ($3, $1); print " converting '$line' to '&$user\@$domain'\n"; |
|
From: Tom C. <tom...@us...> - 2004-10-19 15:39:52
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1540 Modified Files: Tag: stable-1_2 ChangeLog configure configure.in Log Message: start of 1.2.4 release Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.23 retrieving revision 1.15.2.24 diff -u -d -r1.15.2.23 -r1.15.2.24 --- ChangeLog 7 Oct 2004 20:06:33 -0000 1.15.2.23 +++ ChangeLog 19 Oct 2004 15:39:42 -0000 1.15.2.24 @@ -1,6 +1,8 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. +1.2.4 - unreleased + 1.2.3 - released 7-Oct-04 Ken Jones Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.14.2.6 retrieving revision 1.14.2.7 diff -u -d -r1.14.2.6 -r1.14.2.7 --- configure 7 Oct 2004 20:06:34 -0000 1.14.2.6 +++ configure 19 Oct 2004 15:39:42 -0000 1.14.2.7 @@ -1647,7 +1647,7 @@ QA_PACKAGE="qmailadmin" -QA_VERSION="1.2.3" +QA_VERSION="1.2.4" cat >>confdefs.h <<_ACEOF Index: configure.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v retrieving revision 1.15.2.6 retrieving revision 1.15.2.7 diff -u -d -r1.15.2.6 -r1.15.2.7 --- configure.in 7 Oct 2004 20:06:36 -0000 1.15.2.6 +++ configure.in 19 Oct 2004 15:39:42 -0000 1.15.2.7 @@ -6,7 +6,7 @@ AC_CANONICAL_HOST QA_PACKAGE="qmailadmin" -QA_VERSION="1.2.3" +QA_VERSION="1.2.4" AC_DEFINE_UNQUOTED(QA_PACKAGE,"$QA_PACKAGE","") AC_DEFINE_UNQUOTED(QA_VERSION,"$QA_VERSION","") |
|
From: Tom C. <tom...@us...> - 2004-10-07 20:06:48
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13256 Modified Files: Tag: stable-1_2 ChangeLog Makefile.in configure configure.in Log Message: Remove check for C++ compiler in configure.in. (Ken Jones) Index: Makefile.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Makefile.in,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -d -r1.17 -r1.17.2.1 --- Makefile.in 22 Jan 2004 04:43:12 -0000 1.17 +++ Makefile.in 7 Oct 2004 20:06:34 -0000 1.17.2.1 @@ -74,7 +74,6 @@ CC = @CC@ CGIBINTARGETS = @CGIBINTARGETS@ CPP = @CPP@ -CXX = @CXX@ DEPDIR = @DEPDIR@ INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s LN_S = @LN_S@ Index: configure =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v retrieving revision 1.14.2.5 retrieving revision 1.14.2.6 diff -u -d -r1.14.2.5 -r1.14.2.6 --- configure 12 Aug 2004 05:07:40 -0000 1.14.2.5 +++ configure 7 Oct 2004 20:06:34 -0000 1.14.2.6 @@ -732,22 +732,6 @@ ac_env_target_alias_value=$target_alias ac_cv_env_target_alias_set=${target_alias+set} ac_cv_env_target_alias_value=$target_alias -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS [...981 lines suppressed...] +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t s,@EXEEXT@,$EXEEXT,;t t s,@OBJEXT@,$OBJEXT,;t t s,@DEPDIR@,$DEPDIR,;t t @@ -5599,10 +5196,6 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t -s,@CXXDEPMODE@,$CXXDEPMODE,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CPP@,$CPP,;t t s,@LN_S@,$LN_S,;t t Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.22 retrieving revision 1.15.2.23 diff -u -d -r1.15.2.22 -r1.15.2.23 --- ChangeLog 7 Oct 2004 19:51:13 -0000 1.15.2.22 +++ ChangeLog 7 Oct 2004 20:06:33 -0000 1.15.2.23 @@ -3,6 +3,9 @@ 1.2.3 - released 7-Oct-04 + Ken Jones + - Remove check for C++ compiler in configure.in. + Rick Widmer - Updated INSTALL documentation (from 2004-05-07). Index: configure.in =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v retrieving revision 1.15.2.5 retrieving revision 1.15.2.6 diff -u -d -r1.15.2.5 -r1.15.2.6 --- configure.in 12 Aug 2004 05:07:40 -0000 1.15.2.5 +++ configure.in 7 Oct 2004 20:06:36 -0000 1.15.2.6 @@ -14,7 +14,6 @@ AC_SUBST(QA_VERSION) dnl Checks for programs. -AC_PROG_CXX AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL |
|
From: Tom C. <tom...@us...> - 2004-10-07 19:51:35
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9881 Modified Files: Tag: stable-1_2 ChangeLog Log Message: set release date of 1.2.3 Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.21 retrieving revision 1.15.2.22 diff -u -d -r1.15.2.21 -r1.15.2.22 --- ChangeLog 1 Oct 2004 19:45:21 -0000 1.15.2.21 +++ ChangeLog 7 Oct 2004 19:51:13 -0000 1.15.2.22 @@ -1,7 +1,7 @@ Numbers in square brackets ([]) indicate tracker item on SourceForge with patch or information related to the entry. -1.2.3 - unreleased +1.2.3 - released 7-Oct-04 Rick Widmer - Updated INSTALL documentation (from 2004-05-07). |
|
From: Tom C. <tom...@us...> - 2004-10-01 19:47:28
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16349 Modified Files: Tag: stable-1_2 ChangeLog command.c Log Message: Fix error handling when attempting to set catchall (if vauth_getpw() failed, we'd end up with an empty .qmail-default). Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.20 retrieving revision 1.15.2.21 diff -u -d -r1.15.2.20 -r1.15.2.21 --- ChangeLog 29 Sep 2004 16:28:43 -0000 1.15.2.20 +++ ChangeLog 1 Oct 2004 19:45:21 -0000 1.15.2.21 @@ -19,6 +19,8 @@ it's for a mailing list and isn't an alias. Note that this only affects systems that don't store aliases in the valias table and reverts to pre-1.2.2 behavior. [992132] + - Fix error handling when attempting to set catchall (if + vauth_getpw() failed, we'd end up with an empty .qmail-default). 1.2.2 - released 25-Jun-04 Index: command.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/command.c,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- command.c 10 Oct 2003 16:36:24 -0000 1.2 +++ command.c 1 Oct 2004 19:45:31 -0000 1.2.2.1 @@ -272,15 +272,15 @@ int i; int j; - if ( (fs = fopen(".qmail-default", "w")) == NULL ) { - sprintf(StatusMessage,"%s", get_html_text("082")); + if ((pw = vauth_getpw( ActionUser, Domain )) == NULL) { + sprintf(StatusMessage,"%s %s@%s", get_html_text("223"), ActionUser, Domain); } else { - if ((pw = vauth_getpw( ActionUser, Domain )) == NULL) { - sprintf(StatusMessage,"%s %s@%s", get_html_text("223"), ActionUser, Domain); + if ( (fs = fopen(".qmail-default", "w")) == NULL ) { + sprintf(StatusMessage,"%s", get_html_text("082")); } else { fprintf(fs, "| %s/bin/vdelivermail '' %s\n", VPOPMAILDIR, pw->pw_dir); + fclose(fs); } - fclose(fs); } show_users(Username, Domain, Mytime); vclose(); |
|
From: Tom C. <tom...@us...> - 2004-09-29 16:29:00
|
Update of /cvsroot/qmailadmin/qmailadmin/lang In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4861/lang Modified Files: Tag: stable-1_2 nl Log Message: From Maurice Snellen: Fix lang/nl entry 152 (was opposite of English original). Index: nl =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/lang/nl,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -u -d -r1.2 -r1.2.2.1 --- nl 13 Sep 2003 15:45:02 -0000 1.2 +++ nl 29 Sep 2004 16:28:44 -0000 1.2.2.1 @@ -117,7 +117,7 @@ 149 Kan laatste toevoeging niet verwijderen 150 Bestandsfout 151 Regel succesvol verwijderd -152 Doorstuur succesvol verwijderd +152 Doorstuur succesvol toegevoegd 153 Gebruikersnaam bestaat niet 154 Alias succesvol verwijderd 155 Ongeldige actie |
1 message has been excluded from this view by a project administrator.
