From 492660c0081dae79aa414fa7b0780edfdd3d9e4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Fri, 16 Feb 2007 18:13:00 +0000 Subject: [PATCH] removed stuff that wasn't ready for commit' --- citadel/aidepost.c | 2 +- citadel/sendwelcomemail.sh | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/citadel/aidepost.c b/citadel/aidepost.c index 71502756a..3e60dc976 100644 --- 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 4b84325eb..f1ac8c178 100644 --- 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" -- 2.39.2