qmailadmin-cvs — CVS commits for the qmailadmin project

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.108, 1.15.2.109 configure, 1.14.2.17, 1.14.2.18 configure.in, 1.15.2.17, 1.15.2.18

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8260

Modified Files:
      Tag: stable-1_2
	ChangeLog configure configure.in 
Log Message:
start 1.2.13, update configure with GNU Autoconf 2.59

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.108
retrieving revision 1.15.2.109
diff -u -d -r1.15.2.108 -r1.15.2.109
--- ChangeLog	14 Nov 2007 04:27:25 -0000	1.15.2.108
+++ ChangeLog	8 Jan 2008 03:56:14 -0000	1.15.2.109
@@ -1,6 +1,8 @@
 Numbers in square brackets ([]) indicate tracker item on SourceForge with 
 patch or information related to the entry.
 
+1.1.13 - unreleased
+
 1.2.12 - released 13-Nov-07
 
 	John Simpson

Index: configure
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v
retrieving revision 1.14.2.17
retrieving revision 1.14.2.18
diff -u -d -r1.14.2.17 -r1.14.2.18
--- configure	29 Dec 2006 17:23:39 -0000	1.14.2.17
+++ configure	8 Jan 2008 03:56:14 -0000	1.14.2.18
@@ -1,19 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
+# Generated by GNU Autoconf 2.59.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-
[...3519 lines suppressed...]
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+   { (exit 1); exit 1; }; }; }
 
     # echo "creating $dirpart/$file"
     echo '# dummy' > "$dirpart/$file"
@@ -5827,8 +6377,11 @@
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
-  $SHELL $CONFIG_STATUS || ac_cs_success=false
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.

Index: configure.in
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v
retrieving revision 1.15.2.17
retrieving revision 1.15.2.18
diff -u -d -r1.15.2.17 -r1.15.2.18
--- configure.in	29 Dec 2006 17:23:39 -0000	1.15.2.17
+++ configure.in	8 Jan 2008 03:56:14 -0000	1.15.2.18
@@ -6,7 +6,7 @@
 AC_CANONICAL_HOST
 
 QA_PACKAGE="qmailadmin"
-QA_VERSION="1.2.12"
+QA_VERSION="1.2.13"
 
 AC_DEFINE_UNQUOTED(QA_PACKAGE,"$QA_PACKAGE","")
 AC_DEFINE_UNQUOTED(QA_VERSION,"$QA_VERSION","")

[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.107,1.15.2.108

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25704

Modified Files:
      Tag: stable-1_2
	ChangeLog 
Log Message:
set release date for 1.2.12

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.107
retrieving revision 1.15.2.108
diff -u -d -r1.15.2.107 -r1.15.2.108
--- ChangeLog	3 Nov 2007 18:02:25 -0000	1.15.2.107
+++ ChangeLog	14 Nov 2007 04:27:25 -0000	1.15.2.108
@@ -1,7 +1,7 @@
 Numbers in square brackets ([]) indicate tracker item on SourceForge with 
 patch or information related to the entry.
 
-1.2.12 - unreleased
+1.2.12 - released 13-Nov-07
 
 	John Simpson
 	- mailinglist.c: call vpopmail's onchange onchange handler when

[qmailadmin-cvs] qmailadmin mailinglist.c, 1.5.2.13, 1.5.2.14 ChangeLog, 1.15.2.106, 1.15.2.107

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25541

Modified Files:
      Tag: stable-1_2
	mailinglist.c ChangeLog 
Log Message:
make sure name of list to delete is valid

Index: mailinglist.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v
retrieving revision 1.5.2.13
retrieving revision 1.5.2.14
diff -u -d -r1.5.2.13 -r1.5.2.14
--- mailinglist.c	3 Nov 2007 17:49:36 -0000	1.5.2.13
+++ mailinglist.c	3 Nov 2007 18:02:25 -0000	1.5.2.14
@@ -324,6 +324,12 @@
     exit(0);
   }
 
+  if (fixup_local_name (ActionUser)) {
+    // invalid address given, abort
+    vclose();
+    exit(0);
+  }
+
   if ( (mydir = opendir(".")) == NULL ) {
     printf ("%s %d<BR>\n", html_text[143], 1);
     printf ("</table>");

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.106
retrieving revision 1.15.2.107
diff -u -d -r1.15.2.106 -r1.15.2.107
--- ChangeLog	3 Nov 2007 17:49:36 -0000	1.15.2.106
+++ ChangeLog	3 Nov 2007 18:02:25 -0000	1.15.2.107
@@ -19,6 +19,7 @@
 	  flexible HTML templates.
 	- When deleting a subscriber, convert '=' to '@' if no '@'. [1651370]
 	- Slight change to Jorgen Moth's patch.
+	- mailinglist.c: make sure name of list to delete is valid.
 
 1.2.11 - released 29-Dec-06
 

[qmailadmin-cvs] qmailadmin mailinglist.c, 1.5.2.12, 1.5.2.13 ChangeLog, 1.15.2.105, 1.15.2.106

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18585

Modified Files:
      Tag: stable-1_2
	mailinglist.c ChangeLog 
Log Message:
call vpopmail's onchange onchange handler when adding or removing a mailing list.

Index: mailinglist.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v
retrieving revision 1.5.2.12
retrieving revision 1.5.2.13
diff -u -d -r1.5.2.12 -r1.5.2.13
--- mailinglist.c	3 Nov 2007 17:39:34 -0000	1.5.2.12
+++ mailinglist.c	3 Nov 2007 17:49:36 -0000	1.5.2.13
@@ -30,6 +30,12 @@
 #include <dirent.h>
 #include <errno.h>
 
+#include <vpopmail_config.h>
+/* undef some macros that get redefined in config.h below */
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 #include <vpopmail.h>
 
 #include "cgi.h"
@@ -324,6 +330,11 @@
     return;
   }
  
+#ifdef ONCHANGE_SCRIPT
+  snprintf ( onchange_buf , MAX_BUFF , "%s@%s" , ActionUser , Domain ) ;
+  call_onchange ( "delmailinglist" ) ;
+#endif
+
   /* make dotqmail name */
   strcpy(dotqmail_name, ActionUser);
   for(dotnum=0;dotqmail_name[dotnum]!='\0';dotnum++) {
@@ -630,6 +641,11 @@
 
   ezmlm_make(1);
 
+#ifdef ONCHANGE_SCRIPT
+  snprintf ( onchange_buf , MAX_BUFF , "%s@%s" , ActionUser , Domain ) ;
+  call_onchange ( "addmailinglist" ) ;
+#endif
+
   snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H\n", html_text[187],
           ActionUser, Domain);
   show_mailing_lists(Username, Domain, Mytime);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.105
retrieving revision 1.15.2.106
diff -u -d -r1.15.2.105 -r1.15.2.106
--- ChangeLog	3 Nov 2007 17:44:12 -0000	1.15.2.105
+++ ChangeLog	3 Nov 2007 17:49:36 -0000	1.15.2.106
@@ -3,6 +3,10 @@
 
 1.2.12 - unreleased
 
+	John Simpson
+	- mailinglist.c: call vpopmail's onchange onchange handler when
+	  adding or removing a mailing list.
+
 	Jorgen Moth
 	- user.c: Make sure number_of_mailinglists > 0 before malloc() in 
 	  addusernow(). [1647157]

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.104, 1.15.2.105 user.c, 1.11.2.19, 1.11.2.20

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15927

Modified Files:
      Tag: stable-1_2
	ChangeLog user.c 
