From 29528981d444806ee329788707be048f3fedde98 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Sat, 13 Feb 2021 17:54:31 -0700
Subject: [PATCH] Clean up Synchronet account creation

---
 Rocksolid_Light/common/create.php       | 14 +++++---------
 Rocksolid_Light/rslight/synchronet.conf |  9 +++++++++
 2 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 Rocksolid_Light/rslight/synchronet.conf

diff --git a/Rocksolid_Light/common/create.php b/Rocksolid_Light/common/create.php
index 5231c84..49e0c4a 100644
--- a/Rocksolid_Light/common/create.php
+++ b/Rocksolid_Light/common/create.php
@@ -1,6 +1,7 @@
 <?php
 //  setcookie("ts_limit",4096,time()+(3600*24*30),"/");
   include "config.inc.php";
+  include $config_dir.'/synchronet.conf';
   include "head.inc";
   $CONFIG = include($config_file);
   $workpath = $config_dir."users/";
@@ -12,7 +13,6 @@
   $userFilename = $workpath.$username;
   $keyFilename = $keypath.$username;
   @mkdir($workpath.'new/');
-  $tmpFilename = $workpath."new/".$username;
   $verified = 0;
 
   $no_verify=explode(' ', $CONFIG['no_verify']);
@@ -42,14 +42,10 @@
         fclose($userFileHandle);
         chmod($userFilename, 0666);
     }
-    if(isset($synch_create) && $synch_create === true) {
-        $result = shell_exec('/sbbs/rscreate/createbbsuser '.$username.' '.$password);
-    }
-    if ($userFileHandle = @fopen($tmpFilename, 'w+'))
-    {
-        fwrite($userFileHandle, $password);
-        fclose($userFileHandle);
-        chmod($tmpFilename, 0666);
+// Create synchronet account
+    if(isset($synch_create) && $synch_create == true) {
+	putenv("SBBSCTRL=$synch_path/ctrl");
+	$result = shell_exec("$synch_path/exec/makeuser $username -P $password");
     }
     $newkey = make_key($username);
     if ($userFileHandle = @fopen($keyFilename, 'w+'))
diff --git a/Rocksolid_Light/rslight/synchronet.conf b/Rocksolid_Light/rslight/synchronet.conf
new file mode 100644
index 0000000..6ea4c1d
--- /dev/null
+++ b/Rocksolid_Light/rslight/synchronet.conf
@@ -0,0 +1,9 @@
+<?php
+/* This is the configuration file for integration with Synchronet
+ * If you wish to create synchronet accounts from rslight,
+ * synchronet (sbbs) and your web user must match.
+ * You can change synchronet user/group in $synch_path/ctrl/sbbs.ini
+*/
+  $synch_create = '1';
+  $synch_path = '/sbbs/';
+?>