X-Git-Url: https://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=users.sh;h=1959e9de4b757084fad3d850b1b7b771517cb3c3;hp=18fde077d6a99ec191d8aa016c34addd19c65fc7;hb=HEAD;hpb=51f6906bca7e34cdedca01e024f6cedb1c9e3ecd

diff --git a/users.sh b/users.sh
index 18fde07..32299ff 100755
--- a/users.sh
+++ b/users.sh
@@ -17,8 +17,8 @@
 [ -n "$include_users" ] && return 0
 include_users="$0"
 
-. "${_EXEC}/cgilite/session.sh"
-. "${_EXEC}/cgilite/storage.sh"
+. "${_EXEC:-.}/cgilite/session.sh"
+. "${_EXEC:-.}/cgilite/storage.sh"
 
 SENDMAIL=${SENDMAIL-sendmail}
 
@@ -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"
@@ -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)"