Log Message:
Slight change to Jorgen Moth's patch. [1647157]

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.11.2.19
retrieving revision 1.11.2.20
diff -u -d -r1.11.2.19 -r1.11.2.20
--- user.c	3 Nov 2007 17:29:23 -0000	1.11.2.19
+++ user.c	3 Nov 2007 17:44:12 -0000	1.11.2.20
@@ -398,35 +398,36 @@
 
   GetValue(TmpCGI, c_num, "number_of_mailinglist=", MAX_BUFF);
   num = atoi(c_num);
-  if((num > 0) && !(mailingListNames = malloc(sizeof(char *) * num))) {
-    snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]);
-    vclose();
-    exit(0);
-
-  } else {
-    for(cnt = 0; cnt < num; cnt++) {
-      if(!(mailingListNames[cnt] = malloc(MAX_BUFF))) {
-        snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]);
-        vclose();
-        exit(0);
+  if (num > 0) {
+    if (!(mailingListNames = malloc(sizeof(char *) * num))) {
+      snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]);
+      vclose();
+      exit(0);
+    } else {
+      for(cnt = 0; cnt < num; cnt++) {
+        if(!(mailingListNames[cnt] = malloc(MAX_BUFF))) {
+          snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]);
+          vclose();
+          exit(0);
+        }
       }
-    }
 
-    for(cnt = 0; cnt < num; cnt++) {
-      sprintf(tmp, "subscribe%d=", cnt);
-      error = GetValue(TmpCGI, mailingListNames[cnt], tmp, MAX_BUFF);
-      if( error != -1 ) {
-        pid=fork();
+      for(cnt = 0; cnt < num; cnt++) {
+        sprintf(tmp, "subscribe%d=", cnt);
+        error = GetValue(TmpCGI, mailingListNames[cnt], tmp, MAX_BUFF);
+        if( error != -1 ) {
+          pid=fork();
 
-        if (pid==0) {
-          sprintf(TmpBuf1, "%s/ezmlm-sub", EZMLMDIR);
-          sprintf(TmpBuf2, "%s/%s", RealDir, mailingListNames[cnt]);
-          execl(TmpBuf1, "ezmlm-sub", TmpBuf2, email, NULL);
-          exit(127);
-        } else {
-          wait(&pid);
-        }
-      } 
+          if (pid==0) {
+            sprintf(TmpBuf1, "%s/ezmlm-sub", EZMLMDIR);
+            sprintf(TmpBuf2, "%s/%s", RealDir, mailingListNames[cnt]);
+            execl(TmpBuf1, "ezmlm-sub", TmpBuf2, email, NULL);
+            exit(127);
+          } else {
+            wait(&pid);
+          }
+        } 
+      }
     }
   }
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.104
retrieving revision 1.15.2.105
diff -u -d -r1.15.2.104 -r1.15.2.105
--- ChangeLog	3 Nov 2007 17:39:34 -0000	1.15.2.104
+++ ChangeLog	3 Nov 2007 17:44:12 -0000	1.15.2.105
@@ -14,6 +14,7 @@
 	- Move HTML out of alias.c and into html.h as move toward more
 	  flexible HTML templates.
 	- When deleting a subscriber, convert '=' to '@' if no '@'. [1651370]
+	- Slight change to Jorgen Moth's patch.
 
 1.2.11 - released 29-Dec-06
 

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.103, 1.15.2.104 mailinglist.c, 1.5.2.11, 1.5.2.12

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13284

Modified Files:
      Tag: stable-1_2
	ChangeLog mailinglist.c 
Log Message:
When deleting a subscriber, convert '=' to '@' if no '@'. [1651370]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.103
retrieving revision 1.15.2.104
diff -u -d -r1.15.2.103 -r1.15.2.104
--- ChangeLog	3 Nov 2007 17:29:23 -0000	1.15.2.103
+++ ChangeLog	3 Nov 2007 17:39:34 -0000	1.15.2.104
@@ -13,6 +13,7 @@
 	- Use email address instead of maildir for catchall.
 	- Move HTML out of alias.c and into html.h as move toward more
 	  flexible HTML templates.
+	- When deleting a subscriber, convert '=' to '@' if no '@'. [1651370]
 
 1.2.11 - released 29-Dec-06
 

