standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-14 10:31:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge admin pages with regular pages for art system

Browse source
This commit is contained in:
Alex Cabal 2024-01-07 15:47:40 -06:00
parent 52033320e1
commit b99d2aac1a
15 changed files with 348 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/apache/standardebooks.org.conf
View file

@ -297,12 +297,10 @@ Define webroot /standardebooks.org/web
# Rewrite rules for cover art
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^get$/"
RewriteRule ^/admin/artworks/([^/\.]+)$ /admin/artworks/get.php?artworkid=$1 [L]
RewriteRule ^/artworks/([^/\.]+)/([^/\.]+)$ /artworks/get.php?artist-url-name=$1&artwork-url-name=$2 [L]
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^post$/"
RewriteRule ^/admin/artworks/([^/\.]+)$ /admin/artworks/post.php?artworkid=$1 [L]
RewriteRule ^/artworks/([^/\.]+)/([^/\.]+)$ /artworks/get.php?artist=$1&artwork=$2 [L]
RewriteRule ^/artworks/([^/\.]+)/([^/\.]+)$ /artworks/post.php?artist-url-name=$1&artwork-url-name=$2 [L]
# Specific config for /bulk-downloads
<DirectoryMatch "${webroot}/www/bulk-downloads">

6
config/apache/standardebooks.test.conf
View file

@ -279,12 +279,10 @@ Define webroot /standardebooks.org/web
# Rewrite rules for cover art
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^get$/"
RewriteRule ^/admin/artworks/([^/\.]+)$ /admin/artworks/get.php?artworkid=$1 [L]
RewriteRule ^/artworks/([^/\.]+)/([^/\.]+)$ /artworks/get.php?artist-url-name=$1&artwork-url-name=$2 [L]
RewriteCond expr "tolower(%{REQUEST_METHOD}) =~ /^post$/"
RewriteRule ^/admin/artworks/([^/\.]+)$ /admin/artworks/post.php?artworkid=$1 [L]
RewriteRule ^/artworks/([^/\.]+)/([^/\.]+)$ /artworks/get.php?artist=$1&artwork=$2 [L]
RewriteRule ^/artworks/([^/\.]+)/([^/\.]+)$ /artworks/post.php?artist-url-name=$1&artwork-url-name=$2 [L]
# Specific config for /bulk-downloads
<DirectoryMatch "${webroot}/www/bulk-downloads">

32
lib/Artwork.php
View file

