mk_module_init.sh now tests to see if echo supports -e and -E

[citadel.git] / citadel / serv_listsub.c
diff --git a/citadel/serv_listsub.c b/citadel/serv_listsub.c

index e9099c0dde3c511258ff5ddcd2c96bece0067351..93e93553b5a54c92618cb64125e6596b93baeced 100644 (file)
--- a/citadel/serv_listsub.c
+++ b/citadel/serv_listsub.c
@@ -35,11 +35,9 @@
  #include <limits.h>
  #include "citadel.h"
  #include "server.h"
-#include "sysdep_decls.h"
  #include "citserver.h"
  #include "support.h"
  #include "config.h"
-#include "serv_extensions.h"
  #include "room_ops.h"
  #include "user_ops.h"
  #include "policy.h"
@@ -56,6 +54,10 @@
  #endif
  
  
+
+#include "ctdl_module.h"
+
+
  /*
   * Generate a randomizationalisticized token to use for authentication of
   * a subscribe or unsubscribe request.
@@ -179,6 +181,7 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
                 "\n"
                 "--__ctdlmultipart__\n"
                 "Content-type: text/html\n"
+               "\n"
                 "<HTML><BODY>\n"
                 "Someone (probably you) has submitted a request to subscribe\n"
                 "&lt;%s&gt; to the <B>%s</B> mailing list.<BR><BR>\n"
@@ -204,6 +207,7 @@ void do_subscribe(char *room, char *email, char *subtype, char *webpage) {
  
         quickie_message(        /* This delivers the message */
                 "Citadel",
+               NULL,
                 email,
                 NULL,
                 confirmation_request,
@@ -317,6 +321,7 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
                 "\n"
                 "--__ctdlmultipart__\n"
                 "Content-type: text/html\n"
+               "\n"
                 "<HTML><BODY>\n"
                 "Someone (probably you) has submitted a request to unsubscribe\n"
                 "&lt;%s&gt; from the <B>%s</B> mailing list.<BR><BR>\n"
@@ -342,6 +347,7 @@ void do_unsubscribe(char *room, char *email, char *webpage) {
  
         quickie_message(        /* This delivers the message */
                 "Citadel",
+               NULL,
                 email,
                 NULL,
                 confirmation_request,
@@ -558,8 +564,10 @@ void cmd_subs(char *cmdbuf) {
  /*
   * Module entry point
   */
-char *serv_listsub_init(void)
+CTDL_MODULE_INIT(listsub)
  {
         CtdlRegisterProtoHook(cmd_subs, "SUBS", "List subscribe/unsubscribe");
+
+       /* return our Subversion id for the Log */
         return "$Id$";
  }