Index: mailinglist.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -d -r1.5.2.11 -r1.5.2.12
--- mailinglist.c	17 Aug 2007 23:46:36 -0000	1.5.2.11
+++ mailinglist.c	3 Nov 2007 17:39:34 -0000	1.5.2.12
@@ -847,6 +847,7 @@
 void dellistgroupnow(int mod)
 {
  int pid;
+ char *p;
 
   if ( AdminType!=DOMAIN_ADMIN ) {
     snprintf (StatusMessage, sizeof(StatusMessage), "%s", html_text[142]);
@@ -856,6 +857,12 @@
 
   lowerit(Newu);
 
+  // for dealing with AOL spam complaints, if address doesn't contain @,
+  // but does contain '=', change the '=' to '@'.
+  if (! strchr (Newu, '@')) {
+    if ((p = strchr (Newu, '='))) *p = '@';
+  }
+
   pid=fork();
   if (pid==0) {
     sprintf(TmpBuf1, "%s/ezmlm-unsub", EZMLMDIR);

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.102, 1.15.2.103 user.c, 1.11.2.18, 1.11.2.19

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8028

Modified Files:
      Tag: stable-1_2
	ChangeLog user.c 
Log Message:
commit SF 1647157, check number of mailing lists before calling malloc()

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.11.2.18
retrieving revision 1.11.2.19
diff -u -d -r1.11.2.18 -r1.11.2.19
--- user.c	21 Sep 2007 23:27:40 -0000	1.11.2.18
+++ user.c	3 Nov 2007 17:29:23 -0000	1.11.2.19
@@ -398,7 +398,7 @@
 
   GetValue(TmpCGI, c_num, "number_of_mailinglist=", MAX_BUFF);
   num = atoi(c_num);
-  if(!(mailingListNames = malloc(sizeof(char *) * num))) {
+  if((num > 0) && !(mailingListNames = malloc(sizeof(char *) * num))) {
     snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[201]);
     vclose();
     exit(0);

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.102
retrieving revision 1.15.2.103
diff -u -d -r1.15.2.102 -r1.15.2.103
--- ChangeLog	21 Sep 2007 23:16:45 -0000	1.15.2.102
+++ ChangeLog	3 Nov 2007 17:29:23 -0000	1.15.2.103
@@ -3,6 +3,10 @@
 
 1.2.12 - unreleased
 
+	Jorgen Moth
+	- user.c: Make sure number_of_mailinglists > 0 before malloc() in 
+	  addusernow(). [1647157]
+
 	Tom Collins
 	- Use function to generate cgi URLs.
 	- Remove unused AliasType variable.

[qmailadmin-cvs] qmailadmin autorespond.c, 1.3.2.6, 1.3.2.7 qmailadmin.c, 1.6.2.12, 1.6.2.13 qmailadminx.h, 1.2.2.4, 1.2.2.5 template.c, 1.7.2.14, 1.7.2.15 user.c, 1.11.2.17, 1.11.2.18 util.c, 1.4.2.8, 1.4.2.9 util.h, 1.1.2.3, 1.1.2.4

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16744

Modified Files:
      Tag: stable-1_2
	autorespond.c qmailadmin.c qmailadminx.h template.c user.c 
	util.c util.h 
Log Message:
fix some of the id tags in my repository

[qmailadmin-cvs] qmailadmin html.h, NONE, 1.1.2.1 ChangeLog, 1.15.2.101, 1.15.2.102 alias.c, 1.4.2.15, 1.4.2.16

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11420

Modified Files:
      Tag: stable-1_2
	ChangeLog alias.c 
Added Files:
      Tag: stable-1_2
	html.h 
Log Message:
Move HTML out of alias.c and into html.h as move toward more flexible HTML templates.

Index: alias.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/alias.c,v
retrieving revision 1.4.2.15
retrieving revision 1.4.2.16
diff -u -d -r1.4.2.15 -r1.4.2.16
--- alias.c	30 Dec 2006 01:28:22 -0000	1.4.2.15
+++ alias.c	21 Sep 2007 23:16:45 -0000	1.4.2.16
@@ -41,6 +41,7 @@
 #include "qmailadmin.h"
 #include "qmailadminx.h"
 #include "dotqmail.h"
+#include "html.h"
 #include "limits.h"
 #include "util.h"
 #include "printh.h"
@@ -104,6 +105,7 @@
 {
  int moreusers=0;
  char alias_user[MAX_BUFF];
+ char alias_copy[MAX_BUFF];
  char alias_name[MAX_FILE_NAME];
  char *alias_domain;
  char *alias_name_from_command;
@@ -200,8 +202,7 @@
      then qmailadmin could use the single set of valias_ functions above.
    */
   if ( (mydir = opendir(".")) == NULL ) {
-    printf ("<tr><td colspan=\"4\">");
-    printf ("%s %d</td></tr>", html_text[143], 1);
+    printf (HTML_ALIAS_ERROR, html_text[143], "1");
     return;
   }
 
@@ -219,9 +220,7 @@
       }
 
       if ( (fs=fopen(mydirent->d_name,"r"))==NULL) {
-        printf ("<tr><td colspan=4>");
-        printf ("%s %s", html_text[144], mydirent->d_name);
-        printf ("</td></tr>\n");
+        printf (HTML_ALIAS_ERROR, html_text[144], mydirent->d_name);
         continue;
       }
 
@@ -305,26 +304,26 @@
      * This is a big assumption, and may cause problems at some point.
      */
     
-    printf ("<tr>\n");
+    printf ("%s", HTML_ALIAS_ROW_START);
     qmail_button (this_alias, "deldotqmail", user, dom, mytime, "trash.png");
     if (*curalias->alias_command == '#')
-      printf ("<td> </td>");   /* don't allow modify on blackhole */
+      printf ("%s", HTML_EMPTY_TD);   /* don't allow modify on blackhole */
     else
       qmail_button (this_alias, "moddotqmail", user, dom, mytime, "modify.png");
-    printh ("<td align=left>%H</td>\n", this_alias);
-    printf ("<td align=left>");
+    printh (HTML_ALIAS_NAME, this_alias);
+    printf (HTML_ALIAS_DEST_START);
     
     stop=0;
     if (*curalias->alias_command == '#') {
       /* this is a blackhole account */
-      printf ("<I>%s</I>", html_text[303]);
+      printf (HTML_ALIAS_BLACKHOLE, html_text[303]);
       stop = 1;
     }
     
     while (!stop) {
-      strcpy (alias_user, curalias->alias_command);
-      /* get the domain alone from alias_user */
-      for(alias_domain = alias_user;
+      strcpy (alias_copy, curalias->alias_command);
+      /* get the domain alone from alias_copy */
+      for(alias_domain = alias_copy;
         *alias_domain != '\0' && *alias_domain != '@' && *alias_domain != ' ';
         alias_domain++);
         
@@ -333,11 +332,17 @@
         /* strip domain name from address */
         *alias_domain = '\0';
   
-        if (!check_local_user(alias_user)) {
+        if (!check_local_user(alias_copy)) {
           /* make it red so it jumps out -- this is no longer a valid forward */
-          snprintf(alias_user, sizeof(alias_user), "<font color=\"red\">%s</font>", 
+          snprinth (alias_user, sizeof(alias_user), HTML_ALIAS_INVALID, 
             curalias->alias_command);
+        } else {
+          snprinth (alias_user, sizeof(alias_user), HTML_ALIAS_LOCAL, 
+            alias_copy);
         }
+      } else {
+        snprinth (alias_user, sizeof(alias_user), HTML_ALIAS_REMOTE, 
+          curalias->alias_command);
       }
       
       /* find next entry, so we know if we should print a , or not */
@@ -359,42 +364,42 @@
     while ((curalias != NULL) && (strcmp (this_alias, curalias->alias_name) == 0)) {
       curalias = get_alias_entry();
     }
-    printf ("</td>\n</tr>\n");
+    printf ("%s%s", HTML_ALIAS_DEST_END, HTML_ALIAS_ROW_END);
   }
 
   if (AdminType == DOMAIN_ADMIN) {
 
     print_user_index ("showforwards", 4, user, dom, mytime);
     
-    printf ("<tr><td align=\"right\" colspan=\"4\">");
-    printf ("[&nbsp;");
+    printf ("%s", HTML_ALIAS_FOOTER_START);
+    printf ("%s", HTML_MENU_START);
 	/* When searching for a user on systems using .qmail files, we make things
 	 * easy by starting the page with the first matching address.  As a result,
 	 * the previous page will be 'page' and not 'page-1'.  Refresh is accomplished
 	 * by repeating the search.
 	 */
     if (*SearchUser && ((startnumber % MAXALIASESPERPAGE) != 1)) {
-      printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"),
-        page, html_text[135]);
-      printf ("&nbsp;|&nbsp;");
-      printh ("<a href=\"%s&searchuser=%C\">%s</a>", cgiurl("showforwards"),
-        SearchUser, html_text[136]);
+      // previous page
+      printh (HTML_ALIAS_SHOWPAGE, cgiurl("showforwards"), page, html_text[135]);
+      printf ("%s", HTML_MENU_SEP);
+      // refresh
+      printh (HTML_ALIAS_DOSEARCH, cgiurl("showforwards"), SearchUser, html_text[136]);
     } else {
       if (page > 1) {
-        printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"),
-          page - 1, html_text[135]);
-        printf ("&nbsp;|&nbsp;");
+        // previous page
+        printh (HTML_ALIAS_SHOWPAGE, cgiurl("showforwards"), page - 1, html_text[135]);
+        printf ("%s", HTML_MENU_SEP);
       }
-      printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"),
-        page, html_text[136]);
+      // refresh
+      printh (HTML_ALIAS_SHOWPAGE, cgiurl("showforwards"), page, html_text[136]);
     }
     if (moreusers) {
-      printf ("&nbsp;|&nbsp;");
-      printh ("<a href=\"%s&page=%d\">%s</a>", cgiurl("showforwards"),
-        page + 1, html_text[137]);    
+      printf ("%s", HTML_MENU_SEP);
+      // next page
+      printh (HTML_ALIAS_SHOWPAGE, cgiurl("showforwards"), page + 1, html_text[137]);
     }
-    printf ("&nbsp;]");
-    printf ("</td></tr>");                                    
+    printf ("%s", HTML_MENU_END);
+    printf ("%s", HTML_ALIAS_FOOTER_END);                                    
   }
 }
 
@@ -409,6 +414,7 @@
  char *alias_domain;
  char *alias_name_from_command;
  char *alias_line;
+ int firstrow;
  int j;
 
   if ( AdminType!=DOMAIN_ADMIN ) {
@@ -416,10 +422,7 @@
     vclose();
     exit(0);
   }
-                
-  printf ("<tr>");
-  printh ("<td align=\"center\" valign=\"top\"><b>%H</b></td>", user);
-    
+  
   alias_line = valias_select (user, Domain);
   while (alias_line != NULL) {
     alias_name_from_command = dotqmail_alias_command(alias_line);
@@ -432,6 +435,7 @@
   }
   
   curalias = firstalias;
+  firstrow = 1;
   while (curalias != NULL) {
     alias_line = curalias->alias_command;
     alias_name_from_command = dotqmail_alias_command (alias_line);
@@ -447,36 +451,28 @@
        for(j=0; TmpBuf3[j]!=0 && TmpBuf3[j]!='@';j++);
        TmpBuf3[j]=0;
        if (check_local_user(TmpBuf3)) {
-          strcpy (alias_user, TmpBuf3);
+          snprinth (alias_user, sizeof(alias_user), HTML_ALIAS_LOCAL, TmpBuf3);
        } else {
           /* make it red so it jumps out -- this is no longer a valid forward */
-          snprintf (alias_user, sizeof(alias_user), "<font color=\"red\">%s</font>", 
+          snprinth (alias_user, sizeof(alias_user), HTML_ALIAS_INVALID, 
                   alias_name_from_command);
        }
+    } else {
+      snprinth (alias_user, sizeof(alias_user), HTML_ALIAS_REMOTE, alias_name_from_command);
     }
-    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=\"%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");
-    printf ("<input type=\"image\" border=\"0\" src=\"%s/delete.png\">\n", IMAGEURL);
-    printf ("</form>\n");
-
+    printf ("%s", HTML_ALIAS_MOD_ROW_START);
+    if (firstrow) {
+      firstrow = 0;
+      printh (HTML_ALIAS_MOD_NAME, user);
+    } else {
+      printh (HTML_ALIAS_MOD_NAME, "");
+    }
+    printf (HTML_ALIAS_MOD_DEST, alias_user);
+    printh (HTML_ALIAS_MOD_DELETE, cgiurl("moddotqmailnow"), user, alias_line);
 
-    printf ("</td>\n");
-    printf ("</tr>\n");
-    printf ("<tr>\n");
-    printf ("<td align=\"left\">&nbsp;</td>\n");
+    printf ("%s", HTML_ALIAS_MOD_ROW_END);
     curalias = get_alias_entry();
   }
-  /* finish up the last line (all empty) */
-  printf ("<td align=\"left\">&nbsp;</td>");
-  printf ("<td align=\"left\">&nbsp;</td>");
-  printf ("</tr>");
 }
 
 int onevalidonly(char *user) {
@@ -515,38 +511,21 @@
   if (strcmp(Action,"delentry")==0) {
     if (onevalidonly(ActionUser) ) {
       snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[149]);
-      moddotqmail();
-      vclose();
-      exit(0);
-    }
-        
-    if (dotqmail_del_line(ActionUser,LineData) ) {
+    } else if (dotqmail_del_line(ActionUser,LineData) ) {
       snprintf (StatusMessage, sizeof(StatusMessage), "%s %d\n", html_text[150], 1);
-      moddotqmail();
-      vclose();
-      exit(0);
+    } else {
+      snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[151] );
     }
