From 4cbf15ab900a88ceb16b0853e0c84198603c5909 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Fri, 4 Dec 2020 21:46:12 -0700
Subject: [PATCH] Fix auth for Synchronet servers after config changes

---
 Rocksolid_Light/rocksolid/newsportal.php | 8 +++++++-
 Rocksolid_Light/rocksolid/post.php       | 6 ++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Rocksolid_Light/rocksolid/newsportal.php b/Rocksolid_Light/rocksolid/newsportal.php
index fd3701e..8c7bf3b 100644
--- a/Rocksolid_Light/rocksolid/newsportal.php
+++ b/Rocksolid_Light/rocksolid/newsportal.php
@@ -42,12 +42,16 @@ $CONFIG = include($config_file);
  */
 function nntp_open($nserver=0,$nport=0) {
   global $text_error,$CONFIG;
-  global $server,$port;
+  global $server,$port,$synchro_user,$synchro_pass;
   // echo "<br>NNTP OPEN<br>";
   if(!isset($CONFIG['enable_nntp']) || $CONFIG['enable_nntp'] != true) {
     $CONFIG['server_auth_user'] = $CONFIG['remote_auth_user'];
     $CONFIG['server_auth_pass'] = $CONFIG['remote_auth_pass'];
   } 
+  if(isset($synchro_user)) {
+    $CONFIG['server_auth_user'] = $synchro_user;
+    $CONFIG['server_auth_pass'] = $synchro_pass;
+  }
   $authorize=((isset($CONFIG['server_auth_user'])) && (isset($CONFIG['server_auth_pass'])) &&
               ($CONFIG['server_auth_user'] != ""));
   if ($nserver==0) $nserver=$server;
@@ -83,6 +87,8 @@ function nntp_open($nserver=0,$nport=0) {
     }
   }
   if ($ns==false) echo "<p>".$text_error["connection_failed"]."</p>";
+  unset($synchro_user);
+  unset($synchro_pass);
   return $ns;
 }
 
diff --git a/Rocksolid_Light/rocksolid/post.php b/Rocksolid_Light/rocksolid/post.php
index 47143bd..4e8eab4 100644
--- a/Rocksolid_Light/rocksolid/post.php
+++ b/Rocksolid_Light/rocksolid/post.php
@@ -59,6 +59,8 @@ if ((isset($post_port)) && ($post_port!=""))
 include "head.inc";
 include $file_newsportal;
 
+global $synchro_user,$synchro_pass;
+
 // check to which groups the user is allowed to post to
 $thisgroup=_rawurldecode($_REQUEST['group']);
 if($testgroup) {
@@ -109,8 +111,8 @@ if(!strcmp($name, $CONFIG['anonusername']) && (isset($CONFIG['anonuser']))) {
 }
 
 if (isset($CONFIG['synchronet']) && ($CONFIG['synchronet'] == true)) {
-  $CONFIG['server_auth_user']=$name;
-  $CONFIG['server_auth_pass']=$userpass;
+  $synchro_user=$name;
+  $synchro_pass=$userpass;
 } 
 
 if($name=="")