From 0105bfefa40e1c58574e604a765e597ca5b363b8 Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Mon, 6 Jan 2025 13:25:02 -0600
Subject: [PATCH] Tweak donation banners and some type safety

---
 templates/DonationProgress.php | 2 +-
 www/ebooks/index.php           | 1 +
 www/projects/post.php          | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/DonationProgress.php b/templates/DonationProgress.php
index 4c3a441c..04936cce 100644
--- a/templates/DonationProgress.php
+++ b/templates/DonationProgress.php
@@ -63,7 +63,7 @@ if($donationDrive->IsStretchEnabled){
 		</header>
 	<? }else{ ?>
 		<header>
-			<p>Help us meet our stretch goal of<br/> <?= number_format($donationDrive->TargetDonationCount) ?> new patrons by <?= $deadline ?></p>
+			<p><? if($timeLeft->days <= 1){ ?><?= $timeString ?> left—<br/>Help us meet our stretch goal of<br/> <?= number_format($donationDrive->TargetDonationCount) ?> new patrons<? }else{ ?>Help us meet our stretch goal of<br/> <?= number_format($donationDrive->TargetDonationCount) ?> new patrons by <?= $deadline ?><? } ?></p>
 		</header>
 	<? } ?>
 	<div class="progress"<? if($donationDrive->IsStretchEnabled){ ?> style="--stretch-starting-position: <?= $stretchStartingPosition ?>%; --stretch-base-counter-position: <?= $stretchStartingPosition - 1 ?>%"<? } ?>>
diff --git a/www/ebooks/index.php b/www/ebooks/index.php
index c48ea1e8..17be52cb 100644
--- a/www/ebooks/index.php
+++ b/www/ebooks/index.php
@@ -1,4 +1,5 @@
 <?
+use function Safe\preg_match;
 use function Safe\preg_replace;
 
 $page = HttpInput::Int(GET, 'page') ?? 1;
diff --git a/www/projects/post.php b/www/projects/post.php
index 2544580b..84177ac6 100644
--- a/www/projects/post.php
+++ b/www/projects/post.php
@@ -38,13 +38,13 @@ try{
 			catch(Exceptions\DuplicateEbookException $ex){
 				// If the `Ebook` already exists, create the `Project` anyway.
 				$project->Ebook = Ebook::GetByIdentifier($project->Ebook->Identifier);
-				if(!$project->Ebook->EbookPlaceholder?->IsInProgress){
+				if($project->Ebook->EbookPlaceholder !== null && !$project->Ebook->EbookPlaceholder->IsInProgress){
 					$project->EbookId = $project->Ebook->EbookId;
 					$_SESSION['is-only-ebook-project-created'] = true;
 
 					// Set the placeholder to in progress.
-					$project->Ebook->EbookPlaceholder?->IsInProgress = true;
-					$project->Ebook->EbookPlaceholder?->Save();
+					$project->Ebook->EbookPlaceholder->IsInProgress = true;
+					$project->Ebook->EbookPlaceholder->Save();
 				}
 				else{
 					// `Ebook` exists and it's not a placeholder, so really fail.