-    snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[151] );
-    moddotqmail();
-    vclose();
-    exit(0);
-    
   } else if (strcmp(Action,"add")==0) {
-    if( adddotqmail_shared(ActionUser, Newu, 0)) {
-      moddotqmail();
-      vclose();
-      exit(0);
-    } else {
+    if(! adddotqmail_shared(ActionUser, Newu, 0)) {
       snprinth (StatusMessage, sizeof(StatusMessage), "%s %H\n", html_text[152], Newu);
-      moddotqmail();
-      vclose();
-      exit(0);
     }
   } else {
     snprintf (StatusMessage, sizeof(StatusMessage), "%s\n", html_text[155]);
-    vclose();
-    exit(0);
   }
+  moddotqmail();
+  vclose();
+  exit(0);
 }
 
 void adddotqmail()

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.101
retrieving revision 1.15.2.102
diff -u -d -r1.15.2.101 -r1.15.2.102
--- ChangeLog	1 Jan 2007 23:17:05 -0000	1.15.2.101
+++ ChangeLog	21 Sep 2007 23:16:45 -0000	1.15.2.102
@@ -7,6 +7,8 @@
 	- Use function to generate cgi URLs.
 	- Remove unused AliasType variable.
 	- Use email address instead of maildir for catchall.
+	- Move HTML out of alias.c and into html.h as move toward more
+	  flexible HTML templates.
 
 1.2.11 - released 29-Dec-06
 
@@ -35,7 +37,7 @@
 	- Create autoresponder message before creating its .qmail file.
 	- Deliver copy before autoresponding to ensure delivery.
 	- On Modify User page, add current domain to forwarding address
-	  if it doesn't already include a domain. [1508971]
+	  if it doesn't already include a domain. [1508971, 1545664]
 	- Don't try to add list owner as moderator of new unmoderated list.
 
 1.2.10 - released 20-Feb-06

--- NEW FILE: html.h ---
/*
 * $Id: html.h,v 1.1.2.1 2007/09/21 23:16:45 tomcollins Exp $
 * Copyright (C) 1999-2006 Inter7 Internet Technologies, Inc.
 * Copyright (C) 2006 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
 */

#define HTML_MENU_START			"[&nbsp;"
#define HTML_MENU_SEP			"&nbsp;|&nbsp;"
#define HTML_MENU_END			"&nbsp;]"

#define HTML_EMPTY_TD			"<td> </td>"

#define HTML_BTN_GENERIC		"<img border=\"0\" src=\"" IMAGEURL "/delete.png\">"
#define HTML_BTN_DELETE			"<img border=\"0\" src=\"" IMAGEURL "/trash.png\">"

#define HTML_ALIAS_ERROR		"<tr><td colspan=\"4\">%s %s</td></tr>\n"

#define HTML_ALIAS_ROW_START	"<tr>"
#define HTML_ALIAS_ROW_END		"</tr>\n"

#define HTML_ALIAS_NAME			"<td align=left>%H</td>"

// start of the list of destination addresses
#define HTML_ALIAS_DEST_START	"<td align=left>"
#define HTML_ALIAS_DEST_END	"</td>"

// Possible destinations in list
// BLACKHOLE uses text string 303 (All mail deleted)
#define HTML_ALIAS_BLACKHOLE	"<i>%s</i>"
// LOCAL is for local addresses (no domain shown)
#define HTML_ALIAS_LOCAL		"%H"
// INVALID is for local addresses that no longer exist (error condition)
#define HTML_ALIAS_INVALID		"<font color=\"red\"><b>%H</b></font>"
// REMOTE is for remote addresses (domain is shown)
#define HTML_ALIAS_REMOTE		"%H"

#define HTML_ALIAS_SHOWPAGE	"<a href=\"%s&page=%d\">%s</a>"
#define HTML_ALIAS_DOSEARCH	"<a href=\"%s&searchuser=%C\">%s</a>"

#define HTML_ALIAS_FOOTER_START	"<tr><td align=\"right\" colspan=\"4\">"
#define HTML_ALIAS_FOOTER_END		"</td></tr>"

// HTML from the "modify alias" page
#define HTML_ALIAS_MOD_ROW_START	"<tr>"
#define HTML_ALIAS_MOD_ROW_END	"</tr>"
#define HTML_ALIAS_MOD_NAME		"<td align=\"center\" valign=\"top\"><b>%H</b></td>"
#define HTML_ALIAS_MOD_DEST		"<td align=\"center\" valign=\"top\">%s</td>\n"
#define HTML_ALIAS_MOD_DELETE		"<td align=\"center\" valign=\"top\">" \
	"<a href=\"%s&modu=%C&linedata=%C&action=delentry\">" HTML_BTN_DELETE "</a></td>\n"
	

[qmailadmin-cvs] qmailadmin mailinglist.c,1.5.2.10,1.5.2.11

[Rick W. <rw...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3952

Modified Files:
      Tag: stable-1_2
	mailinglist.c 
Log Message:
minor fixup to indent of mailinglist.c

Index: mailinglist.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -d -r1.5.2.10 -r1.5.2.11
--- mailinglist.c	30 Dec 2006 01:28:22 -0000	1.5.2.10
+++ mailinglist.c	17 Aug 2007 23:46:36 -0000	1.5.2.11
@@ -572,23 +572,23 @@
     unlink (TmpBuf);
   }
 
