From 0dfe8d162e5b91d641697890e6914a75d030f310 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Thu, 13 Jul 2023 09:17:38 -0700
Subject: [PATCH] Standardize view for logged in features headers.

---
 Rocksolid_Light/spoolnews/files.php  |  3 ++
 Rocksolid_Light/spoolnews/upload.php |  4 +++
 Rocksolid_Light/spoolnews/user.php   | 46 ++++++++++++++++++++++------
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/Rocksolid_Light/spoolnews/files.php b/Rocksolid_Light/spoolnews/files.php
index 7d0bd47..02f716d 100644
--- a/Rocksolid_Light/spoolnews/files.php
+++ b/Rocksolid_Light/spoolnews/files.php
@@ -25,6 +25,9 @@ include "newsportal.php";
   }
   $title.=' - Browse files';
 include "head.inc";
+  echo '<h1 class="np_thread_headline">';
+  echo '<a href="../spoolnews/files.php" target='.$frame['menu'].'>files</a> / ';
+  echo htmlspecialchars($_COOKIE['mail_name']).'</h1>';
   echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
 // Browse button
     echo '<td>';
diff --git a/Rocksolid_Light/spoolnews/upload.php b/Rocksolid_Light/spoolnews/upload.php
index a0b6e3a..db17e9a 100644
--- a/Rocksolid_Light/spoolnews/upload.php
+++ b/Rocksolid_Light/spoolnews/upload.php
@@ -26,6 +26,10 @@ if((password_verify($_POST['username'].$keys[0].get_user_config($_POST['username
 
   $title.=' - Upload file';
 include "head.inc";
+  echo '<h1 class="np_thread_headline">';
+  echo '<a href="../spoolnews/files.php" target='.$frame['menu'].'>files</a> / ';
+  echo htmlspecialchars($_COOKIE['mail_name']).'</h1>';
+  echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
   echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
 // Browse button
     echo '<td>';
diff --git a/Rocksolid_Light/spoolnews/user.php b/Rocksolid_Light/spoolnews/user.php
index 3c78116..04e1f3e 100644
--- a/Rocksolid_Light/spoolnews/user.php
+++ b/Rocksolid_Light/spoolnews/user.php
@@ -27,7 +27,11 @@ if($_POST['command'] == 'Logout') {
   unset($_SESSION['theme']);
   unset($_POST['username']);
   include "head.inc";
-  echo 'You have been logged out';
+  echo "<center>";
+  echo "<hr><p>You have been logged out</p>";
+  echo '</center>';
+  echo '<br />';
+  include "tail.inc";
   exit(0);
 }
 $title.=' - User Configuration';
@@ -74,11 +78,15 @@ include "head.inc";
 		echo 'Login failed.';
 	}
   }
-  echo '<h1 class="np_thread_headline">';
-    
-  echo '<a href="user.php" target='.$frame['menu'].'>Configuration</a> / ';
-  echo htmlspecialchars($_POST['username']).'</h1>';
-
+  if(isset($_POST['command']) && $_POST['command'] == 'Configuration') {
+    echo '<h1 class="np_thread_headline">';
+    echo '<a href="user.php" target='.$frame['menu'].'>Configuration</a> / ';
+    echo htmlspecialchars($_POST['username']).'</h1>';
+  } else {
+    echo '<h1 class="np_thread_headline">';
+    echo '<a href="user.php" target='.$frame['menu'].'>user login</a> / ';
+    echo htmlspecialchars($_POST['username']).'</h1>';
+  }
 echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
 // Mail button
     if($logged_in == true) {
@@ -97,6 +105,14 @@ echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
           echo '<button class="np_button_link" type="submit">Files</button>';
           echo '</form>';
           echo '</td>';
+// Configuration button
+          echo '<td>';
+          echo '<form target="'.$frame['content'].'" method="post" action="user.php">';
+          echo '<input name="command" type="hidden" id="command" value="Configuration" readonly="readonly">';
+          echo "<input type='hidden' name='username' value='".$_POST['username']."' />";
+          echo '<button class="np_button_link" type="submit">Configuration</button>';
+          echo '</form>';
+          echo '</td>';
 // Logout button
       echo '<td>';
       echo '<form target="'.$frame['content'].'" method="post" action="user.php">';
@@ -145,7 +161,12 @@ echo '</table>';
   $userfile=$spooldir.'/'.$user.'-articleviews.dat';
   if(is_file($userfile)) {
      $userdata = unserialize(file_get_contents($userfile));
-//     ksort($userdata);
+  }
+// Show Logged-In Message
+  if($_POST['command'] != 'Configuration' && $_POST['command'] != 'SaveConfig') {
+    echo "<center>";
+    echo "<hr><p>You are logged in as ".$_POST['username']."</p>";
+    echo '</center>';
   }
 // Apply Config
     if(isset($_POST['command']) && $_POST['command'] == 'SaveConfig') {
@@ -168,8 +189,10 @@ echo '</table>';
 	}
 	file_put_contents($spooldir.'/'.$user.'-articleviews.dat', serialize($newsubs));
 	$userdata = unserialize(file_get_contents($userfile));
-	ksort($userdata);
-	echo 'Configuration Saved for '.$_POST['username'];
+	if($userdata) {
+	  ksort($userdata);
+    }
+    echo 'Configuration Saved for '.$_POST['username'];
     } else {
 	$user_config = unserialize(file_get_contents($config_dir.'/userconfig/'.$user.'.config'));
     }
@@ -187,7 +210,7 @@ echo '</table>';
     }
   }
   sort($themes);
-
+  if(isset($_POST['command']) && $_POST['command'] == 'Configuration') {
 // Show Config 
     echo '<hr><h1 class="np_thread_headline">Configuration:</h1>';
     echo '<table cellspacing="0" width="100%" class="np_results_table">';
@@ -239,5 +262,8 @@ echo '</table>';
       echo '<input name="command" type="hidden" id="command" value="SaveConfig" readonly="readonly">';
     echo '</form>';
     echo '</tbody></table><br />';
+  } else {
+    echo '<br />';
+  }
     include "tail.inc";
 ?>