From ec0b81817d7ece2e63971d66853ee8c06e140443 Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Mon, 11 Nov 2024 11:17:04 -0600
Subject: [PATCH] Restructure some files to match new URL structure

---
 config/apache/rewrites/ebooks.conf         | 4 ++--
 www/{ebooks/author.php => authors/get.php} | 0
 www/ebooks/{ebook.php => get.php}          | 0
 www/newsletter/subscriptions/new.php       | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename www/{ebooks/author.php => authors/get.php} (100%)
 rename www/ebooks/{ebook.php => get.php} (100%)

diff --git a/config/apache/rewrites/ebooks.conf b/config/apache/rewrites/ebooks.conf
index b365a992..2a1a0e13 100644
--- a/config/apache/rewrites/ebooks.conf
+++ b/config/apache/rewrites/ebooks.conf
@@ -3,7 +3,7 @@ RewriteRule	^/ebooks/(.+?)/download$		/ebooks/download.php?url-path=$1 [QSA]
 
 # Misc ebook rewrites
 RewriteRule	^/subjects/([^\./]+?)$			/ebooks/index.php?tags[]=$1 [QSA]
-RewriteRule	^/ebooks/([^\./]+?)$			/ebooks/author.php?url-path=$1 [QSA]
+RewriteRule	^/ebooks/([^\./]+?)$			/authors/get.php?url-path=$1 [QSA]
 RewriteRule	^/ebooks/([^\./]+?)/downloads$		/bulk-downloads/get.php?author=$1 [QSA]
 RewriteRule	^/ebooks/([^\./]+?)/feeds$		/feeds/get.php?author=$1 [QSA]
 RewriteRule	^/collections/([^\./]+?)$		/collections/get.php?collection=$1 [QSA]
@@ -42,4 +42,4 @@ RewriteRule	^/ebooks/jules-verne/twenty-thousand-leagues-under-the-seas/f-p-walt
 # Prevent this rule from firing if we're getting a distribution file
 RewriteCond	%{REQUEST_FILENAME}		!^/ebooks/.+?/downloads/.+$
 RewriteCond	%{REQUEST_FILENAME}		!^/ebooks/.+?/text.*$
-RewriteRule	^/ebooks/([^\.]+?)$		/ebooks/ebook.php?url-path=$1
+RewriteRule	^/ebooks/([^\.]+?)$		/ebooks/get.php?url-path=$1
diff --git a/www/ebooks/author.php b/www/authors/get.php
similarity index 100%
rename from www/ebooks/author.php
rename to www/authors/get.php
diff --git a/www/ebooks/ebook.php b/www/ebooks/get.php
similarity index 100%
rename from www/ebooks/ebook.php
rename to www/ebooks/get.php
diff --git a/www/newsletter/subscriptions/new.php b/www/newsletter/subscriptions/new.php
index 94da8c5f..eb7de8ba 100644
--- a/www/newsletter/subscriptions/new.php
+++ b/www/newsletter/subscriptions/new.php
@@ -34,7 +34,7 @@ if($exception){
 				<input type="text" name="automationtest" value="" maxlength="80" />
 			</label>
 			<label>Your email address
-				<input type="email" name="email" value="<? if($subscription->User !== null){ ?><?= Formatter::EscapeHtml($subscription->User->Email) ?><? } ?>" maxlength="80" required="required" />
+				<input type="email" name="email" value="<?= Formatter::EscapeHtml($subscription->User?->Email) ?>" maxlength="80" required="required" />
 			</label>
 			<label class="captcha">
 				Type the letters in the <abbr class="acronym">CAPTCHA</abbr> image