From 3b5d7852c8ea02ebddc388bcf8563124a3b75978 Mon Sep 17 00:00:00 2001
From: Retro_Guy <retro.guy@rocksolidbbs.com>
Date: Wed, 9 Jun 2021 06:56:22 +0000
Subject: [PATCH] Clean up file section interface a bit

---
 Rocksolid_Light/rocksolid/files.php  | 23 +++++++++++++++++++++--
 Rocksolid_Light/rocksolid/upload.php | 21 +++++++++++++++++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/Rocksolid_Light/rocksolid/files.php b/Rocksolid_Light/rocksolid/files.php
index 57c60d3..d5eac53 100644
--- a/Rocksolid_Light/rocksolid/files.php
+++ b/Rocksolid_Light/rocksolid/files.php
@@ -10,6 +10,7 @@ include "newsportal.php";
   } else {
     $offset=$CONFIG['timezone'];
   }
+
   if($_REQUEST['command'] == 'Show' && password_verify($CONFIG['thissitekey'], $_REQUEST['key'])) {
     $getfilename = $spooldir.'/upload/'.$_REQUEST['showfile'];
     $getfh = fopen($getfilename, "rb");
@@ -23,7 +24,26 @@ include "newsportal.php";
     exit(0);
   }
 
+  $title.=' - Browse files';
 include "head.inc";
+  echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
+// Browse button
+    echo '<td>';
+    echo '<form target="'.$frame['content'].'" method="post" action="files.php">';
+    echo '<input name="command" type="hidden" id="command" value="Browse" readonly="readonly">';
+    echo '<button class="np_button_link" type="submit">Browse</button>';
+    echo '</form>';
+    echo '</td>';
+// Upload button
+    echo '<td>';
+    echo '<form target="'.$frame['content'].'" method="post" action="upload.php">';
+    echo '<input name="command" type="hidden" id="command" value="Upload" readonly="readonly">';
+    echo '<button class="np_button_link" type="submit">Upload</button>';
+    echo '</form>';
+    echo '</td>';
+    echo '<td width=100%></td></tr></table>';
+    echo '<hr>';
+
   $directory = $spooldir.'/upload/';
   $users = array();
   if(is_dir($directory)) {
@@ -39,9 +59,8 @@ include "head.inc";
   }
   sort($users);
   $found = 0;
-  echo '<strong><small><a href="upload.php">Click here to upload to your directory</a>, or<br />';
   if(count($users) > 0) {
-    echo "Select a user directory to browse</small></strong>";
+    echo "<strong><small>Select a user directory to browse:</small></strong>";
     echo '<form name="browse" method="post" action="files.php" enctype="multipart/form-data">';
     echo '<input name="command" type="hidden" id="command" value="Browse" readonly="readonly">';
     echo '<input type="hidden" name="key" value="'.password_hash($CONFIG['thissitekey'], PASSWORD_DEFAULT).'">';
diff --git a/Rocksolid_Light/rocksolid/upload.php b/Rocksolid_Light/rocksolid/upload.php
index 26fcd8a..2d78a44 100644
--- a/Rocksolid_Light/rocksolid/upload.php
+++ b/Rocksolid_Light/rocksolid/upload.php
@@ -19,8 +19,26 @@ if(isset($_POST['username'])) {
     }
   }
 }
-
+  
+  $title.=' - Upload file';
 include "head.inc";
+  echo '<table cellpadding="0" cellspacing="0" class="np_buttonbar"><tr>';
+// Browse button
+    echo '<td>';
+    echo '<form target="'.$frame['content'].'" method="post" action="files.php">';
+    echo '<input name="command" type="hidden" id="command" value="Browse" readonly="readonly">';
+    echo '<button class="np_button_link" type="submit">Browse</button>';
+    echo '</form>';
+    echo '</td>';
+// Upload button
+    echo '<td>';
+    echo '<form target="'.$frame['content'].'" method="post" action="upload.php">';
+    echo '<input name="command" type="hidden" id="command" value="Upload" readonly="readonly">';
+    echo '<button class="np_button_link" type="submit">Upload</button>';
+    echo '</form>';
+    echo '</td>';
+    echo '<td width=100%></td></tr></table>';
+    echo '<hr>';
 
 if(isset($_FILES)) {
    $_FILES[photo][name] = preg_replace('/[^a-zA-Z0-9\.]/', '_', $_FILES[photo][name]);
@@ -62,7 +80,6 @@ echo '<tr><td><input type="file" name="photo" id="fileSelect" value="fileSelect"
 echo '<td>&nbsp;<input type="submit" name="Submit" value="Upload"></td>';
 echo '</tr>';
 echo '</form>';
-echo '<tr><td><a href="files.php">Go to Files</a></td></tr>';
 echo '</table>';
 echo '</body></html>';
 ?>