-  /* set Reply-To header */
-  GetValue (TmpCGI, TmpBuf, "replyto=", sizeof(TmpBuf));
-  replyto = atoi(TmpBuf);
-  if (replyto == REPLYTO_SENDER) {
-    /* ezmlm shouldn't remove/add Reply-To header */
-    ezmlm_setreplyto ("headeradd", "");
-    ezmlm_setreplyto ("headerremove", "");
-  } else {
-    if (replyto == REPLYTO_ADDRESS) {
-      GetValue (TmpCGI, replyto_addr, "replyaddr=", sizeof(replyto_addr));
-      sprintf (TmpBuf, "Reply-To: %s\n", replyto_addr);
-    } else {  /* REPLYTO_LIST */
-      strcpy (TmpBuf, "Reply-To: <#l#>@<#h#>\n");
+    /* set Reply-To header */
+    GetValue (TmpCGI, TmpBuf, "replyto=", sizeof(TmpBuf));
+    replyto = atoi(TmpBuf);
+    if (replyto == REPLYTO_SENDER) {
+        /* ezmlm shouldn't remove/add Reply-To header */
+        ezmlm_setreplyto ("headeradd", "");
+        ezmlm_setreplyto ("headerremove", "");
+    } else {
+        if (replyto == REPLYTO_ADDRESS) {
+            GetValue (TmpCGI, replyto_addr, "replyaddr=", sizeof(replyto_addr));
+            sprintf (TmpBuf, "Reply-To: %s\n", replyto_addr);
+        } else {  /* REPLYTO_LIST */
+            strcpy (TmpBuf, "Reply-To: <#l#>@<#h#>\n");
+            }
+        ezmlm_setreplyto ("headeradd", TmpBuf);
+        ezmlm_setreplyto ("headerremove", "Reply-To");
     }
-    ezmlm_setreplyto ("headeradd", TmpBuf);
-    ezmlm_setreplyto ("headerremove", "Reply-To");
-  }
 
   /* update inlocal file */
   sprintf(TmpBuf, "%s/%s/inlocal", RealDir, ActionUser);

[qmailadmin-cvs] Disappearing forwards

[Steffen B. <ste...@se...>]

Hallo List,

I just upgraded qmailadmin from 1.2.0 to 1.2.9 - and for some reason now =
I cannot see any of the forwards. All the dot-qmail files are there, and =
I can see the user accounts, but when I try to view the forwards through =
qmailadmin I just get "No Aliases/Forwards to Display".

Any ideas?

Many thanks in advance.

Stef

No virus found in this outgoing message.
Checked by AVG Free Edition.=20
Version: 7.5.472 / Virus Database: 269.8.13/844 - Release Date: =
6/11/2007 5:10 PM
=20

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.100, 1.15.2.101 command.c, 1.2.2.8, 1.2.2.9

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv32706

Modified Files:
      Tag: stable-1_2
	ChangeLog command.c 
Log Message:
Use email address instead of maildir for catchall.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.100
retrieving revision 1.15.2.101
diff -u -d -r1.15.2.100 -r1.15.2.101
--- ChangeLog	30 Dec 2006 01:31:49 -0000	1.15.2.100
+++ ChangeLog	1 Jan 2007 23:17:05 -0000	1.15.2.101
@@ -6,6 +6,7 @@
 	Tom Collins
 	- Use function to generate cgi URLs.
 	- Remove unused AliasType variable.
+	- Use email address instead of maildir for catchall.
 
 1.2.11 - released 29-Dec-06
 

Index: command.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/command.c,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -d -r1.2.2.8 -r1.2.2.9
--- command.c	30 Dec 2006 01:31:49 -0000	1.2.2.8
+++ command.c	1 Jan 2007 23:17:06 -0000	1.2.2.9
@@ -304,7 +304,7 @@
     if ( (fs = fopen(".qmail-default", "w")) == NULL ) {
       snprintf (StatusMessage, sizeof(StatusMessage), "%s", html_text[82]);
     } else {
-      fprintf(fs, "| %s/bin/vdelivermail '' %s\n", VPOPMAILDIR, pw->pw_dir);
+      fprintf(fs, "| %s/bin/vdelivermail '' %s@%s\n", VPOPMAILDIR, ActionUser, Domain);
       fclose(fs);
     }
   }

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.99, 1.15.2.100 command.c, 1.2.2.7, 1.2.2.8 qmailadmin.c, 1.6.2.11, 1.6.2.12 qmailadminx.h, 1.2.2.3, 1.2.2.4

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26071

Modified Files:
      Tag: stable-1_2
	ChangeLog command.c qmailadmin.c qmailadminx.h 
Log Message:
Remove unused AliasType variable.

Index: qmailadmin.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadmin.c,v
retrieving revision 1.6.2.11
retrieving revision 1.6.2.12
diff -u -d -r1.6.2.11 -r1.6.2.12
--- qmailadmin.c	5 Feb 2006 17:03:44 -0000	1.6.2.11
+++ qmailadmin.c	30 Dec 2006 01:31:49 -0000	1.6.2.12
@@ -63,7 +63,6 @@
 char Password2[MAX_BUFF];
 char Crypted[MAX_BUFF];
 char Alias[MAX_BUFF];
-char AliasType[MAX_BUFF];
 char LineData[MAX_BUFF];
 char Action[MAX_BUFF];
 char Message[MAX_BIG_BUFF];

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.99
retrieving revision 1.15.2.100
diff -u -d -r1.15.2.99 -r1.15.2.100
--- ChangeLog	30 Dec 2006 01:28:22 -0000	1.15.2.99
+++ ChangeLog	30 Dec 2006 01:31:49 -0000	1.15.2.100
@@ -5,6 +5,7 @@
 
 	Tom Collins
 	- Use function to generate cgi URLs.
+	- Remove unused AliasType variable.
 
 1.2.11 - released 29-Dec-06
 

