X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fsendwelcomemail.sh;h=432b13135d66889af23d2c9e2335c7cdd0af53ad;hb=42147eb1950e0c616b070a8676603b551b1d9c58;hp=4b84325eb669c973530c919c9e9b00e74ef2e52b;hpb=b7dc265b228b8da7a5beab3114ac1794fa7a813e;p=citadel.git

diff --git a/citadel/sendwelcomemail.sh b/citadel/sendwelcomemail.sh
index 4b84325eb..432b13135 100644
--- a/citadel/sendwelcomemail.sh
+++ b/citadel/sendwelcomemail.sh
@@ -4,15 +4,12 @@
 export FOO=2600908b3f21ae7f692b973ed26e212d
 export WELCOMEHTML=welcomemail.html
 export WELCOMETXT=welcomemail.txt
-export FROM=room_citadel_stats@uncensored.citadel.org
+export FROM=nobody@example.com
 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"