From 12cf98c5993800f99f44d2d520eee236d760ae31 Mon Sep 17 00:00:00 2001
From: Rob Swindell <rob@synchro.net>
Date: Sat, 3 Oct 2020 12:21:05 -0700
Subject: [PATCH] No functional change. MsgBase.error is the official property
name.
---
exec/newuser.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/exec/newuser.js b/exec/newuser.js
index bde4e98da1..7aa84fd932 100644
--- a/exec/newuser.js
+++ b/exec/newuser.js
@@ -104,8 +104,10 @@ if(options.ask_sysop
/* Send New User Welcome E-mail */
/********************************/
welcome_msg = system.text_dir + "welcome.msg";
-if(options.send_welcome && file_exists(welcome_msg) && !qnet && user.number>1)
- send_newuser_welcome_msg(welcome_msg);
+if(options.send_welcome && file_exists(welcome_msg) && !qnet && user.number>1) {
+ if(send_newuser_welcome_msg(welcome_msg))
+ log(LOG_INFO,"Sent new user welcome e-mail");
+}
function send_newuser_welcome_msg(fname)
{
@@ -120,7 +122,7 @@ function send_newuser_welcome_msg(fname)
msgbase = new MsgBase("mail");
if(msgbase.open()==false) {
- log(LOG_ERR,"!ERROR " + msgbase.last_error);
+ log(LOG_ERR,"!ERROR " + msgbase.error);
return(false);
}
@@ -133,10 +135,10 @@ function send_newuser_welcome_msg(fname)
subject: "Welcome to " + system.name + "!"
};
- if(!msgbase.save_msg(hdr, msgtxt))
- log(LOG_ERR,"!ERROR " + msgbase.last_error + "saving mail message");
-
- log(LOG_INFO,"Sent new user welcome e-mail");
+ var result = msgbase.save_msg(hdr, msgtxt);
+ if(!result)
+ log(LOG_ERR, "!ERROR " + msgbase.error + " saving mail message");
msgbase.close();
+ return result;
}
--
GitLab