Index: command.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/command.c,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -d -r1.2.2.7 -r1.2.2.8
--- command.c	5 Feb 2006 16:49:08 -0000	1.2.2.7
+++ command.c	30 Dec 2006 01:31:49 -0000	1.2.2.8
@@ -175,35 +175,29 @@
 
   } else if (strcmp(TmpBuf2, "moddotqmail") == 0 ) {
     GetValue(TmpCGI, ActionUser, "modu=", sizeof(ActionUser));
-    GetValue(TmpCGI, AliasType, "atype=", sizeof(AliasType));
     moddotqmail();
 
   } else if (strcmp(TmpBuf2, "moddotqmailnow") == 0 ) {
     GetValue(TmpCGI, ActionUser, "modu=", sizeof(ActionUser));
     GetValue(TmpCGI, Newu, "newu=", sizeof(Newu));
-    GetValue(TmpCGI, AliasType, "atype=", sizeof(AliasType));
     GetValue(TmpCGI, LineData, "linedata=", sizeof(LineData));
     GetValue(TmpCGI, Action, "action=", sizeof(Action));
     moddotqmailnow();
 
   } else if (strcmp(TmpBuf2, "deldotqmail") == 0 ) {
     GetValue(TmpCGI, ActionUser, "modu=", sizeof(ActionUser));
-    GetValue(TmpCGI, AliasType, "atype=", sizeof(AliasType));
     deldotqmail();
 
   } else if (strcmp(TmpBuf2, "deldotqmailnow") == 0 ) {
     GetValue(TmpCGI, ActionUser, "modu=", sizeof(ActionUser));
-    GetValue(TmpCGI, AliasType, "atype=", sizeof(AliasType));
     deldotqmailnow();
 
   } else if (strcmp(TmpBuf2, "adddotqmail") == 0 ) {
-    GetValue(TmpCGI, AliasType, "atype=", sizeof(AliasType));
     adddotqmail();
 
   } else if (strcmp(TmpBuf2, "adddotqmailnow") == 0 ) {
     GetValue(TmpCGI, ActionUser, "newu=", sizeof(ActionUser));
     GetValue(TmpCGI, Alias, "alias=", sizeof(Alias));
-    GetValue(TmpCGI, AliasType, "atype=", sizeof(AliasType));
     adddotqmailnow();
 
   } else if (strcmp(TmpBuf2, "addmailinglist") == 0 ) {

Index: qmailadminx.h
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/qmailadminx.h,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -d -r1.2.2.3 -r1.2.2.4
--- qmailadminx.h	23 Jan 2005 17:35:12 -0000	1.2.2.3
+++ qmailadminx.h	30 Dec 2006 01:31:49 -0000	1.2.2.4
@@ -34,7 +34,6 @@
 extern char Password2[MAX_BUFF];
 extern char Crypted[MAX_BUFF];
 extern char Alias[MAX_BUFF];
-extern char AliasType[MAX_BUFF];
 extern char LineData[MAX_BUFF];
 extern char Action[MAX_BUFF];
 extern char Message[MAX_BIG_BUFF];

[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

[Tom C. <tom...@us...>]

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 ("&nbsp;|&nbsp;");
-      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 ("&nbsp;|&nbsp;");
       }
-      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 ("&nbsp;|&nbsp;");
-      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 ("&nbsp;]");
     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 ("[&nbsp;");
       /* 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 ("&nbsp;|&nbsp;");
       }
 
       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 ("&nbsp;|&nbsp;");
       }
 /*        printf ("&nbsp;|&nbsp;");*/
 #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 ("&nbsp;|&nbsp;");
-      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 ("&nbsp;|&nbsp;");
-      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 ("&nbsp;]");
       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> &nbsp; ", 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);

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.97, 1.15.2.98 configure, 1.14.2.16, 1.14.2.17 configure.in, 1.15.2.16, 1.15.2.17

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv14115

Modified Files:
      Tag: stable-1_2
	ChangeLog configure configure.in 
Log Message:
start of 1.2.12 release

Index: configure
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v
retrieving revision 1.14.2.16
retrieving revision 1.14.2.17
diff -u -d -r1.14.2.16 -r1.14.2.17
--- configure	8 May 2006 05:22:34 -0000	1.14.2.16
+++ configure	29 Dec 2006 17:23:39 -0000	1.14.2.17
@@ -1648,7 +1648,7 @@
 
 
 QA_PACKAGE="qmailadmin"
-QA_VERSION="1.2.11"
+QA_VERSION="1.2.12"
 
 
 cat >>confdefs.h <<_ACEOF

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.97
retrieving revision 1.15.2.98
diff -u -d -r1.15.2.97 -r1.15.2.98
--- ChangeLog	29 Dec 2006 17:08:22 -0000	1.15.2.97
+++ ChangeLog	29 Dec 2006 17:23:39 -0000	1.15.2.98
@@ -1,6 +1,8 @@
 Numbers in square brackets ([]) indicate tracker item on SourceForge with 
 patch or information related to the entry.
 
+1.2.12 - unreleased
+
 1.2.11 - released 29-Dec-06
 
 	Brandon

Index: configure.in
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v
retrieving revision 1.15.2.16
retrieving revision 1.15.2.17
diff -u -d -r1.15.2.16 -r1.15.2.17
--- configure.in	8 May 2006 05:22:34 -0000	1.15.2.16
+++ configure.in	29 Dec 2006 17:23:39 -0000	1.15.2.17
@@ -6,7 +6,7 @@
 AC_CANONICAL_HOST
 
 QA_PACKAGE="qmailadmin"
-QA_VERSION="1.2.11"
+QA_VERSION="1.2.12"
 
 AC_DEFINE_UNQUOTED(QA_PACKAGE,"$QA_PACKAGE","")
 AC_DEFINE_UNQUOTED(QA_VERSION,"$QA_VERSION","")

[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.96,1.15.2.97

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv7806

Modified Files:
      Tag: stable-1_2
	ChangeLog 
Log Message:
set release date on 1.2.11

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.96
retrieving revision 1.15.2.97
diff -u -d -r1.15.2.96 -r1.15.2.97
--- ChangeLog	28 Nov 2006 00:28:29 -0000	1.15.2.96
+++ ChangeLog	29 Dec 2006 17:08:22 -0000	1.15.2.97
@@ -1,7 +1,7 @@
 Numbers in square brackets ([]) indicate tracker item on SourceForge with 
 patch or information related to the entry.
 
-1.2.11 - unreleased
+1.2.11 - released 29-Dec-06
 
 	Brandon
 	- Add missing semi-colons to   tags in user.c. [1537587]

[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.95,1.15.2.96

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv16292

Modified Files:
      Tag: stable-1_2
	ChangeLog 
Log Message:
add sf tracking number to ChangeLog

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.95
retrieving revision 1.15.2.96
diff -u -d -r1.15.2.95 -r1.15.2.96
--- ChangeLog	5 Oct 2006 16:14:11 -0000	1.15.2.95
+++ ChangeLog	28 Nov 2006 00:28:29 -0000	1.15.2.96
@@ -28,7 +28,7 @@
 	- Create autoresponder message before creating its .qmail file.
 	- Deliver copy before autoresponding to ensure delivery.
 	- On Modify User page, add current domain to forwarding address
-	  if it doesn't already include a domain.
+	  if it doesn't already include a domain. [1508971]
 	- Don't try to add list owner as moderator of new unmoderated list.
 
 1.2.10 - released 20-Feb-06

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.94, 1.15.2.95 mailinglist.c, 1.5.2.8, 1.5.2.9

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13540

Modified Files:
      Tag: stable-1_2
	ChangeLog mailinglist.c 
Log Message:
Don't try to add list owner as moderator of new unmoderated list.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.94
retrieving revision 1.15.2.95
diff -u -d -r1.15.2.94 -r1.15.2.95
--- ChangeLog	25 Sep 2006 12:53:56 -0000	1.15.2.94
+++ ChangeLog	5 Oct 2006 16:14:11 -0000	1.15.2.95
@@ -29,6 +29,7 @@
 	- Deliver copy before autoresponding to ensure delivery.
 	- On Modify User page, add current domain to forwarding address
 	  if it doesn't already include a domain.
+	- Don't try to add list owner as moderator of new unmoderated list.
 
 1.2.10 - released 20-Feb-06
 

Index: mailinglist.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/mailinglist.c,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -u -d -r1.5.2.8 -r1.5.2.9
--- mailinglist.c	23 Oct 2005 18:52:34 -0000	1.5.2.8
+++ mailinglist.c	5 Oct 2006 16:14:11 -0000	1.5.2.9
@@ -601,8 +601,10 @@
   /* if this is a new list, add owner as subscriber */
   if (newlist && (*list_owner != '\0')) {
     ezmlm_sub ("", list_owner);
-    /* add owner as moderator/remote admin as well */
-    ezmlm_sub ("mod", list_owner);
+    if (listopt['M'-'A'] == 'm') { /* moderation on */
+      /* add owner as moderator/remote admin as well */
+      ezmlm_sub ("mod", list_owner);
+    }
   }
 #endif
 }

[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.93,1.15.2.94

[Peter P. <ro...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26535

Modified Files:
      Tag: stable-1_2
	ChangeLog 
Log Message:
Fix a typo in Tom Collins's last entry: 'fowarding' => 'forwarding'.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.93
retrieving revision 1.15.2.94
diff -u -d -r1.15.2.93 -r1.15.2.94
--- ChangeLog	29 Aug 2006 16:57:35 -0000	1.15.2.93
+++ ChangeLog	25 Sep 2006 12:53:56 -0000	1.15.2.94
@@ -27,7 +27,7 @@
 	Tom Collins
 	- Create autoresponder message before creating its .qmail file.
 	- Deliver copy before autoresponding to ensure delivery.
-	- On Modify User page, add current domain to fowarding address
+	- On Modify User page, add current domain to forwarding address
 	  if it doesn't already include a domain.
 
 1.2.10 - released 20-Feb-06

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.92, 1.15.2.93 user.c, 1.11.2.15, 1.11.2.16

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6925

Modified Files:
      Tag: stable-1_2
	ChangeLog user.c 
Log Message:
On Modify User page, add current domain to fowarding address if it doesn't already include a domain.

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.11.2.15
retrieving revision 1.11.2.16
diff -u -d -r1.11.2.15 -r1.11.2.16
--- user.c	9 Aug 2006 21:45:25 -0000	1.11.2.15
+++ user.c	29 Aug 2006 16:57:35 -0000	1.11.2.16
@@ -928,7 +928,11 @@
       count=0;
       while( tmpstr != NULL && count < MAX_FORWARD_PER_USER) {
         if ((*tmpstr != '|') && (*tmpstr != '/')) {
-          fprintf(fs, "&%s\n", tmpstr);
+          if (strchr (tmpstr, '@') == NULL) {
+            fprintf(fs, "&%s@%s\n", tmpstr, Domain);
+          } else {
+            fprintf(fs, "&%s\n", tmpstr);
+          }
           emptydotqmail = 0;
           ++count;
         }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.92
retrieving revision 1.15.2.93
diff -u -d -r1.15.2.92 -r1.15.2.93
--- ChangeLog	9 Aug 2006 21:45:22 -0000	1.15.2.92
+++ ChangeLog	29 Aug 2006 16:57:35 -0000	1.15.2.93
@@ -27,6 +27,8 @@
 	Tom Collins
 	- Create autoresponder message before creating its .qmail file.
 	- Deliver copy before autoresponding to ensure delivery.
+	- On Modify User page, add current domain to fowarding address
+	  if it doesn't already include a domain.
 
 1.2.10 - released 20-Feb-06
 

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.91, 1.15.2.92 user.c, 1.11.2.14, 1.11.2.15

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv22722

Modified Files:
      Tag: stable-1_2
	ChangeLog user.c 
Log Message:
Add missing semi-colons to   tags in user.c. [1537587]

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.11.2.14
retrieving revision 1.11.2.15
diff -u -d -r1.11.2.14 -r1.11.2.15
--- user.c	8 May 2006 05:22:34 -0000	1.11.2.14
+++ user.c	9 Aug 2006 21:45:25 -0000	1.11.2.15
@@ -257,26 +257,26 @@
           CGIPATH,user,dom,mytime,
           atoi(Pagenumber)-1 ? atoi(Pagenumber)-1 : atoi(Pagenumber), 
           html_text[135]);
-        printf (" |&nbsp");
+        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]);
-        printf ("&nbsp;|&nbsp");
+        printf ("&nbsp;|&nbsp;");
       }
-/*        printf ("&nbsp;|&nbsp");*/
+/*        printf ("&nbsp;|&nbsp;");*/
 #endif
       printh ("<a href=\"%s/com/deleteall?user=%C&dom=%C&time=%d\">%s</a>", 
         CGIPATH,user,dom,mytime,html_text[235]);
-      printf ("&nbsp;|&nbsp");
+      printf ("&nbsp;|&nbsp;");
       printh ("<a href=\"%s/com/bounceall?user=%C&dom=%C&time=%d\">%s</a>", 
         CGIPATH,user,dom,mytime,html_text[134]);
-      printf ("&nbsp;|&nbsp");
+      printf ("&nbsp;|&nbsp;");
       printh ("<a href=\"%s/com/setremotecatchall?user=%C&dom=%C&time=%d\">%s</a>", 
         CGIPATH,user,dom,mytime,html_text[206]);
-      printf ("&nbsp]");
+      printf ("&nbsp;]");
       printf ("</b></font>");
       printf ("</td></tr>\n");
   }

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.91
retrieving revision 1.15.2.92
diff -u -d -r1.15.2.91 -r1.15.2.92
--- ChangeLog	29 Jun 2006 19:30:04 -0000	1.15.2.91
+++ ChangeLog	9 Aug 2006 21:45:22 -0000	1.15.2.92
@@ -3,6 +3,9 @@
 
 1.2.11 - unreleased
 
