From dc84ff3fa945c5e98fb3be808dd13ba58bd10d99 Mon Sep 17 00:00:00 2001 From: Alex Cabal Date: Mon, 10 Mar 2025 14:38:54 -0500 Subject: [PATCH] Style tweaks --- lib/Artwork.php | 12 ++++++------ lib/Ebook.php | 4 ++-- templates/ArtworkForm.php | 2 +- www/artworks/get.php | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Artwork.php b/lib/Artwork.php index c7dfedfe..9f678913 100644 --- a/lib/Artwork.php +++ b/lib/Artwork.php @@ -1073,11 +1073,11 @@ class Artwork{ ArtworkId from Artworks art - inner join Artists a USING (ArtistId) - left join ArtistAlternateNames aan USING (ArtistId) - left join ArtworkTags at USING (ArtworkId) - left join Ebooks e USING (EbookId) - left join Tags t USING (TagId) + inner join Artists a using (ArtistId) + left join ArtistAlternateNames aan using (ArtistId) + left join ArtworkTags at using (ArtworkId) + left join Ebooks e using (EbookId) + left join Tags t using (TagId) where ' . $statusCondition . ' and (art.Name regexp ? @@ -1099,7 +1099,7 @@ class Artwork{ inner join Artists a using (ArtistId) left join ArtistAlternateNames aan using (ArtistId) left join ArtworkTags at using (ArtworkId) - left join Ebooks e USING (EbookId) + left join Ebooks e using (EbookId) left join Tags t using (TagId) where ' . $statusCondition . ' and (art.Name regexp ? diff --git a/lib/Ebook.php b/lib/Ebook.php index 10721fdd..ec051185 100644 --- a/lib/Ebook.php +++ b/lib/Ebook.php @@ -20,8 +20,8 @@ use function Safe\shell_exec; * @property array $Translators * @property array $Contributors * @property ?array $TocEntries A list of non-Roman ToC entries *only if* the work has the `se:is-a-collection` metadata element; `null` otherwise. - * @property string $Url The correct URL to use in order to link to this ebook. Its format is `/ebooks/...` - * @property string $FullUrl The absolute URL that reviewers and admins may enter into forms in order to refer to this ebook. Its format is `https://standardebooks.org/ebooks/...` + * @property string $Url The relative URL of this ebook, like `/ebooks/...`. + * @property string $FullUrl The absolute URL of this ebook, like `https://standardebooks.org/ebooks/...`. * @property string $EditUrl * @property string $DeleteUrl * @property bool $HasDownloads diff --git a/templates/ArtworkForm.php b/templates/ArtworkForm.php index c3112a95..f7307378 100644 --- a/templates/ArtworkForm.php +++ b/templates/ArtworkForm.php @@ -187,7 +187,7 @@ $isEditForm ??= false; diff --git a/www/artworks/get.php b/www/artworks/get.php index f84a7ee8..ceb88fb6 100644 --- a/www/artworks/get.php +++ b/www/artworks/get.php @@ -212,10 +212,10 @@ catch(Exceptions\InvalidPermissionsException){ - Ebook)){ ?>value="Ebook->FullUrl) ?>" /> + Ebook)){ ?> value="Ebook->FullUrl) ?>" />