From 6f86a1899b10a8290630398aa1336d473b7a9c57 Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Tue, 26 Feb 2019 18:28:45 -0600
Subject: [PATCH] Improve tag and collection browsing and pagination

---
 lib/Collection.php   |  2 +-
 lib/Ebook.php        |  2 +-
 www/ebooks/ebook.php |  8 +++++---
 www/ebooks/index.php | 31 +++++++++++++++++++++++++------
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/lib/Collection.php b/lib/Collection.php
index 55e2cfcf..9d684559 100644
--- a/lib/Collection.php
+++ b/lib/Collection.php
@@ -5,7 +5,7 @@ class Collection{
 
 	public function __construct(string $name){
 		$this->Name = $name;
-		$this->Url = '/collections/' . strtolower(str_replace(' ', '-', Formatter::ToPlainText($this->Name))) . '/';
+		$this->Url = '/collections/' . strtolower(str_replace(' ', '-', Formatter::ToPlainText(Formatter::RemoveDiacritics($this->Name)))) . '/';
 	}
 }
 ?>
diff --git a/lib/Ebook.php b/lib/Ebook.php
index 89527915..edfa6a24 100644
--- a/lib/Ebook.php
+++ b/lib/Ebook.php
@@ -521,7 +521,7 @@ class Ebook{
 
 	public function IsInCollection(string $collection): bool{
 		foreach($this->Collections as $c){
-			if(strtolower($c->Name) == strtolower($collection)){
+			if(strtolower(Formatter::RemoveDiacritics($c->Name)) == strtolower(Formatter::RemoveDiacritics($collection))){
 				return true;
 			}
 		}
diff --git a/www/ebooks/ebook.php b/www/ebooks/ebook.php
index 17e317d4..8f6d7e6f 100644
--- a/www/ebooks/ebook.php
+++ b/www/ebooks/ebook.php
@@ -72,9 +72,11 @@ catch(\Exception $ex){
 			<p><?= $ebook->ContributorsHtml ?></p>
 			<? } ?>
 			<? if(sizeof($ebook->Collections) > 0){ ?>
-				<? foreach($ebook->Collections as $collection){ ?>
-				<p>Part of the <a href="<?= $collection->Url ?>"><?= Formatter::ToPlainText($collection->Name) ?> collection</a>.</p>
-				<? } ?>
+				<p>Part of the
+					<? for($i = 0; $i < sizeof($ebook->Collections); $i++){ ?>
+					<a href="<?= $ebook->Collections[$i]->Url ?>"><?= Formatter::ToPlainText(preg_replace('/^The /ius', '', (string)$ebook->Collections[$i]->Name) ?? '') ?></a><? if(sizeof($ebook->Collections) > 2){ ?><? if($i == sizeof($ebook->Collections) - 2){ ?>, and <? }elseif($i != sizeof($ebook->Collections) - 1){ ?>, <? } ?><? }elseif($i == sizeof($ebook->Collections) - 2){ ?> and <? } ?>
+					<? } ?>
+				collection<? if(sizeof($ebook->Collections) > 1){ ?>s<? } ?></a>.</p>
 			<? } ?>
 			<ul class="tags"><? foreach($ebook->Tags as $tag){ ?><li><a href="<?= $tag->Url ?>"><?= Formatter::ToPlainText($tag->Name) ?></a></li><? } ?></ul>
 		</aside>
diff --git a/www/ebooks/index.php b/www/ebooks/index.php
index 246e904a..70ace3a1 100644
--- a/www/ebooks/index.php
+++ b/www/ebooks/index.php
@@ -28,15 +28,22 @@ try{
 		$tag = strtolower(str_replace('-', ' ', $tag));
 		$ebooks = Library::GetEbooksByTag($tag);
 		$pageTitle = 'Browse ebooks tagged “' . Formatter::ToPlainText($tag) . '”';
-		$pageDescription = 'A list of ebooks tagged “' . Formatter::ToPlainText($tag) . '”';
+		$pageDescription = 'Page ' . $page . ' of ebooks tagged “' . Formatter::ToPlainText($tag) . '”';
 		$pageHeader = 'Ebooks tagged “' . Formatter::ToPlainText($tag) . '”';
+
+		$pages = ceil(sizeof($ebooks) / EBOOKS_PER_PAGE);
+
+		$totalEbooks = sizeof($ebooks);
+
+		$ebooks = array_slice($ebooks, ($page - 1) * EBOOKS_PER_PAGE, EBOOKS_PER_PAGE);
 	}
 	elseif($collection !== null){
-		$collection = strtolower(str_replace('-', ' ', $collection));
+		$collection = strtolower(str_replace('-', ' ', Formatter::RemoveDiacritics($collection)));
 		$ebooks = Library::GetEbooksByCollection($collection);
-		$pageTitle = 'Browse ebooks in the ' . Formatter::ToPlainText(ucwords($collection)) . ' collection';
-		$pageDescription = 'A list of ebooks in the ' . Formatter::ToPlainText(ucwords($collection)) . ' collection';
-		$pageHeader = 'Ebooks in the ' . Formatter::ToPlainText(ucwords($collection)) . ' collection';
+		$collectionName = ucwords(preg_replace('/^The /ius', '', $collection) ?? '');
+		$pageTitle = 'Browse ebooks in the ' . Formatter::ToPlainText($collectionName) . ' collection';
+		$pageDescription = 'A list of ebooks in the ' . Formatter::ToPlainText($collectionName) . ' collection';
+		$pageHeader = 'Ebooks in the ' . Formatter::ToPlainText($collectionName) . ' collection';
 	}
 	else{
 		$pageTitle = 'Browse Standard Ebooks';
@@ -74,7 +81,7 @@ catch(\Exception $ex){
 		<? }else{ ?>
 			<?= Template::EbookGrid(['ebooks' => $ebooks]) ?>
 		<? } ?>
-		<? if($query === null){ ?>
+		<? if($query === null && $tag === null && $collection === null){ ?>
 			<nav>
 				<a<? if($page > 1){ ?> href="/ebooks/<? if($page - 1 > 1){ ?>?page=<?= $page - 1 ?><? } ?><? if($sort != SORT_NEWEST){ ?><? if($page - 1 <= 1){ ?>?<? }else{ ?>&amp;<? } ?>sort=<?= $sort ?><? } ?>"<? } ?> rel="previous">Back</a>
 				<ol>
@@ -84,6 +91,18 @@ catch(\Exception $ex){
 				</ol>
 				<a<? if($page < ceil($totalEbooks / EBOOKS_PER_PAGE)){ ?> href="/ebooks/?page=<?= $page + 1 ?><? if($sort != SORT_NEWEST){ ?>&amp;sort=<?= $sort ?><? } ?>"<? }else{ ?> class="disabled"<? } ?> rel="next">Next</a>
 			</nav>
+		<? }elseif($tag !== null){ ?>
+			<nav>
+				<a<? if($page > 1){ ?> href="/tags/<?= Formatter::ToPlainText(str_replace(' ', '-', $tag)) ?>/<? if($page - 1 > 1){ ?>?page=<?= $page - 1 ?><? } ?>"<? } ?> rel="previous">Back</a>
+				<ol>
+				<? for($i = 1; $i < $pages + 1; $i++){ ?>
+					<li<? if($page == $i){ ?> class="highlighted"<? } ?>><a href="/tags/<?= Formatter::ToPlainText(str_replace(' ', '-', $tag)) ?>/<? if($i - 1 >= 1){ ?>?page=<?= $i ?><? } ?>"><?= $i ?></a></li>
+				<? } ?>
+				</ol>
+				<a<? if($page < ceil($totalEbooks / EBOOKS_PER_PAGE)){ ?> href="/tags/<?= Formatter::ToPlainText(str_replace(' ', '-', $tag)) ?>/?page=<?= $page + 1 ?>"<? }else{ ?> class="disabled"<? } ?> rel="next">Next</a>
+			</nav>
+		<? } ?>
+		<? if($query === null && $tag === null && $collection === null){ ?>
 			<aside class="sort">
 				<p>Sort by</p>
 				<a class="button<? if($sort == SORT_NEWEST){ ?> check<? } ?>" href="/ebooks/">newest</a>