+	Brandon
+	- Add missing semi-colons to &nbsp; tags in user.c. [1537587]
+
 	Andreas Tolfsen
 	- Added Norwegian translation for strings 316 and 317.
 

[qmailadmin-cvs] qmailadmin ChangeLog, 1.15.2.90, 1.15.2.91 autorespond.c, 1.3.2.4, 1.3.2.5

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29660

Modified Files:
      Tag: stable-1_2
	ChangeLog autorespond.c 
Log Message:
Create autoresponder message before creating its .qmail file.  Deliver copy before autoresponding to ensure delivery.

Index: autorespond.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/autorespond.c,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- autorespond.c	23 Jan 2005 17:35:11 -0000	1.3.2.4
+++ autorespond.c	29 Jun 2006 19:30:05 -0000	1.3.2.5
@@ -168,18 +168,6 @@
   mkdir(TmpBuf2, 0750);
 
   /*
-   * Make the autoresponder .qmail file
-   */
-  valias_delete (ActionUser, Domain);
-  sprintf(TmpBuf, "|%s/autorespond 10000 5 %s/%s/message %s/%s",
-    AUTORESPOND_PATH, RealDir, TmpBuf2, RealDir, TmpBuf2);
-  valias_insert (ActionUser, Domain, TmpBuf);
-  if ( strlen(Newu) > 0 ) {
-    sprintf(TmpBuf, "&%s", Newu);
-    valias_insert (ActionUser, Domain, TmpBuf);
-  } 
-
-  /*
     * Make the autoresponder message file
    */
   sprintf(TmpBuf, "%s/message", TmpBuf2);
