commit c54830adcfff9e7ec910825ace159fcabf5ed456
from: jrmu <jrmu@ircnow.org>
date: Sun Mar 05 23:04:17 2023 UTC

Clarified email message for accounts needing approval

commit - 73a53a9f85235ed7ada13f9f03c3306fbc865a7c
commit + c54830adcfff9e7ec910825ace159fcabf5ed456
blob - 7526a64d15a0a6e405ca6af9cfed618147e69880
blob + b53d41784974aa439dabf2e1db1891d01baca13f
--- BNC.pm
+++ BNC.pm
@@ -403,16 +403,29 @@ EOF
 sub mailbnc {
 	my( $username, $email, $password, $service, $hashirc )=@_;
 	my $passhash = sha256_hex("$username");
+	my $approvemsg;
+	if ($approval eq "true") {
+		$approvemsg = <<"EOF";
+
+*IMPORTANT*: Your account has been created but it has not yet been
+activated. To activate your account, please contact your admins
+$staff on IRC and by email.
 
+EOF
+	}
+
 my $body = <<"EOF";
-You created a bouncer!
+Welcome to IRCNow!
 
+You created a bouncer:
+
 Username: $username
 Password: $password
 Server: $hostname
 Port: $sslport for SSL (secure connection)
 Port: $plainport for plaintext
-
+Webpanel: $webpanel
+$approvemsg
 *IMPORTANT*: Verify your email address:
 
 Please reply to this email to indicate you have received the email. You must
blob - 326d6f479f0c73543015e3299f8a26307b3d0e2e
blob + 14153c3d570d26cb6f92b04d67e07903dec73848
--- Shell.pm
+++ Shell.pm
@@ -192,6 +192,17 @@ sub mailshell {
 	my( $username, $email, $password, $service, $version )=@_;
 	my $passhash = sha256_hex("$username");
 	my $versionhash = encode_base64($version);
+	my $approvemsg;
+	if ($approval eq "true") {
+		$approvemsg = <<"EOF";
+
+*IMPORTANT*: Your account has been created but it has not yet been
+activated. To activate your account, please contact your admins
+$staff on IRC and by email.
+
+EOF
+	}
+
 	my $body = <<"EOF";
 You created a shell account!
 
@@ -201,8 +212,8 @@ Server: $hostname
 SSH Port: 22
 Your Ports: $startPort to $endPort
 
-To customize your vhost, connect to ask in #ircnow
-
+To customize your vhost, connect to ask in $chans
+$approvemsg
 *IMPORTANT*: Verify your email address:
 
 Please reply to this email to indicate you have received the email. You must
blob - 190fbcb438fb6cbacbcae6cd04c72233e1a835d0
blob + 1005dddb4ee1f7faae95bea7f563897b62162853
--- botnow
+++ botnow
@@ -84,6 +84,9 @@ $conf{port} = $conf{port} || 1337;
 # Bouncer hostname
 chomp($conf{hostname} = $conf{hostname} || `hostname`);
 
+# Webpanel URL
+chomp($conf{webpanel} = $conf{webpanel} || "https://bnc.$conf{hostname}");
+
 # External IPv4 address, plaintext and ssl port
 $conf{ip4} = $conf{ip4} or die "ERROR: botnow.conf: ip4";
 $conf{ip6} = $conf{ip6} or die "ERROR: botnow.conf: ip6";
blob - 53de1dbef8b9b2eafc48df02163f4d21002ab40a
blob + a8861fb0055e97395b89f9ac4632664172841b57
--- botnow.conf.example
+++ botnow.conf.example
@@ -10,6 +10,9 @@ localnet = example
 #Bouncer hostname
 hostname = example.com
 
+#Webpanel URL
+webpanel = https://bnc.example.com
+
 #External IP addresses, plaintext and ssl port
 ip4 = 192.168.0.1
 ip6 = 2001:db8::
@@ -47,9 +50,7 @@ mailfrom = support@example.com
 #Modules to load
 modules = BNC DNS Mail Shell SQLite Hash Help
 
-#Uncomment to require admin approval for new accounts. If
-#uncommented, the admin must manually unblock the user before the
-#account can be used
+#Uncomment to require admin approval for new accounts
 #approval = true
 
 #Terms of Service