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

Add the HttpInput::File() and HttpInput::Date() method

Browse source
This commit is contained in:
Alex Cabal 2024-05-24 20:48:28 -05:00
parent f28378de37
commit 98f45ea4e0
4 changed files with 46 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Exceptions/InvalidFileUploadException.php Normal file
View file

@ -0,0 +1,8 @@
<?php
namespace Exceptions;
class InvalidFileUploadException extends AppException{
/** @var string $message */
protected $message = 'Uploaded file is invalid.';
}

24
lib/HttpInput.php
View file

@ -107,6 +107,30 @@ class HttpInput{
return self::GetHttpVar($variable, HttpVariableType::Decimal, $set);
}
public static function Date(HttpVariableSource $set, string $variable): ?DateTimeImmutable{
/** @var ?DateTimeImmutable */
return self::GetHttpVar($variable, HttpVariableType::DateTime, $set);
}
/**
* Returns the absolute path of the requested file upload, or `null` if there isn't one.
*
* @throws Exceptions\InvalidFileUploadException If there is a file upload present, but the upload somehow failed.
*/
public static function File(string $variable): ?string{
$filePath = null;
if(isset($_FILES[$variable]) && $_FILES[$variable]['size'] > 0){
if(!is_uploaded_file($_FILES[$variable]['tmp_name']) || $_FILES[$variable]['error'] > UPLOAD_ERR_OK){
throw new Exceptions\InvalidFileUploadException();
}
$filePath = $_FILES[$variable]['tmp_name'] ?? null;
}
return $filePath;
}
/**
* @param string $variable
* @return array<string>

1
lib/HttpVariableType.php
View file

@ -2,6 +2,7 @@
enum HttpVariableType{
case Array;
case Boolean;
case DateTime;
case Decimal;
case Integer;
case String;

41
www/artworks/post.php
View file

@ -1,4 +1,7 @@
<?
use Exceptions\InvalidImageUploadException;
try{
session_start();
$httpMethod = HttpInput::ValidateRequestMethod([HttpMethod::Post, HttpMethod::Patch, HttpMethod::Put]);
@ -32,17 +35,7 @@ try{
$artwork->ReviewerUserId = $GLOBALS['User']->UserId;
}
// Confirm that we have an image and that it came from POST
$imagePath = null;
if(isset($_FILES['artwork-image']) && $_FILES['artwork-image']['size'] > 0){
if(!is_uploaded_file($_FILES['artwork-image']['tmp_name']) || $_FILES['artwork-image']['error'] > UPLOAD_ERR_OK){
throw new Exceptions\InvalidImageUploadException();
}
$imagePath = $_FILES['artwork-image']['tmp_name'] ?? null;
}
$artwork->Create($imagePath);
$artwork->Create(HttpInput::File('artwork-image'));
$_SESSION['artwork'] = $artwork;
$_SESSION['artwork-created'] = true;
@ -77,21 +70,7 @@ try{
$artwork->Status = $newStatus;
}
// Confirm that we have an image and that it came from POST
$imagePath = null;
if(isset($_FILES['artwork-image']) && $_FILES['artwork-image']['size'] > 0){
if(!is_uploaded_file($_FILES['artwork-image']['tmp_name']) || $_FILES['artwork-image']['error'] > UPLOAD_ERR_OK){
throw new Exceptions\InvalidImageUploadException();
}
$imagePath = $_FILES['artwork-image']['tmp_name'] ?? null;
}
else{
// No uploaded file as part of this edit, so retain the MimeType of the original submission.
$artwork->MimeType = $originalArtwork->MimeType;
}
$artwork->Save($imagePath);
$artwork->Save(HttpInput::File('artwork-image'));
$_SESSION['artwork'] = $artwork;
$_SESSION['artwork-saved'] = true;
@ -100,7 +79,7 @@ try{
header('Location: ' . $artwork->Url);
}
// PATCHing a new artwork
// PATCHing an artwork
if($httpMethod == HttpMethod::Patch){
$artwork = Artwork::GetByUrl(HttpInput::Str(GET, 'artist-url-name'), HttpInput::Str(GET, 'artwork-url-name'));
@ -147,7 +126,13 @@ catch(Exceptions\InvalidPermissionsException){
catch(Exceptions\ArtworkNotFoundException){
Template::Emit404();
}
catch(Exceptions\InvalidArtworkException | Exceptions\InvalidArtworkTagException | Exceptions\InvalidArtistException | Exceptions\InvalidImageUploadException | Exceptions\ArtworkNotFoundException $ex){
catch(Exceptions\InvalidArtworkException | Exceptions\InvalidArtworkTagException | Exceptions\InvalidArtistException | Exceptions\InvalidFileUploadException | Exceptions\ArtworkNotFoundException $ex){
// If we were passed a more generic file upload exception from `HttpInput`, swap it for a more specific exception to show to the user.
if($ex instanceof Exceptions\InvalidFileUploadException){
$ex = new InvalidImageUploadException();
}
$_SESSION['artwork'] = $artwork;
$_SESSION['exception'] = $ex;