@@ -190,6 +178,18 @@
   fclose(fs);
 
   /*
+   * Make the autoresponder .qmail file
+   */
+  valias_delete (ActionUser, Domain);
+  if ( strlen(Newu) > 0 ) {
+    sprintf(TmpBuf, "&%s", Newu);
+    valias_insert (ActionUser, Domain, TmpBuf);
+  } 
+  sprintf(TmpBuf, "|%s/autorespond 10000 5 %s/%s/message %s/%s",
+    AUTORESPOND_PATH, RealDir, TmpBuf2, RealDir, TmpBuf2);
+  valias_insert (ActionUser, Domain, TmpBuf);
+
+  /*
    * Report success
    */
   snprinth (StatusMessage, sizeof(StatusMessage), "%s %H@%H\n",

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.90
retrieving revision 1.15.2.91
diff -u -d -r1.15.2.90 -r1.15.2.91
--- ChangeLog	8 May 2006 05:22:34 -0000	1.15.2.90
+++ ChangeLog	29 Jun 2006 19:30:04 -0000	1.15.2.91
@@ -21,6 +21,10 @@
 	  QmailAdmin include the user's email address as the last 
 	  parameter to --enable-spam-command.
 
+	Tom Collins
+	- Create autoresponder message before creating its .qmail file.
+	- Deliver copy before autoresponding to ensure delivery.
+
 1.2.10 - released 20-Feb-06
 
 	Peter Pentchev

[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.89,1.15.2.90 config.h.in,1.5.2.1,1.5.2.2 configure,1.14.2.15,1.14.2.16 configure.in,1.15.2.15,1.15.2.16 user.c,1.11.2.13,1.11.2.14

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22589

Modified Files:
      Tag: stable-1_2
	ChangeLog config.h.in configure configure.in user.c 
Log Message:
Add --enable-spamcmd-needs-email option to configure to have QmailAdmin include the user's email address as the last parameter to --enable-spam-command. (Dave Steinberg)

Index: config.h.in
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/config.h.in,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- config.h.in	12 Aug 2004 05:08:16 -0000	1.5.2.1
+++ config.h.in	8 May 2006 05:22:34 -0000	1.5.2.2
@@ -121,6 +121,9 @@
 #undef MODIFY_SPAM
 
 /* "" */
+#undef MODIFY_SPAM_NEED_EMAIL
+
+/* "" */
 #undef NO_CACHE
 
 /* Define to the address where bug reports for this package should be sent. */

Index: configure
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure,v
retrieving revision 1.14.2.15
retrieving revision 1.14.2.16
diff -u -d -r1.14.2.15 -r1.14.2.16
--- configure	21 Feb 2006 18:54:34 -0000	1.14.2.15
+++ configure	8 May 2006 05:22:34 -0000	1.14.2.16
@@ -853,6 +853,7 @@
   --disable-user-index   Don't display user index on show users page.
   --enable-modify-quota  Allow domain admin (postmaster) to modify user quotas.
   --enable-domain-autofill  Autofill the domain on login page based on the hostname that accesses qmailadmin.
+  --enable-spamcmd-needs-email  Append the user's email to the end of the spam command.
   --enable-modify-spam  Allow users to enable/disable spam checking.
   --enable-spam-command=CMD     Remember to use '|preline' at the beginning, |preline /usr/local/bin/maildrop /etc/mailfilter.
   --enable-help  Display help links on login page.
@@ -4502,6 +4503,28 @@
       ;;
 esac
 
+# Check whether --enable-spamcmd-needs-email or --disable-spamcmd-needs-email was given.
+if test "${enable_spamcmd_needs_email+set}" = set; then
+  enableval="$enable_spamcmd_needs_email"
+  SPAM_NEED_EMAIL="$enableval"
+fi;
+
+case $SPAM_NEED_EMAIL in
+1*|y*|Y*)
+      SPAM_NEED_EMAIL=yes
+
+cat >>confdefs.h <<_ACEOF
+#define MODIFY_SPAM_NEED_EMAIL 1
+_ACEOF
+
+      echo "checking whether to append the email to the end of the spam command... yes"
+      ;;
+*)
+      SPAM_NEED_EMAIL=no
+      echo "checking whether to append the email to the end of the spam command... no"
+      ;;
+esac
+
 # Check whether --enable-modify-spam or --disable-modify-spam was given.
 if test "${enable_modify_spam+set}" = set; then
   enableval="$enable_modify_spam"

Index: configure.in
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/configure.in,v
retrieving revision 1.15.2.15
retrieving revision 1.15.2.16
diff -u -d -r1.15.2.15 -r1.15.2.16
--- configure.in	21 Feb 2006 18:54:34 -0000	1.15.2.15
+++ configure.in	8 May 2006 05:22:34 -0000	1.15.2.16
@@ -350,6 +350,21 @@
       ;;
 esac
 
+AC_ARG_ENABLE(spamcmd-needs-email, [  --enable-spamcmd-needs-email  Append the user's email to the end of the spam command.],
+    SPAM_NEED_EMAIL="$enableval",)
+
+case $SPAM_NEED_EMAIL in
+1*|y*|Y*)
+      SPAM_NEED_EMAIL=yes
+      AC_DEFINE_UNQUOTED(MODIFY_SPAM_NEED_EMAIL,1,"")
+      echo "checking whether to append the email to the end of the spam command... yes"
+      ;;
+*)
+      SPAM_NEED_EMAIL=no
+      echo "checking whether to append the email to the end of the spam command... no"
+      ;;
+esac
+
 AC_ARG_ENABLE(modify-spam, [  --enable-modify-spam  Allow users to enable/disable spam checking.],
     MODIFY_SPAM="$enableval",)
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.89
retrieving revision 1.15.2.90
diff -u -d -r1.15.2.89 -r1.15.2.90
--- ChangeLog	8 May 2006 05:14:30 -0000	1.15.2.89
+++ ChangeLog	8 May 2006 05:22:34 -0000	1.15.2.90
@@ -16,6 +16,11 @@
 	Oden Eriksson
 	- Add string 316 to Swedish translation.
 
+	Dave Steinberg
+	- Add --enable-spamcmd-needs-email option to configure to have 
+	  QmailAdmin include the user's email address as the last 
+	  parameter to --enable-spam-command.
+
 1.2.10 - released 20-Feb-06
 
 	Peter Pentchev

Index: user.c
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/user.c,v
retrieving revision 1.11.2.13
retrieving revision 1.11.2.14
diff -u -d -r1.11.2.13 -r1.11.2.14
--- user.c	9 Feb 2006 05:09:53 -0000	1.11.2.13
+++ user.c	8 May 2006 05:22:34 -0000	1.11.2.14
@@ -466,7 +466,11 @@
     if(strcmp(spamvalue, "on") == 0) {
        snprintf(NewBuf, sizeof(NewBuf), "%s/.qmail", mypw->pw_dir);
        fs = fopen(NewBuf, "w+");
+#ifdef MODIFY_SPAM_NEED_EMAIL
+       fprintf(fs, "%s %s\n", SPAM_COMMAND, email);
+#else  
        fprintf(fs, "%s\n", SPAM_COMMAND);
+#endif
        fclose(fs);
     }
 #endif
@@ -940,7 +944,11 @@
       fprintf (fs, "# delete\n");
       emptydotqmail = 0;
     } else if (spam_check == 1) {
+#ifdef MODIFY_SPAM_NEED_EMAIL
+       fprintf(fs, "%s %s@%s\n", SPAM_COMMAND, ActionUser, Domain);
+#else  
       fprintf (fs, "%s\n", SPAM_COMMAND);
+#endif
       emptydotqmail = 0;
     } else {
       fprintf (fs, "%s/" MAILDIR "/\n", vpw->pw_dir);

[qmailadmin-cvs] qmailadmin/lang sv,1.2,1.2.2.1

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18520/lang

Modified Files:
      Tag: stable-1_2
	sv 
Log Message:
Add string 316 to Swedish translation. (Oden Eriksson)

Index: sv
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/lang/sv,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- sv	12 Sep 2003 22:35:32 -0000	1.2
+++ sv	8 May 2006 05:14:30 -0000	1.2.2.1
@@ -281,3 +281,4 @@
 313 adressen
 314 Ogiltig quota inmatning
 315 Användaren borttagen. Kunde inte sätta eftersändningsadressen till '%s'.
+316 Nödvändigt fält saknas.

[qmailadmin-cvs] qmailadmin ChangeLog,1.15.2.88,1.15.2.89

[Tom C. <tom...@us...>]

Update of /cvsroot/qmailadmin/qmailadmin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18520

Modified Files:
      Tag: stable-1_2
	ChangeLog 
Log Message:
Add string 316 to Swedish translation. (Oden Eriksson)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/qmailadmin/qmailadmin/ChangeLog,v
retrieving revision 1.15.2.88
retrieving revision 1.15.2.89
diff -u -d -r1.15.2.88 -r1.15.2.89
--- ChangeLog	8 May 2006 05:10:21 -0000	1.15.2.88
+++ ChangeLog	8 May 2006 05:14:30 -0000	1.15.2.89
@@ -13,6 +13,9 @@
 	Nicolas Croiset
 	- Add strings 316 & 317, fix string 267 in French translation.
 
+	Oden Eriksson
+	- Add string 316 to Swedish translation.
+
 1.2.10 - released 20-Feb-06
 
 	Peter Pentchev