From 4f3e8f7593b23e59bc520042996970f09881d27d Mon Sep 17 00:00:00 2001
From: Eric Claeys <83164203+EricClaeys@users.noreply.github.com>
Date: Tue, 30 May 2023 22:25:32 -0500
Subject: [PATCH 1/2] Update lighttpd.conf.repo: add /config/ alias

---
 config_repo/lighttpd.conf.repo | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config_repo/lighttpd.conf.repo b/config_repo/lighttpd.conf.repo
index 28d9626a5..754b5df15 100644
--- a/config_repo/lighttpd.conf.repo
+++ b/config_repo/lighttpd.conf.repo
@@ -20,6 +20,7 @@ setenv.add-environment = (
 
 alias.url		    = ("/current/" => "XX_ALLSKY_HOME_XX/")
 alias.url		    += ("/images/" => "XX_ALLSKY_IMAGES_XX/")
+alias.url		    += ("/config/" => "XX_ALLSKY_CONFIG_XX/")
 alias.url		    += ("/website/" => "XX_ALLSKY_WEBSITE_XX/")
 alias.url		    += ("/documentation" => "XX_ALLSKY_DOCUMENTATION_XX/")
 alias.url		    += ("/overlay" => "XX_ALLSKY_OVERLAY_XX/")

From 8cf6f89695e69f89e5332917aa164f03a0b115ea Mon Sep 17 00:00:00 2001
From: Eric Claeys <83164203+EricClaeys@users.noreply.github.com>
Date: Tue, 30 May 2023 22:47:43 -0500
Subject: [PATCH 2/2] Update editor.php: use "config" alias when possible

Use the "config" alias instead of "current/$config_dir.
Also, don't use showFullList - we don't want users modifying any Allsky scripts (except endOfNight_additionalSteps.sh which will go away in the next major release).
---
 html/includes/editor.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/html/includes/editor.php b/html/includes/editor.php
index 794752f53..ec78d90af 100644
--- a/html/includes/editor.php
+++ b/html/includes/editor.php
@@ -3,15 +3,13 @@
 function DisplayEditor()
 {
 	$status = new StatusMessages();
-	$showFullList = false;	// show the full list of what's in ALLSKY_SCRIPTS, or just user-editable files?
-	$config_dir = basename(ALLSKY_CONFIG);
 ?>
 
 	<script type="text/javascript">
 
 		$(document).ready(function () {
 			var editor = null;
-			$.get("current/<?php echo $config_dir ?>/config.sh?_ts=" + new Date().getTime(), function (data) {
+			$.get("config/config.sh?_ts=" + new Date().getTime(), function (data) {
 				editor = CodeMirror(document.querySelector("#editorContainer"), {
 					value: data,
 					mode: "shell",
@@ -125,20 +123,15 @@ function DisplayEditor()
 					<div style="margin-top: 15px;">
 				 <?php
 						$scripts = null;
-						if(isset($showFullList) && $showFullList == "true") {
-							$scripts = array_filter(array_diff(scandir(ALLSKY_SCRIPTS), array('.', '..')), function($item) {
-								// Anything OTHER than a directory is valid.
-								return !is_dir(ALLSKY_SCRIPTS . "/" . $item);
-							});
-						} else if (file_exists(ALLSKY_SCRIPTS . "/endOfNight_additionalSteps.sh")) {
+						if (file_exists(ALLSKY_SCRIPTS . "/endOfNight_additionalSteps.sh")) {
 							$scripts[0] = "endOfNight_additionalSteps.sh";
 						}
 				?>
 						<select class="form-control" id="script_path" title="Pick a file"
 							style="display: inline-block; width: auto; margin-right: 15px; margin-bottom: 5px"
 						>
-							<option value="current/<?php echo $config_dir ?>/config.sh">config.sh</option>
-							<option value="current/<?php echo $config_dir ?>/ftp-settings.sh">ftp-settings.sh</option>
+							<option value="config/config.sh">config.sh</option>
+							<option value="config/ftp-settings.sh">ftp-settings.sh</option>
 
 				<?php
 							if ($scripts != null) {
@@ -156,7 +149,7 @@ function DisplayEditor()
 							if (file_exists(ALLSKY_WEBSITE_REMOTE_CONFIG)) {
 								// The website is remote, but a copy of the config file is on the Pi.
 								$N = ALLSKY_WEBSITE_REMOTE_CONFIG_NAME;
-								echo "<option value='{REMOTE}current/$config_dir/$N'>$N (remote Allsky Website)</option>";
+								echo "<option value='{REMOTE}config/$N'>$N (remote Allsky Website)</option>";
 							}
 			   ?>
 						</select>