* serv_listsub.c: web subscription/confirmation address no longer has http://

  prepended to it.  This means that clients now must supply that.  This was
  done because we can no longer assume http -- it was breaking on https.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index fde3c13be3a8fe66eacd877d9d19edc875af11d6..67f64ccec1bbc450b3071a5749f551d7e557ae3b 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 24 11:19:47 EDT 2005 ajc
+* serv_listsub.c: web subscription/confirmation address no longer has http://
+  prepended to it.  This means that clients now must supply that.  This was
+  done because we can no longer assume http -- it was breaking on https.
+
 Sun Oct 23 23:28:23 EDT 2005 ajc
 * "day start" and "day end" preferences for calendar day view.
 

diff --git a/citadel/serv_listsub.c b/citadel/serv_listsub.c
index 9154e60119f2c230d4c453e3e13cac5a3da00588..c838a97f759b876703ea655bd8c75d375852fc3a 100644 (file)
--- a/citadel/serv_listsub.c
+++ b/citadel/serv_listsub.c
@@ -3,7 +3,7 @@
  *
  * This module handles self-service subscription/unsubscription to mail lists.
  *
- * Copyright (C) 2002 by Art Cancro and others.
+ * Copyright (C) 2002-2005 by Art Cancro and others.
  * This code is released under the terms of the GNU General Public License.
  *
  */
@@ -163,8 +163,8 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
                "Someone (probably you) has submitted a request to subscribe\n"
                "&lt;%s&gt; to the <B>%s</B> mailing list.<BR><BR>\n"
                "Please click here to confirm this request:<BR>\n"
-               "<A HREF=\"http://%s?room=%s&token=%s&cmd=confirm\">"
-               "http://%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
+               "<A HREF=\"%s?room=%s&token=%s&cmd=confirm\">"
+               "%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
                "If this request has been submitted in error and you do not\n"
                "wish to receive the '%s' mailing list, simply do nothing,\n"
                "and you will not receive any further mailings.\n"
@@ -276,8 +276,8 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
                "to unsubscribe\n"
                "&lt;%s&gt; from the <B>%s</B> mailing list.<BR><BR>\n"
                "Please click here to confirm this request:<BR>\n"
-               "<A HREF=\"http://%s?room=%s&token=%s&cmd=confirm\">"
-               "http://%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
+               "<A HREF=\"%s?room=%s&token=%s&cmd=confirm\">"
+               "%s?room=%s&token=%s&cmd=confirm</A><BR><BR>\n"
                "If this request has been submitted in error and you do\n"
                "<i>not</i> wish to unsubscribe from the "
                "'%s' mailing list, simply do nothing,\n"