Menu
▾
▴
[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.98, 1.15.2.99 alias.c, 1.4.2.14, 1.4.2.15 autorespond.c, 1.3.2.5, 1.3.2.6 mailinglist.c, 1.5.2.9, 1.5.2.10 template.c, 1.7.2.13, 1.7.2.14 user.c, 1.11.2.16, 1.11.2.17 util.c, 1.4.2.7, 1.4.2.8 util.h, 1.1.2.2, 1.1.2.3
|
From: Tom C. <tom...@us...> - 2006-12-30 01:28:28
|
Update of /cvsroot/qmailadmin/qmailadmin In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv24754 Modified Files: Tag: stable-1_2 ChangeLog alias.c autorespond.c mailinglist.c template.c user.c util.c util.h Log Message: Use function to generate cgi URLs. Index: autorespond.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/autorespond.c,v retrieving revision 1.3.2.5 retrieving revision 1.3.2.6 diff -u -d -r1.3.2.5 -r1.3.2.6 --- autorespond.c 29 Jun 2006 19:30:05 -0000 1.3.2.5 +++ autorespond.c 30 Dec 2006 01:28:22 -0000 1.3.2.6 @@ -78,14 +78,12 @@ printf ("<tr>"); printf ("<td align=\"center\">"); - printh ("<a href=\"%s/com/delautorespond?user=%C&dom=%C&time=%d&modu=%C\">", - CGIPATH, user, dom, mytime, addr); + printh ("<a href=\"%s&modu=%C\">", cgiurl("delautorespond"), addr); printf ("<img src=\"%s/trash.png\" border=\"0\"></a>", IMAGEURL); printf ("</td>"); printf ("<td align=\"center\">"); - printh ("<a href=\"%s/com/modautorespond?user=%C&dom=%C&time=%d&modu=%C\">", - CGIPATH, user, dom, mytime, addr); + printh ("<a href=\"%s&modu=%C\">", cgiurl("modautorespond"), addr); printf ("<img src=\"%s/modify.png\" border=\"0\"></a>", IMAGEURL); printf ("</td>"); Index: ChangeLog =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v retrieving revision 1.15.2.98 retrieving revision 1.15.2.99 diff -u -d -r1.15.2.98 -r1.15.2.99 --- ChangeLog 29 Dec 2006 17:23:39 -0000 1.15.2.98 +++ ChangeLog 30 Dec 2006 01:28:22 -0000 1.15.2.99 @@ -3,6 +3,9 @@ 1.2.12 - unreleased + Tom Collins + - Use function to generate cgi URLs. + 1.2.11 - released 29-Dec-06 Brandon Index: mailinglist.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v retrieving revision 1.5.2.9 retrieving revision 1.5.2.10 diff -u -d -r1.5.2.9 -r1.5.2.10 --- mailinglist.c 5 Oct 2006 16:14:11 -0000 1.5.2.9 +++ mailinglist.c 30 Dec 2006 01:28:22 -0000 1.5.2.10 @@ -713,13 +713,13 @@ } 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=right><A href=\"%s&modu=%C&newu=%C\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", + cgiurl(TmpBuf), ActionUser, addr, IMAGEURL); printh (" <TD align=left>%H</TD>\n", addr); ++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=right><A href=\"%s&modu=%C&newu=%C\"><IMG src=\"%s/trash.png\" border=0></A></TD>\n", + cgiurl(TmpBuf), ActionUser, addr, IMAGEURL); printh (" <TD align=left>%H</TD>\n", addr); } else { printf (" <TD COLSPAN=2> </TD>"); Index: alias.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v retrieving revision 1.4.2.14 retrieving revision 1.4.2.15 diff -u -d -r1.4.2.14 -r1.4.2.15 --- alias.c 9 Feb 2006 05:02:55 -0000 1.4.2.14 +++ alias.c 30 Dec 2006 01:28:22 -0000 1.4.2.15 @@ -374,24 +374,24 @@ * by repeating the search. */ if (*SearchUser && ((startnumber % MAXALIASESPERPAGE) != 1)) { - printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&page=%d\">%s</a>", - CGIPATH, user, dom, mytime, page, html_text[135]); + printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"), + page, html_text[135]); printf (" | "); - printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&searchuser=%C\">%s</a>", - CGIPATH, user, dom, mytime, SearchUser, html_text[136]); + printh ("<a href=\"%s&searchuser=%C\">%s</a>", cgiurl("showforwards"), + SearchUser, html_text[136]); } else { if (page > 1) { - printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&page=%d\">%s</a>", - CGIPATH, user, dom, mytime, page - 1, html_text[135]); + printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"), + page - 1, html_text[135]); printf (" | "); } - printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&page=%d\">%s</a>", - CGIPATH, user, dom, mytime, page, html_text[136]); + printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"), + page, html_text[136]); } if (moreusers) { printf (" | "); - printh ("<a href=\"%s/com/showforwards?user=%C&dom=%C&time=%d&page=%d\">%s</a>", - CGIPATH, user, dom, mytime, page + 1, html_text[137]); + printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"), + page + 1, html_text[137]); } printf (" ]"); printf ("</td></tr>"); Index: user.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v retrieving revision 1.11.2.16 retrieving revision 1.11.2.17 diff -u -d -r1.11.2.16 -r1.11.2.17 --- user.c 29 Aug 2006 16:57:35 -0000 1.11.2.16 +++ user.c 30 Dec 2006 01:28:22 -0000 1.11.2.17 @@ -191,8 +191,7 @@ /* display button to modify user */ printf ("<td align=\"center\">"); - printh ("<a href=\"%s/com/moduser?user=%C&dom=%C&time=%d&moduser=%C\">", - CGIPATH,user,dom,mytime,pw->pw_name); + printh ("<a href=\"%s&moduser=%C\">", cgiurl("moduser"), pw->pw_name); printf ("<img src=\"%s/modify.png\" border=\"0\"></a>", IMAGEURL); printf ("</td>"); @@ -212,8 +211,7 @@ /* display trashcan for delete, or nothing if delete not allowed */ printf ("<td align=\"center\">"); if (allowdelete) { - printh ("<a href=\"%s/com/deluser?user=%C&dom=%C&time=%d&deluser=%C\">", - CGIPATH,user,dom,mytime,pw->pw_name); + printh ("<a href=\"%s&deluser=%C\">", cgiurl("deluser"), pw->pw_name); printf ("<img src=\"%s/trash.png\" border=\"0\"></a>", IMAGEURL); } else { /* printf ("<img src=\"%s/disabled.png\" border=\"0\">", IMAGEURL); */ @@ -226,8 +224,8 @@ printf ("<img src=\"%s/radio-on.png\" border=\"0\"></a>", IMAGEURL); } else if (AdminType==DOMAIN_ADMIN) { - printh ("<a href=\"%s/com/setdefault?user=%C&dom=%C&time=%d&deluser=%C&page=%s\">", - CGIPATH,user,dom,mytime,pw->pw_name,Pagenumber); + printh ("<a href=\"%s&deluser=%C&page=%s\">", + cgiurl("setdefault"), pw->pw_name, Pagenumber); printf ("<img src=\"%s/radio-off.png\" border=\"0\"></a>", IMAGEURL); } else { @@ -253,29 +251,24 @@ printf ("[ "); /* only display "previous page" if pagenumber > 1 */ if (atoi(Pagenumber) > 1) { - printh ("<a href=\"%s/com/showusers?user=%C&dom=%C&time=%d&page=%d\">%s</a>", - CGIPATH,user,dom,mytime, + printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl ("showusers"), atoi(Pagenumber)-1 ? atoi(Pagenumber)-1 : atoi(Pagenumber), html_text[135]); printf (" | "); } if (moreusers && atoi(Pagenumber) < totalpages) { - printh ("<a href=\"%s/com/showusers?user=%C&dom=%C&time=%d&page=%d\">%s</a>", - CGIPATH,user,dom,mytime,atoi(Pagenumber)+1, - html_text[137]); + printh ("<a href=\"%s&page=%d\">%s</a>", + cgiurl("showusers"), atoi(Pagenumber)+1, html_text[137]); printf (" | "); } /* printf (" | ");*/ #endif - printh ("<a href=\"%s/com/deleteall?user=%C&dom=%C&time=%d\">%s</a>", - CGIPATH,user,dom,mytime,html_text[235]); + printh ("<a href=\"%s\">%s</a>", cgiurl ("deleteall"), html_text[235]); printf (" | "); - printh ("<a href=\"%s/com/bounceall?user=%C&dom=%C&time=%d\">%s</a>", - CGIPATH,user,dom,mytime,html_text[134]); + printh ("<a href=\"%s\">%s</a>", cgiurl ("bounceall"), html_text[134]); printf (" | "); - printh ("<a href=\"%s/com/setremotecatchall?user=%C&dom=%C&time=%d\">%s</a>", - CGIPATH,user,dom,mytime,html_text[206]); + printh ("<a href=\"%s\">%s</a>", cgiurl("setremotecatchall"), html_text[206]); printf (" ]"); printf ("</b></font>"); printf ("</td></tr>\n"); Index: util.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/util.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 --- util.c 5 Feb 2006 16:49:08 -0000 1.4.2.7 +++ util.c 30 Dec 2006 01:28:23 -0000 1.4.2.8 @@ -119,8 +119,7 @@ void qmail_button(char *modu, char *command, char *user, char *dom, time_t mytime, char *png) { printf ("<td align=center>"); - printh ("<a href=\"%s/com/%s?user=%C&dom=%C&time=%d&modu=%C\">", - CGIPATH, command, user, dom, mytime, modu); + printh ("<a href=\"%s&modu=%C\">", cgiurl(command), modu); printf ("<img src=\"%s/%s\" border=0></a>", IMAGEURL, png); printf ("</td>\n"); } @@ -400,12 +399,10 @@ printf ("<hr>"); printf ("<b>%s</b> ", html_text[133]); for (k = 0; k < 10; k++) { - printh ("<a href=\"%s/com/%s?user=%C&dom=%C&time=%d&searchuser=%d\">%d</a>\n", - CGIPATH, action, user, dom, mytime, k, k); + printh ("<a href=\"%s&searchuser=%d\">%d</a>\n", cgiurl(action), k, k); } for (k = 'a'; k <= 'z'; k++) { - printh ("<a href=\"%s/com/%s?user=%C&dom=%C&time=%d&searchuser=%c\">%c</a>\n", - CGIPATH, action, user, dom, mytime, k, k); + printh ("<a href=\"%s&searchuser=%c\">%c</a>\n", cgiurl(action), k, k); } printf ("</td>"); printf ("</tr>\n"); @@ -427,6 +424,16 @@ #endif } +char *cgiurl (char *action) +{ + static char url[256]; + + snprinth (url, sizeof(url), "%s/com/%s?user=%C&dom=%C&time=%d", + CGIPATH, action, Username, Domain, Mytime); + + return url; +} + /* * Brian Kolaci * updated function that doesn't require fts_* Index: template.c =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/template.c,v retrieving revision 1.7.2.13 retrieving revision 1.7.2.14 diff -u -d -r1.7.2.13 -r1.7.2.14 --- template.c 23 Jan 2005 17:35:12 -0000 1.7.2.13 +++ template.c 30 Dec 2006 01:28:22 -0000 1.7.2.14 @@ -501,36 +501,28 @@ if (AdminType==DOMAIN_ADMIN){ if (MaxPopAccounts != 0) { - printh ( - "<a href=\"%s/com/showusers?user=%C&time=%i&dom=%C&\">", - CGIPATH,Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("showusers")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", html_text[61]); } if (MaxForwards != 0 || MaxAliases != 0) { - printh ( - "<a href=\"%s/com/showforwards?user=%C&time=%i&dom=%C&\">", - CGIPATH,Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("showforwards")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", html_text[122]); } if (MaxAutoResponders != 0) { - printh ( - "<a href=\"%s/com/showautoresponders?user=%C&time=%i&dom=%C&\">", - CGIPATH,Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("showautoresponders")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></a></font><br>", html_text[77]); } if (*EZMLMDIR != 'n' && MaxMailingLists != 0) { - printh ( - "<a href=\"%s/com/showmailinglists?user=%C&time=%i&dom=%C&\">", - CGIPATH, Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("showmailinglists")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", html_text[80]); @@ -545,9 +537,7 @@ char path[256]; vpw = vauth_getpw(Username, Domain); - printh ( - "<a href=\"%s/com/moduser?user=%C&time=%i&dom=%C&moduser=%C\">", - CGIPATH,Username,Mytime,Domain,Username); + printh ("<a href=\"%s&moduser=%C\">", cgiurl("moduser"), Username); printh ( "<font size=\"2\" color=\"#000000\"><b>%s %H</b></font></a><br><br>", html_text[111], Username); @@ -568,36 +558,28 @@ printf ("<br>"); if (MaxPopAccounts != 0) { - printh ( - "<a href=\"%s/com/adduser?user=%C&time=%i&dom=%C&\">", - CGIPATH,Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("adduser")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", html_text[125]); } if (MaxForwards != 0) { - printh ( - "<a href=\"%s/com/adddotqmail?atype=forward&user=%C&time=%i&dom=%C&\">", - CGIPATH, Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("adddotqmail")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", html_text[127]); } if (MaxAutoResponders != 0) { - printh ( - "<a href=\"%s/com/addautorespond?user=%C&time=%i&dom=%C&\">", - CGIPATH, Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("addautorespond")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></a></font><br>", html_text[128]); } if (*EZMLMDIR != 'n' && MaxMailingLists != 0) { - printh ( - "<a href=\"%s/com/addmailinglist?user=%C&time=%i&dom=%C&\">", - CGIPATH, Username,Mytime,Domain); + printh ("<a href=\"%s\">", cgiurl("addmailinglist")); printf ( "<font size=\"2\" color=\"#000000\"><b>%s</b></font></a><br>", html_text[129]); @@ -621,14 +603,11 @@ /* exit / logout link/text */ case 'x': - printf("<a href=\""); strcpy (value, get_session_val("returntext=")); if(strlen(value) > 0) { - printh("%s\">%H", - get_session_val("returnhttp="), value); + printh("<a href=\"%s\">%H", get_session_val("returnhttp="), value); } else { - printh("%s/com/logout?user=%C&dom=%C&time=%d&\">%s", - CGIPATH, Username, Domain, Mytime, html_text[218]); + printh("<a href=\"%s\">%s", cgiurl("logout"), html_text[218]); } printf("</a>\n"); break; Index: util.h =================================================================== RCS file: /cvsroot/qmailadmin/qmailadmin/Attic/util.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -d -r1.1.2.2 -r1.1.2.3 --- util.h 5 Feb 2006 16:49:08 -0000 1.1.2.2 +++ util.h 30 Dec 2006 01:28:23 -0000 1.1.2.3 @@ -29,3 +29,4 @@ int quota_to_megabytes(char[], char*); //jhopper prototype void print_user_index (char *action, int colspan, char *user, char *dom, time_t mytime); +char *cgiurl (char *action); |
