removed stuff that wasn't ready for commit'

diff --git a/citadel/aidepost.c b/citadel/aidepost.c
index 71502756a3660f7ec378f52d05bcb31fc8bd0276..3e60dc97664b97b49aba54b47c66574674534300 100644 (file)
--- a/citadel/aidepost.c
+++ b/citadel/aidepost.c
@@ -41,7 +41,7 @@ static void ap_make_message(FILE *fp, char *target_room, char *author)
        time_t now;
        time(&now);
        putc(255, fp);
-       putc(MT_RFC822, fp);
+       putc(MES_NORMAL, fp);
        putc(1, fp);
        fprintf(fp, "Proom_aide");
        putc(0, fp);

diff --git a/citadel/sendwelcomemail.sh b/citadel/sendwelcomemail.sh
index 4b84325eb669c973530c919c9e9b00e74ef2e52b..f1ac8c1783cf83771905d92db877cdd5d8f8d54e 100644 (file)
--- a/citadel/sendwelcomemail.sh
+++ b/citadel/sendwelcomemail.sh
@@ -7,12 +7,9 @@ export WELCOMETXT=welcomemail.txt
 export FROM=room_citadel_stats@uncensored.citadel.org
 export TO=room_lobby
 (
-    printf "Subject: Welcome to your new citadel installation!\r\n"
-    printf "Content-Type: text/html MIME-Version: 1.0\r\n\r\n"
+    printf "MIME-Version: 1.0\r\nContent-Type: multipart/alternative; \r\n boundary=$FOO\r\n\r\nThis is a multi-part message in MIME format.\r\n\r\n--$FOO\r\nContent-Type: text/plain; charset=utf-8\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"; 
+    cat $WELCOMETXT
+    printf "\r\n\r\n--$FOO\r\nContent-Type: text/html; charset=US-ASCII\r\nContent-Transfer-Encoding: quoted-printable\r\n\r\n"
     cat $WELCOMEHTML; 
-
-) | \
-       ../aidepost  -rLobby -aroom_citadel_support@uncensored.citadel.org 
-
-
-#    citmail -bm -r "$FROM" "$TO"
+    printf "\r\n\r\n--$FOO--\r\n\r\n") | \
+    citmail -bm -r "$FROM" "$TO"