@ -21,6 +21,7 @@ use function Safe\sprintf;
* @property Ebook $Ebook
* @property Museum $Museum
* @property User $Submitter
* @property User $Reviewer
* @property ?ImageMimeType $MimeType
*/
class Artwork extends PropertiesBase{
@ -80,6 +81,14 @@ class Artwork extends PropertiesBase{
return $this->_Submitter;
}
protected function GetReviewer(): User{
if($this->_Reviewer === null){
$this->_Reviewer = User::Get($this->ReviewerUserId);
}
return $this->_Reviewer;
}
protected function GetUrl(): string{
if($this->_Url === null){
$this->_Url = '/artworks/' . $this->Artist->UrlName . '/' . $this->UrlName;
@ -579,27 +588,4 @@ class Artwork extends PropertiesBase{
return $result[0];
}
/**
* Gets a publically available Artwork, i.e., with approved or in_use status.
* Artwork with status unverifed and declined aren't available by URL.
*/
/**
* @throws \Exceptions\InvalidArtworkException
*/
public static function GetByUrlAndIsApproved(string $artistUrlName, string $artworkUrlName): Artwork{
$result = Db::Query('
SELECT Artworks.*
from Artworks
inner join Artists using (ArtistId)
where Status in ("approved", "in_use") and
Artists.UrlName = ? and Artworks.UrlName = ?
', [$artistUrlName, $artworkUrlName], 'Artwork');
if(sizeof($result) == 0){
throw new Exceptions\ArtworkNotFoundException();
}
return $result[0];
}
}

55
lib/Library.php
View file

@ -159,18 +159,6 @@ class Library{
return self::GetFromApcu('tags');
}
/**
* Browsable Artwork can be displayed publically, e.g., at /artworks.
* Unverified and declined Artwork shouldn't be browsable.
* @return array<Artwork>
*/
private static function GetBrowsableArtwork(): array{
return Db::Query('
SELECT *
from Artworks
where Status in ("approved", "in_use")', [], 'Artwork');
}
/**
* @param string $query
* @param string $status
@ -178,30 +166,37 @@ class Library{
* @return array<Artwork>
*/
public static function FilterArtwork(string $query = null, string $status = null, string $sort = null): array{
$artworks = Library::GetBrowsableArtwork();
// Possible special statuses:
// null: same as "all"
// "all": Show all approved and in use artwork
// "all-admin": Show all artwork regardless of status
$artworks = [];
if($status === null || $status == 'all'){
$artworks = Db::Query('
SELECT *
from Artworks
where Status in ("approved", "in_use")', [], 'Artwork');
}
elseif($status == 'all-admin'){
$artworks = Db::Query('
SELECT *
from Artworks', [], 'Artwork');
}
else{
$artworks = Db::Query('
SELECT *
from Artworks
where Status = ?', [$status], 'Artwork');
}
$matches = $artworks;
if($sort === null){
$sort = SORT_COVER_ARTWORK_CREATED_NEWEST;
}
if(in_array($status, [COVER_ARTWORK_STATUS_APPROVED, COVER_ARTWORK_STATUS_IN_USE], true)){
$matches = [];
foreach($artworks as $artwork){
if($status === $artwork->Status){
$matches[] = $artwork;
}
}
}
else{
$matches = [];
foreach($artworks as $artwork){
if(in_array($artwork->Status, [COVER_ARTWORK_STATUS_APPROVED, COVER_ARTWORK_STATUS_IN_USE], true)){
$matches[] = $artwork;
}
}
}
if($query !== null){
$filteredMatches = [];

85
templates/ArtworkDetail.php
View file

@ -1,85 +0,0 @@
<?
$artwork = $artwork ?? null;
$isAdminView = $isAdminView ?? false;
if($artwork === null){
return;
}
?>
<h1><?= Formatter::ToPlainText($artwork->Name) ?></h1>
<a href="<?= $artwork->ImageUrl ?>">
<picture>
<source srcset="<?= $artwork->Thumb2xUrl ?> 2x, <?= $artwork->ThumbUrl ?> 1x" type="image/jpg"/>
<img src="<?= $artwork->ThumbUrl ?>" alt="" property="schema:image"/>
</picture>
</a>
<?= Template::ImageCopyrightNotice() ?>
<h2>Metadata</h2>
<table class="artwork-metadata">
<tr>
<td>Title</td>
<td><i><?= Formatter::ToPlainText($artwork->Name) ?></i></td>
</tr>
<tr>
<td>Artist</td>
<td>
<?= Formatter::ToPlainText($artwork->Artist->Name) ?><? if(sizeof($artwork->Artist->AlternateSpellings) > 0){ ?> (<abbr>AKA</abbr> <span class="author" typeof="schema:Person" property="schema:name"><?= implode('</span>, <span class="author" typeof="schema:Person" property="schema:name">', array_map('Formatter::ToPlainText', $artwork->Artist->AlternateSpellings)) ?></span>)<? } ?><? if($artwork->Artist->DeathYear !== null){ ?> (<abbr>d.</abbr> <?= $artwork->Artist->DeathYear ?>)<? } ?>
</td>
</tr>
<tr>
<td>Year completed</td>
<td><? if($artwork->CompletedYear === null){ ?>Unknown<? }else{ ?><? if($artwork->CompletedYearIsCirca){ ?>Circa <? } ?><?= $artwork->CompletedYear ?><? } ?></td>
</tr>
<tr>
<td>Tags</td>
<td><ul class="tags"><? foreach($artwork->Tags as $tag){ ?><li><a href="<?= $tag->Url ?>"><?= Formatter::ToPlainText($tag->Name) ?></a></li><? } ?></ul></td>
</tr>
<tr>
<td>Dimensions</td>
<td><?= $artwork->Dimensions ?></td>
</tr>
<tr>
<td>Status</td>
<td><?= Template::ArtworkStatus(['artwork' => $artwork]) ?></td>
</tr>
<? if($isAdminView){ ?>
<tr>
<td>Submitted by</td>
<td><? if($artwork->SubmitterUserId === null){ ?>Anonymous<? }else{ ?><a href="mailto:<?= Formatter::ToPlainText($artwork->Submitter->Email) ?>"><? if($artwork->Submitter->Name !== null){ ?> <?= Formatter::ToPlainText($artwork->Submitter->Name) ?><? }else{ ?><?= Formatter::ToPlainText($artwork->Submitter->Email) ?><? } ?></a><? } ?></td>
</tr>
<? } ?>
</table>
<h2>U.S. public domain proof</h2>
<? if($artwork->MuseumUrl !== null){ ?>
<h3>Museum page</h3>
<p><a href="<?= Formatter::ToPlainText($artwork->MuseumUrl) ?>"><?= Formatter::ToPlainText($artwork->MuseumUrl) ?></a></p>
<? if($artwork->Museum !== null){ ?>
<figure class="corrected full">
<p>Approved museum: <?= Formatter::ToPlainText($artwork->Museum->Name) ?> <code>(<?= Formatter::ToPlainText($artwork->Museum->Domain) ?>)</code></p>
</figure>
<? }else{ ?>
<figure class="wrong full">
<p>Not an approved museum.</p>
</figure>
<? } ?>
<? } ?>
<? if($artwork->PublicationYear !== null){ ?>
<h3>Page scans</h3>
<ul>
<li>Year book was published: <? if($artwork->PublicationYear !== null){ ?><?= $artwork->PublicationYear ?><? }else{ ?><i>Not provided</i><? } ?></li>
<li>Page scan of book publication year: <? if($artwork->PublicationYearPageUrl !== null){ ?><a href="<?= Formatter::ToPlainText($artwork->PublicationYearPageUrl) ?>">Link</a><? }else{ ?><i>Not provided</i><? } ?></li>
<li>Page scan of rights statement: <? if($artwork->CopyrightPageUrl !== null){ ?><a href="<?= Formatter::ToPlainText($artwork->CopyrightPageUrl) ?>">Link</a><? }else{ ?><i>Not provided</i><? } ?></li>
<li>Page scan of artwork: <? if($artwork->ArtworkPageUrl !== null){ ?><a href="<?= Formatter::ToPlainText($artwork->ArtworkPageUrl) ?>">Link</a><? }else{ ?><i>Not provided</i><? } ?></li>
</ul>
<? } ?>
<? if($artwork->Exception !== null){ ?>
<h3>Special public domain exception</h3>
<?= Formatter::EscapeMarkdown($artwork->Exception) ?>
<? } ?>

14
templates/ArtworkList.php
View file

@ -1,32 +1,26 @@
<?
$artworks = $artworks ?? [];
$useAdminUrl = $useAdminUrl ?? false;
$showStatus = $showStatus ?? false;
?>
<ol class="artwork-list list">
<? foreach($artworks as $artwork){ ?>
<? if($useAdminUrl){ ?>
<? $url = $artwork->AdminUrl; ?>
<? }else{ ?>
<? $url = $artwork->Url; ?>
<? } ?>
<li class="<?= str_replace('_', '-', $artwork->Status) ?>">
<div class="thumbnail-container">
<a href="<?= $url ?>">
<a href="<?= $artwork->Url ?>">
<picture>
<source srcset="<?= $artwork->Thumb2xUrl ?> 2x, <?= $artwork->ThumbUrl ?> 1x" type="image/jpg"/>
<img src="<?= $artwork->ThumbUrl ?>" alt="" property="schema:image"/>
</picture>
</a>
</div>
<p><a href="<?= $url ?>" property="schema:name"><?= Formatter::ToPlainText($artwork->Name) ?></a></p>
<p><a href="<?= $artwork->Url ?>" property="schema:name"><?= Formatter::ToPlainText($artwork->Name) ?></a></p>
<p>
<span class="author" typeof="schema:Person" property="schema:name"><?= Formatter::ToPlainText($artwork->Artist->Name) ?></span>
<? if(sizeof($artwork->Artist->AlternateSpellings) > 0){ ?>(<abbr>AKA</abbr> <span class="author" typeof="schema:Person" property="schema:name"><?= implode('</span>, <span class="author" typeof="schema:Person" property="schema:name">', array_map('Formatter::ToPlainText', $artwork->Artist->AlternateSpellings)) ?></span>)<? } ?>
</p>
<div>
<p>Year completed: <? if($artwork->CompletedYear === null){ ?>Unknown<? }else{ ?><? if($artwork->CompletedYearIsCirca){ ?>Circa<? } ?><?= $artwork->CompletedYear ?><? } ?></p>
<? if($artwork->Status == COVER_ARTWORK_STATUS_IN_USE){ ?><p>Status: <?= Template::ArtworkStatus(['artwork' => $artwork]) ?></p><? } ?>
<? if($showStatus || $artwork->Status == COVER_ARTWORK_STATUS_IN_USE){ ?><p>Status: <?= Template::ArtworkStatus(['artwork' => $artwork]) ?></p><? } ?>
<? if(count($artwork->Tags) > 0){ ?>
<p>Tags:</p>
<ul class="tags"><? foreach($artwork->Tags as $tag){ ?><li><a href="<?= $tag->Url ?>"><?= Formatter::ToPlainText($tag->Name) ?></a></li><? } ?></ul>

33
templates/ArtworkSearchForm.php
View file

@ -1,33 +0,0 @@
<form action="/artworks" method="get" rel="search">
<label>Status
<select name="status" size="1">
<option value="all"<? if($status === null){ ?> selected="selected"<? } ?>>All</option>
<option value="<?= COVER_ARTWORK_STATUS_APPROVED ?>"<? if($status == COVER_ARTWORK_STATUS_APPROVED){ ?> selected="selected"<? } ?>>Approved</option>
<option value="<?= COVER_ARTWORK_STATUS_IN_USE ?>"<? if($status == COVER_ARTWORK_STATUS_IN_USE){ ?> selected="selected"<? } ?>>In use</option>
</select>
</label>
<label class="search">Keywords
<input type="search" name="query" value="<?= Formatter::ToPlainText($query ?? '') ?>"/>
</label>
<label>
<span>Sort</span>
<span>
<select name="sort">
<option value="<?= SORT_COVER_ARTWORK_CREATED_NEWEST ?>"<? if($sort == SORT_COVER_ARTWORK_CREATED_NEWEST){ ?> selected="selected"<? } ?>>Date added (new &#x2192; old)</option>
<option value="<?= SORT_COVER_ARTIST_ALPHA ?>"<? if($sort == SORT_COVER_ARTIST_ALPHA){ ?> selected="selected"<? } ?>>Artist name (a &#x2192; z)</option>
<option value="<?= SORT_COVER_ARTWORK_COMPLETED_NEWEST ?>"<? if($sort == SORT_COVER_ARTWORK_COMPLETED_NEWEST){ ?> selected="selected"<? } ?>>Date of artwork completion (new &#x2192; old)</option>
</select>
</span>
</label>
<label>
<span>Per page</span>
<span>
<select name="per-page">
<option value="50"<? if($perPage == 50){ ?> selected="selected"<? } ?>>50</option>
<option value="100"<? if($perPage == 100){ ?> selected="selected"<? } ?>>100</option>
<option value="200"<? if($perPage == 200){ ?> selected="selected"<? } ?>>200</option>
</select>
</span>
</label>
<button>Filter</button>
</form>

48
www/admin/artworks/get.php
View file

@ -1,48 +0,0 @@
<?
use function Safe\session_unset;
session_start();
$exception = $_SESSION['exception'] ?? null;
try{
$artwork = Artwork::Get(HttpInput::Int(GET, 'artworkid'));
// The artwork is already approved or in use, so redirect to its public page
if($artwork->Status == COVER_ARTWORK_STATUS_APPROVED || $artwork->Status == COVER_ARTWORK_STATUS_IN_USE){
http_response_code(302);
header('Location: ' . $artwork->Url);
exit();
}
// We got here because an artwork submission had errors and the user has to try again
if($exception){
http_response_code(422);
session_unset();
}
}
catch(Exceptions\AppException){
Template::Emit404();
}
?><?= Template::Header(['title' => 'Review Artwork', 'artwork' => true, 'highlight' => '', 'description' => 'Unverified artwork.']) ?>
<main class="artworks">
<?= Template::Error(['exception' => $exception]) ?>
<section class="narrow">
<?= Template::ArtworkDetail(['artwork' => $artwork, 'isAdminView' => true]) ?>
<? if($artwork->Status == COVER_ARTWORK_STATUS_DECLINED){ ?>
<h2>Status</h2>
<p>This artwork has been declined by a reviewer.</p>
<? } ?>
<? if($artwork->Status == COVER_ARTWORK_STATUS_UNVERIFIED){ ?>
<h2>Review</h2>
<p>Review the metadata and PD proof for this artwork submission. Approve to make it available for future producers.</p>
<form method="post" action="/admin/artworks/<?= $artwork->ArtworkId ?>">
<input type="hidden" name="_method" value="PATCH" />
<button name="status" value="<?= COVER_ARTWORK_STATUS_APPROVED ?>">Approve</button>
<button name="status" value="<?= COVER_ARTWORK_STATUS_DECLINED ?>" class="decline-button">Decline</button>
</form>
<? } ?>
</section>
</main>
<?= Template::Footer() ?>

88
www/admin/artworks/index.php
View file

@ -1,88 +0,0 @@
<?
use function Safe\session_unset;
session_start();
$artwork = null;
$status = HttpInput::Str(SESSION, 'status', false);
$page = HttpInput::Int(GET, 'page') ?? 1;
$perPage = 10;
$hasNextPage = false;
$unverifiedArtworks = [];
try{
if($GLOBALS['User'] === null){
throw new Exceptions\LoginRequiredException();
}
if(!$GLOBALS['User']->Benefits->CanReviewArtwork){
throw new Exceptions\InvalidPermissionsException();
}
if($status !== null){
$artwork = Artwork::Get(HttpInput::Int(SESSION, 'artwork-id'));
http_response_code(201);
session_unset();
}
if($page <= 0){
$page = 1;
}
$unverifiedArtworks = Db::Query('
SELECT *
from Artworks
where Status = "unverified"
order by Created asc
limit ?, ?
', [($page - 1) * $perPage, $perPage + 1], 'Artwork');
if(sizeof($unverifiedArtworks) > $perPage){
array_pop($unverifiedArtworks);
$hasNextPage = true;
}
}
catch(Exceptions\LoginRequiredException){
Template::RedirectToLogin();
}
catch(Exceptions\InvalidPermissionsException){
Template::Emit403(); // No permissions to submit artwork
}
?><?= Template::Header(['title' => 'Artwork Review Queue', 'artwork' => true, 'highlight' => '', 'description' => 'The queue of unverified artwork.']) ?>
<main class="artworks">
<section class="narrow">
<h1>Artwork Review Queue</h1>
<? if($status == COVER_ARTWORK_STATUS_APPROVED){ ?>
<p class="message success">
<? if($artwork !== null){ ?>
<i><a href="<?= $artwork->Url ?>" property="schema:name"><?= Formatter::ToPlainText($artwork->Name) ?></a></i> approved.
<? }else{ ?>
Artwork approved.
<? } ?>
</p>
<? } ?>
<? if($status == COVER_ARTWORK_STATUS_DECLINED){ ?>
<p class="message">
<? if($artwork !== null){ ?>
<i><?= Formatter::ToPlainText($artwork->Name) ?></i> declined.
<? }else{ ?>
Artwork declined.
<? } ?>
</p>
<? } ?>
<? if(sizeof($unverifiedArtworks) == 0){ ?>
<p>No artwork to review.</p>
<? }else{ ?>
<?= Template::ArtworkList(['artworks' => $unverifiedArtworks, 'useAdminUrl' => true]) ?>
<? } ?>
</section>
<nav>
<a<? if($page > 1){ ?> href="/admin/artworks/?page=<?= $page - 1 ?>" rel="prev"<? }else{ ?> aria-disabled="true"<? } ?>>Back</a>
<a<? if($hasNextPage){ ?> href="/admin/artworks/?page=<?= $page + 1 ?>" rel="next"<? }else{ ?> aria-disabled="true"<? } ?>>Next</a>
</nav>
</main>
<?= Template::Footer() ?>

45
www/admin/artworks/post.php
View file

@ -1,45 +0,0 @@
<?
try{
session_start();
if(HttpInput::RequestMethod() != HTTP_PATCH){
throw new Exceptions\InvalidRequestException();
}
if($GLOBALS['User'] === null){
throw new Exceptions\LoginRequiredException();
}
if(!$GLOBALS['User']->Benefits->CanReviewArtwork){
throw new Exceptions\InvalidPermissionsException();
}
$artwork = Artwork::Get(HttpInput::Int(GET, 'artworkid'));
$artwork->Status = HttpInput::Str(POST, 'status', false);
$artwork->ReviewerUserId = $GLOBALS['User']->UserId;
$artwork->Save();
$_SESSION['artwork-id'] = $artwork->ArtworkId;
$_SESSION['status'] = $artwork->Status;
http_response_code(303);
header('Location: /admin/artworks');
}
catch(Exceptions\InvalidRequestException){
http_response_code(405);
}
catch(Exceptions\LoginRequiredException){
Template::RedirectToLogin();
}
catch(Exceptions\InvalidPermissionsException){
Template::Emit403(); // No permissions to submit artwork
}
catch(Exceptions\ArtworkNotFoundException){
Template::Emit404();
}
catch(Exceptions\AppException $exception){
$_SESSION['exception'] = $exception;
http_response_code(303);
header('Location: /admin/artworks/' . $artwork->ArtworkId);
}

137
www/artworks/get.php
View file

@ -1,10 +1,31 @@
<?
use function Safe\session_unset;
session_start();
$saved = HttpInput::Bool(SESSION, 'artwork-saved', false);
$exception = $_SESSION['exception'] ?? null;
try{
$artistUrlName = HttpInput::Str(GET, 'artist') ?? '';
$artworkUrlName = HttpInput::Str(GET, 'artwork') ?? '';
$artwork = Artwork::GetByUrl(HttpInput::Str(GET, 'artist-url-name') ?? '', HttpInput::Str(GET, 'artwork-url-name') ?? '');
$isAdminView = $GLOBALS['User']->Benefits->CanReviewArtwork ?? false;
$artwork = Artwork::GetByUrlAndIsApproved($artistUrlName, $artworkUrlName);
// If the artwork is not approved, and we're not an admin, don't show it.
if($artwork->Status != COVER_ARTWORK_STATUS_APPROVED && $artwork->Status != COVER_ARTWORK_STATUS_IN_USE && !$isAdminView){
throw new Exceptions\ArtworkNotFoundException();
}
// We got here because an artwork was successfully submitted
if($saved){
session_unset();
}
// We got here because an artwork submission had errors and the user has to try again
if($exception){
http_response_code(422);
$artwork = $_SESSION['artwork'] ?? $artwork;
session_unset();
}
}
catch(Exceptions\ArtworkNotFoundException){
Template::Emit404();
@ -13,7 +34,115 @@ catch(Exceptions\ArtworkNotFoundException){
?><?= Template::Header(['title' => $artwork->Name, 'artwork' => true]) ?>
<main class="artworks">
<section class="narrow">
<?= Template::ArtworkDetail(['artwork' => $artwork]) ?>
<h1><?= Formatter::ToPlainText($artwork->Name) ?></h1>
<?= Template::Error(['exception' => $exception]) ?>
<? if($saved){ ?>
<p class="message success">Artwork saved!</p>
<? } ?>
<a href="<?= $artwork->ImageUrl ?>">
<picture>
<source srcset="<?= $artwork->Thumb2xUrl ?> 2x, <?= $artwork->ThumbUrl ?> 1x" type="image/jpg"/>
<img src="<?= $artwork->ThumbUrl ?>" alt="" property="schema:image"/>
</picture>
</a>
<?= Template::ImageCopyrightNotice() ?>
<h2>Metadata</h2>
<table class="artwork-metadata">
<tr>
<td>Title</td>
<td><i><?= Formatter::ToPlainText($artwork->Name) ?></i></td>
</tr>
<tr>
<td>Artist</td>
<td>
<?= Formatter::ToPlainText($artwork->Artist->Name) ?><? if(sizeof($artwork->Artist->AlternateSpellings) > 0){ ?> (<abbr>AKA</abbr> <span class="author" typeof="schema:Person" property="schema:name"><?= implode('</span>, <span class="author" typeof="schema:Person" property="schema:name">', array_map('Formatter::ToPlainText', $artwork->Artist->AlternateSpellings)) ?></span>)<? } ?><? if($artwork->Artist->DeathYear !== null){ ?> (<abbr>d.</abbr> <?= $artwork->Artist->DeathYear ?>)<? } ?>
</td>
</tr>
<tr>
<td>Year completed</td>
<td><? if($artwork->CompletedYear === null){ ?>Unknown<? }else{ ?><? if($artwork->CompletedYearIsCirca){ ?>Circa <? } ?><?= $artwork->CompletedYear ?><? } ?></td>
</tr>
<tr>
<td>Tags</td>
<td><ul class="tags"><? foreach($artwork->Tags as $tag){ ?><li><a href="<?= $tag->Url ?>"><?= Formatter::ToPlainText($tag->Name) ?></a></li><? } ?></ul></td>
</tr>
<tr>
<td>Dimensions</td>
<td><?= $artwork->Dimensions ?></td>
</tr>
<tr>
<td>Status</td>
<td><?= Template::ArtworkStatus(['artwork' => $artwork]) ?></td>
</tr>
<? if($isAdminView){ ?>
<tr>
<td>Submitted by</td>
<td><? if($artwork->SubmitterUserId === null){ ?>Anonymous<? }else{ ?><a href="mailto:<?= Formatter::ToPlainText($artwork->Submitter->Email) ?>"><? if($artwork->Submitter->Name !== null){ ?> <?= Formatter::ToPlainText($artwork->Submitter->Name) ?><? }else{ ?><?= Formatter::ToPlainText($artwork->Submitter->Email) ?><? } ?></a><? } ?></td>
</tr>
<? } ?>
</table>
<h2>U.S. public domain proof</h2>
<? if($artwork->MuseumUrl !== null){ ?>
<h3>Museum page</h3>
<p><a href="<?= Formatter::ToPlainText($artwork->MuseumUrl) ?>"><?= Formatter::ToPlainText($artwork->MuseumUrl) ?></a></p>
<? if($artwork->Museum !== null){ ?>
<figure class="corrected full">
<p>Approved museum: <?= Formatter::ToPlainText($artwork->Museum->Name) ?> <code>(<?= Formatter::ToPlainText($artwork->Museum->Domain) ?>)</code></p>
</figure>
<? }else{ ?>
<figure class="wrong full">
<p>Not an approved museum.</p>
</figure>
<? } ?>
<? } ?>
<? if($artwork->PublicationYear !== null){ ?>
<h3>Page scans</h3>
<ul>
<li>Year book was published: <? if($artwork->PublicationYear !== null){ ?><?= $artwork->PublicationYear ?><? }else{ ?><i>Not provided</i><? } ?></li>
<li>Page scan of book publication year: <? if($artwork->PublicationYearPageUrl !== null){ ?><a href="<?= Formatter::ToPlainText($artwork->PublicationYearPageUrl) ?>">Link</a><? }else{ ?><i>Not provided</i><? } ?></li>
<li>Page scan of rights statement: <? if($artwork->CopyrightPageUrl !== null){ ?><a href="<?= Formatter::ToPlainText($artwork->CopyrightPageUrl) ?>">Link</a><? }else{ ?><i>Not provided</i><? } ?></li>
<li>Page scan of artwork: <? if($artwork->ArtworkPageUrl !== null){ ?><a href="<?= Formatter::ToPlainText($artwork->ArtworkPageUrl) ?>">Link</a><? }else{ ?><i>Not provided</i><? } ?></li>
</ul>
<? } ?>
<? if($artwork->Exception !== null){ ?>
<h3>Special public domain exception</h3>
<?= Formatter::EscapeMarkdown($artwork->Exception) ?>
<? } ?>
<? if($isAdminView){ ?>
<h2>Reviewer options</h2>
<p>Review the metadata and PD proof for this artwork submission. Approve to make it available for future producers.</p>
<form method="post" action="<?= $artwork->Url ?>">
<input type="hidden" name="_method" value="PATCH" />
<label class="select">
<span>Artwork approval status</span>
<span>
<select name="artwork-status">
<option value="<?= COVER_ARTWORK_STATUS_UNVERIFIED ?>"<? if($artwork->Status == COVER_ARTWORK_STATUS_UNVERIFIED){ ?> selected="selected"<? } ?>>Unverified</option>
<option value="<?= COVER_ARTWORK_STATUS_DECLINED ?>"<? if($artwork->Status == COVER_ARTWORK_STATUS_DECLINED){ ?> selected="selected"<? } ?>>Declined</option>
<option value="<?= COVER_ARTWORK_STATUS_APPROVED ?>"<? if($artwork->Status == COVER_ARTWORK_STATUS_APPROVED){ ?> selected="selected"<? } ?>>Approved</option>
<option value="<?= COVER_ARTWORK_STATUS_IN_USE ?>"<? if($artwork->Status == COVER_ARTWORK_STATUS_IN_USE){ ?> selected="selected"<? } ?>>In use</option>
</select>
</span>
</label>
<label>
<span>In use by</span>
<span>Ebook file system slug, like <code>c-s-lewis_poetry</code>. If not in use, leave this blank.</span>
<input type="text" name="artwork-ebook-www-filesystem-path" value="<?= Formatter::ToPlainText($artwork->EbookWwwFilesystemPath) ?>"/>
</label>
<div class="footer">
<button>Save changes</button>
</div>
</form>
<? } ?>
</section>
</main>
<?= Template::Footer() ?>

89
www/artworks/index.php
View file

@ -11,6 +11,7 @@ $totalArtworkCount = 0;
$pageDescription = '';
$pageTitle = '';
$queryString = '';
$isAdminView = $GLOBALS['User']?->Benefits?->CanReviewArtwork ?? false;
if($page <= 0){
$page = 1;
@ -26,10 +27,20 @@ if($sort !== null){
$sort = mb_strtolower($sort);
}
if($sort === 'created-newest'){
if($sort == 'created-newest'){
$sort = null;
}
if($status == 'all'){
if($isAdminView){
$status = 'all-admin';
}
}
if(!$isAdminView && $status !== 'all' && $status != COVER_ARTWORK_STATUS_APPROVED && $status != COVER_ARTWORK_STATUS_IN_USE){
$status = COVER_ARTWORK_STATUS_APPROVED;
}
$artworks = Library::FilterArtwork($query != '' ? $query : null, $status, $sort);
$pageTitle = 'Browse Artwork';
$pages = ceil(sizeof($artworks) / $perPage);
@ -63,24 +74,64 @@ if($perPage !== COVER_ARTWORK_PER_PAGE){
<section class="narrow">
<h1>Browse U.S. Public Domain Artwork</h1>
<p>You can help Standard Ebooks by <a href="/artworks/new">submitting new public domain artwork</a> to add to this catalog for use in future ebooks. For free access to the submission form, <a href="/about#editor-in-chief">contact the Editor-in-Chief</a>.</p>
<?= Template::ArtworkSearchForm(['query' => $query, 'status' => $status, 'sort' => $sort, 'perPage' => $perPage]) ?>
<?= Template::ImageCopyrightNotice() ?>
<? if($totalArtworkCount == 0){ ?>
<p class="no-results">No artwork matched your filters. You can try different filters, or <a href="/artworks">browse all artwork</a>.</p>
<? }else{ ?>
<?= Template::ArtworkList(['artworks' => $artworks, 'useAdminUrl' => false]) ?>
<? } ?>
<? if($totalArtworkCount > 0){ ?>
<nav>
<a<? if($page > 1){ ?> href="/artworks?page=<?= $page - 1 ?><? if($queryString != ''){ ?><?= $queryString ?><? } ?>" rel="prev"<? }else{ ?> aria-disabled="true"<? } ?>>Back</a>
<ol>
<? for($i = 1; $i < $pages + 1; $i++){ ?>
<li<? if($page == $i){ ?> class="highlighted"<? } ?>><a href="/artworks?page=<?= $i ?><? if($queryString != ''){ ?><?= $queryString ?><? } ?>"><?= $i ?></a></li>
<? } ?>
</ol>
<a<? if($page < ceil($totalArtworkCount / $perPage)){ ?> href="/artworks?page=<?= $page + 1 ?><? if($queryString != ''){ ?><?= $queryString ?><? } ?>" rel="next"<? }else{ ?> aria-disabled="true"<? } ?>>Next</a>
</nav>
<? } ?>
<form action="/artworks" method="get" rel="search">
<label class="select">
<span>Status</span>
<span>
<select name="status" size="1">
<option value="all"<? if($status === null){ ?> selected="selected"<? } ?>>All</option>
<? if($isAdminView){ ?><option value="<?= COVER_ARTWORK_STATUS_UNVERIFIED ?>"<? if($status == COVER_ARTWORK_STATUS_UNVERIFIED){ ?> selected="selected"<? } ?>>Unverified</option><? } ?>
<? if($isAdminView){ ?><option value="<?= COVER_ARTWORK_STATUS_DECLINED ?>"<? if($status == COVER_ARTWORK_STATUS_DECLINED){ ?> selected="selected"<? } ?>>Declined</option><? } ?>
<option value="<?= COVER_ARTWORK_STATUS_APPROVED ?>"<? if($status == COVER_ARTWORK_STATUS_APPROVED){ ?> selected="selected"<? } ?>>Approved</option>
<option value="<?= COVER_ARTWORK_STATUS_IN_USE ?>"<? if($status == COVER_ARTWORK_STATUS_IN_USE){ ?> selected="selected"<? } ?>>In use</option>
</select>
</span>
</label>
<label class="search">Keywords
<input type="search" name="query" value="<?= Formatter::ToPlainText($query ?? '') ?>"/>
</label>
<label>
<span>Sort</span>
<span>
<select name="sort">
<option value="<?= SORT_COVER_ARTWORK_CREATED_NEWEST ?>"<? if($sort == SORT_COVER_ARTWORK_CREATED_NEWEST){ ?> selected="selected"<? } ?>>Date added (new &#x2192; old)</option>
<option value="<?= SORT_COVER_ARTIST_ALPHA ?>"<? if($sort == SORT_COVER_ARTIST_ALPHA){ ?> selected="selected"<? } ?>>Artist name (a &#x2192; z)</option>
<option value="<?= SORT_COVER_ARTWORK_COMPLETED_NEWEST ?>"<? if($sort == SORT_COVER_ARTWORK_COMPLETED_NEWEST){ ?> selected="selected"<? } ?>>Date of artwork completion (new &#x2192; old)</option>
</select>
</span>
</label>
<label>
<span>Per page</span>
<span>
<select name="per-page">
<option value="50"<? if($perPage == 50){ ?> selected="selected"<? } ?>>50</option>
<option value="100"<? if($perPage == 100){ ?> selected="selected"<? } ?>>100</option>
<option value="200"<? if($perPage == 200){ ?> selected="selected"<? } ?>>200</option>
</select>
</span>
</label>
<button>Filter</button>
</form>
<?= Template::ImageCopyrightNotice() ?>
<? if($totalArtworkCount == 0){ ?>
<p class="no-results">No artwork matched your filters. You can try different filters, or <a href="/artworks">browse all artwork</a>.</p>
<? }else{ ?>
<?= Template::ArtworkList(['artworks' => $artworks, 'showStatus' => $isAdminView && ($status == 'all' || $status == 'all-admin')]) ?>
<? } ?>
<? if($totalArtworkCount > 0){ ?>
<nav>
<a<? if($page > 1){ ?> href="/artworks?page=<?= $page - 1 ?><? if($queryString != ''){ ?><?= $queryString ?><? } ?>" rel="prev"<? }else{ ?> aria-disabled="true"<? } ?>>Back</a>
<ol>
<? for($i = 1; $i < $pages + 1; $i++){ ?>
<li<? if($page == $i){ ?> class="highlighted"<? } ?>><a href="/artworks?page=<?= $i ?><? if($queryString != ''){ ?><?= $queryString ?><? } ?>"><?= $i ?></a></li>
<? } ?>
</ol>
<a<? if($page < ceil($totalArtworkCount / $perPage)){ ?> href="/artworks?page=<?= $page + 1 ?><? if($queryString != ''){ ?><?= $queryString ?><? } ?>" rel="next"<? }else{ ?> aria-disabled="true"<? } ?>>Next</a>
</nav>
<? } ?>
</section>
</main>
<?= Template::Footer() ?>

2
www/artworks/new.php
View file

@ -137,7 +137,7 @@ catch(Exceptions\InvalidPermissionsException){
</label>
<label>
<span>High-resolution image</span>
<span>jpg, bmp, png, and tiff are accepted.</span>
<span>jpg, bmp, png, and tiff are accepted; 32MB max.</span>
<input
type="file"
name="artwork-image"

133
www/artworks/post.php
View file

@ -1,9 +1,10 @@
<?
try{
session_start();
$httpMethod =HttpInput::RequestMethod();
if(HttpInput::RequestMethod() != HTTP_POST){
throw new Exceptions\InvalidRequestException('Only HTTP POST accepted.');
if($httpMethod != HTTP_POST && $httpMethod != HTTP_PATCH){
throw new Exceptions\InvalidRequestException();
}
if(HttpInput::IsRequestTooLarge()){
@ -14,49 +15,95 @@ try{
throw new Exceptions\LoginRequiredException();
}
if(!$GLOBALS['User']->Benefits->CanUploadArtwork){
throw new Exceptions\InvalidPermissionsException();
// POSTing a new artwork
if($httpMethod == HTTP_POST){
if(!$GLOBALS['User']->Benefits->CanUploadArtwork){
throw new Exceptions\InvalidPermissionsException();
}
$artwork = new Artwork();
$artwork->Artist = new Artist();
$artwork->Artist->Name = HttpInput::Str(POST, 'artist-name', false);
$artwork->Artist->DeathYear = HttpInput::Int(POST, 'artist-year-of-death');
$artwork->Name = HttpInput::Str(POST, 'artwork-name', false);
$artwork->CompletedYear = HttpInput::Int(POST, 'artwork-year');
$artwork->CompletedYearIsCirca = HttpInput::Bool(POST, 'artwork-year-is-circa', false);
$artwork->Tags = Artwork::ParseTags(HttpInput::Str(POST, 'artwork-tags', false));
$artwork->Status = HttpInput::Str(POST, 'artwork-status', false, COVER_ARTWORK_STATUS_UNVERIFIED);
$artwork->EbookWwwFilesystemPath = HttpInput::Str(POST, 'artwork-ebook-www-filesystem-path', false);
$artwork->SubmitterUserId = $GLOBALS['User']->UserId ?? null;
$artwork->IsPublishedInUs = HttpInput::Bool(POST, 'artwork-is-published-in-us', false);
$artwork->PublicationYear = HttpInput::Int(POST, 'artwork-publication-year');
$artwork->PublicationYearPageUrl = HttpInput::Str(POST, 'artwork-publication-year-page-url', false);
$artwork->CopyrightPageUrl = HttpInput::Str(POST, 'artwork-copyright-page-url', false);
$artwork->ArtworkPageUrl = HttpInput::Str(POST, 'artwork-artwork-page-url', false);
$artwork->MuseumUrl = HttpInput::Str(POST, 'artwork-museum-url', false);
$artwork->MimeType = ImageMimeType::FromFile($_FILES['artwork-image']['tmp_name'] ?? null);
$artwork->Exception = HttpInput::Str(POST, 'artwork-exception', false);
// Only approved reviewers can set the status to anything but unverified when uploading
if($artwork->Status != COVER_ARTWORK_STATUS_UNVERIFIED && !$GLOBALS['User']->Benefits->CanReviewArtwork){
throw new Exceptions\InvalidPermissionsException();
}
// If the artwork is approved, set the reviewer
if($artwork->Status != COVER_ARTWORK_STATUS_UNVERIFIED){
$artwork->ReviewerUserId = $GLOBALS['User']->UserId;
}
$artwork->Create($_FILES['artwork-image'] ?? []);
$_SESSION['artwork'] = $artwork;
$_SESSION['artwork-created'] = true;
http_response_code(303);
header('Location: /artworks/new');
}
$artwork = new Artwork();
// PATCHing a new artwork
if($httpMethod == HTTP_PATCH){
if(!$GLOBALS['User']->Benefits->CanReviewArtwork){
throw new Exceptions\InvalidPermissionsException();
}
$artwork->Artist = new Artist();
$artwork->Artist->Name = HttpInput::Str(POST, 'artist-name', false);
$artwork->Artist->DeathYear = HttpInput::Int(POST, 'artist-year-of-death');
$artwork = Artwork::GetByUrl(HttpInput::Str(GET, 'artist-url-name', false), HttpInput::Str(GET, 'artwork-url-name', false));
$artwork->Name = HttpInput::Str(POST, 'artwork-name', false);
$artwork->CompletedYear = HttpInput::Int(POST, 'artwork-year');
$artwork->CompletedYearIsCirca = HttpInput::Bool(POST, 'artwork-year-is-circa', false);
$artwork->Tags = Artwork::ParseTags(HttpInput::Str(POST, 'artwork-tags', false));
$artwork->Status = HttpInput::Str(POST, 'artwork-status', false, COVER_ARTWORK_STATUS_UNVERIFIED);
$artwork->EbookWwwFilesystemPath = HttpInput::Str(POST, 'artwork-ebook-www-filesystem-path', false);
$artwork->SubmitterUserId = $GLOBALS['User']->UserId ?? null;
$artwork->IsPublishedInUs = HttpInput::Bool(POST, 'artwork-is-published-in-us', false);
$artwork->PublicationYear = HttpInput::Int(POST, 'artwork-publication-year');
$artwork->PublicationYearPageUrl = HttpInput::Str(POST, 'artwork-publication-year-page-url', false);
$artwork->CopyrightPageUrl = HttpInput::Str(POST, 'artwork-copyright-page-url', false);
$artwork->ArtworkPageUrl = HttpInput::Str(POST, 'artwork-artwork-page-url', false);
$artwork->MuseumUrl = HttpInput::Str(POST, 'artwork-museum-url', false);
$artwork->MimeType = ImageMimeType::FromFile($_FILES['artwork-image']['tmp_name'] ?? null);
$artwork->Exception = HttpInput::Str(POST, 'artwork-exception', false);
$artwork->Artist->Name = HttpInput::Str(POST, 'artist-name', false) ?? $artwork->Artist->Name;
$artwork->Artist->DeathYear = HttpInput::Int(POST, 'artist-year-of-death') ?? $artwork->Artist->DeathYear;
// Only approved reviewers can set the status to anything but unverified when uploading
if($artwork->Status != COVER_ARTWORK_STATUS_UNVERIFIED && !$GLOBALS['User']->Benefits->CanReviewArtwork){
throw new Exceptions\InvalidPermissionsException();
}
$artwork->Name = HttpInput::Str(POST, 'artwork-name', false) ?? $artwork->Name;
$artwork->CompletedYear = HttpInput::Int(POST, 'artwork-year') ?? $artwork->CompletedYear;
$artwork->CompletedYearIsCirca = HttpInput::Bool(POST, 'artwork-year-is-circa', false) ?? $artwork->CompletedYearIsCirca;
$artwork->Status = HttpInput::Str(POST, 'artwork-status', false) ?? $artwork->Status;
$artwork->EbookWwwFilesystemPath = HttpInput::Str(POST, 'artwork-ebook-www-filesystem-path', false) ?? $artwork->EbookWwwFilesystemPath;
$artwork->IsPublishedInUs = HttpInput::Bool(POST, 'artwork-is-published-in-us', false) ?? $artwork->IsPublishedInUs;
$artwork->PublicationYear = HttpInput::Int(POST, 'artwork-publication-year') ?? $artwork->PublicationYear;
$artwork->PublicationYearPageUrl = HttpInput::Str(POST, 'artwork-publication-year-page-url', false) ?? $artwork->PublicationYearPageUrl;
$artwork->CopyrightPageUrl = HttpInput::Str(POST, 'artwork-copyright-page-url', false) ?? $artwork->CopyrightPageUrl;
$artwork->ArtworkPageUrl = HttpInput::Str(POST, 'artwork-artwork-page-url', false) ?? $artwork->ArtworkPageUrl;
$artwork->MuseumUrl = HttpInput::Str(POST, 'artwork-museum-url', false) ?? $artwork->MuseumUrl;
$artwork->Exception = HttpInput::Str(POST, 'artwork-exception', false) ?? $artwork->Exception;
$tagsString = HttpInput::Str(POST, 'artwork-tags', false);
if($tagsString !== null){
$artwork->Tags = Artwork::ParseTags($tagsString);
}
// If the artwork is approved, set the reviewer
if($artwork->Status != COVER_ARTWORK_STATUS_UNVERIFIED){
$artwork->ReviewerUserId = $GLOBALS['User']->UserId;
$artwork->Save();
$_SESSION['artwork'] = $artwork;
$_SESSION['artwork-saved'] = true;
http_response_code(303);
header('Location: ' . $artwork->Url);
}
$artwork->Create($_FILES['artwork-image'] ?? []);
$_SESSION['artwork'] = $artwork;
$_SESSION['artwork-created'] = true;
http_response_code(303);
header('Location: /artworks/new');
}
catch(Exceptions\InvalidRequestException){
http_response_code(405);
}
catch(Exceptions\LoginRequiredException){
Template::RedirectToLogin();
@ -64,10 +111,20 @@ catch(Exceptions\LoginRequiredException){
catch(Exceptions\InvalidPermissionsException){
Template::Emit403();
}
catch(Exceptions\ArtworkNotFoundException){
Template::Emit404();
}
catch(Exceptions\AppException $exception){
$_SESSION['artwork'] = $artwork ?? null;
$_SESSION['exception'] = $exception;
http_response_code(303);
header('Location: /artworks/new');
if($httpMethod == HTTP_PATCH && $artwork !== null){
header('Location: ' . $artwork->Url);
}
else{
header('Location: /artworks/new');
}
}

16
www/css/artwork.css
View file

@ -14,14 +14,6 @@
font-display: swap;
}
form button.decline-button{
background-color: #777;
}
form button.decline-button:hover{
background-color: #aaa;
}
.artworks nav > a{
border: 1px solid rgba(0, 0, 0, .5);
font-style: normal;
@ -219,6 +211,12 @@ main.artworks nav ol li a:hover{
max-width: 100%;
}
form[action^="/artworks/"]{
display: flex;
flex-direction: column;
gap: 1rem;
}
.artworks form[action="/artworks"]{
align-items: end;
display: grid;
@ -289,7 +287,7 @@ form[action="/artworks"] label{
display: block;
}
form[action="/artworks"] div.footer{
form div.footer{
margin-top: 1rem;
text-align: right;
}