debug function

[cgilite] / users.sh

diff --git a/users.sh b/users.sh
index be68a8acbe04ca0864917f92b0aef9541536429a..32299ff1e3f97f26f7cb2c7d3860d56c1a3e83d2 100755 (executable)
--- a/users.sh
+++ b/users.sh
@@ -29,9 +29,8 @@ USER_ACCOUNTPAGE="${USER_ACCOUNTPAGE}"
 USER_ACCOUNTEXPIRE="${USER_ACCOUNTEXPIRE:-$((86400 * 730))}"
 USER_CONFIRMEXPIRE="${USER_CONFIRMEXPIRE:-86400}"
 
-MAILFROM="${MAILDOMAIN-noreply@${HTTP_HOST%:*}}"
-
 HTTP_HOST="$(HEADER Host)"
+MAILFROM="noreply@${HTTP_HOST%:*}"
 
 [ "$HTTPS" ] && SCHEMA=https || SCHEMA=http
 
@@ -622,7 +621,7 @@ w_user_invite(){
 
   if [ "$(GET user_confirm)" ]; then
     w_user_confirm
-  elif [ "$USER_ID" -a "$SENDMAIL" ]; then
+  elif [ "$USER_ID" -a "$USER_REQUIREEMAIL" = true ]; then
     w_user_invite_email
   elif [ "$USER_ID" ]; then
     uid="$(timeid)"