X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=users.sh;h=c924789c2e25a6fcb71b7b60eb9980373e9038ec;hb=d7b1281dbec20a236a14bd0fa8771da1ce353d00;hp=f60f8a645ff7ae4445737bbf92d58dad8ec913c1;hpb=6ab69002e5b686ee4dacdc5a64d620d7361fb070;p=cgilite

diff --git a/users.sh b/users.sh
index f60f8a6..c924789 100755
--- 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
 
@@ -274,7 +273,7 @@ user_register(){
   fi
 
   if   [ "$USER_REQUIREEMAIL" = true ]; then
-    if [ ! "email" ]; then
+    if [ ! "$email" ]; then
       REDIRECT "${_BASE}${PATH_INFO}#ERROR_EMAIL_INVALID"
     elif user_emailexist "$email"; then
       REDIRECT "${_BASE}${PATH_INFO}#ERROR_EMAIL_EXISTS"
@@ -342,7 +341,7 @@ user_invite(){
   local email="$(POST email |user_checkemail)"
   local message="$(POST message)"
 
-  if [ ! "email" ]; then
+  if [ ! "$email" ]; then
     REDIRECT "${_BASE}${PATH_INFO}#ERROR_EMAIL_INVALID"
   elif user_emailexist "$email"; then
     REDIRECT "${_BASE}${PATH_INFO}#ERROR_EMAIL_EXISTS"