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

More type hinting

Browse source
This commit is contained in:
Alex Cabal 2024-01-08 20:21:42 -06:00
parent cb79832092
commit 1c3640fab6
6 changed files with 56 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/Artwork.php
View file

@ -72,17 +72,27 @@ class Artwork extends PropertiesBase{
return $this->_UrlName;
}
protected function GetSubmitter(): User{
protected function GetSubmitter(): ?User{
if($this->_Submitter === null){
$this->_Submitter = User::Get($this->SubmitterUserId);
try{
$this->_Submitter = User::Get($this->SubmitterUserId);
}
catch(Exceptions\InvalidUserException){
// Return null
}
}
return $this->_Submitter;
}
protected function GetReviewer(): User{
protected function GetReviewer(): ?User{
if($this->_Reviewer === null){
$this->_Reviewer = User::Get($this->ReviewerUserId);
try{
$this->_Reviewer = User::Get($this->ReviewerUserId);
}
catch(Exceptions\InvalidUserException){
// Return null
}
}
return $this->_Reviewer;

6
lib/Exceptions/InvalidLoginException.php Normal file
View file

@ -0,0 +1,6 @@
<?
namespace Exceptions;
class InvalidLoginException extends AppException{
protected $message = 'We couldn’t validate your login information.';
}

2
lib/Exceptions/InvalidUserException.php
View file

@ -2,5 +2,5 @@
namespace Exceptions;
class InvalidUserException extends AppException{
protected $message = 'We couldn’t validate your login information.';
protected $message = 'We couldn’t locate that user.';
}

53
lib/Session.php
View file

@ -1,4 +1,6 @@
<?
use Exceptions\InvalidLoginException;
use Ramsey\Uuid\Uuid;
use Safe\DateTime;
use function Safe\strtotime;
@ -33,33 +35,38 @@ class Session extends PropertiesBase{
// *******
public function Create(?string $email = null, ?string $password = null): void{
$this->User = User::GetIfRegistered($email, $password);
$this->UserId = $this->User->UserId;
try{
$this->User = User::GetIfRegistered($email, $password);
$this->UserId = $this->User->UserId;
$existingSessions = Db::Query('
SELECT SessionId,
Created
from Sessions
where UserId = ?
', [$this->UserId]);
$existingSessions = Db::Query('
SELECT SessionId,
Created
from Sessions
where UserId = ?
', [$this->UserId]);
if(sizeof($existingSessions) > 0){
$this->SessionId = $existingSessions[0]->SessionId;
$this->Created = $existingSessions[0]->Created;
if(sizeof($existingSessions) > 0){
$this->SessionId = $existingSessions[0]->SessionId;
$this->Created = $existingSessions[0]->Created;
}
else{
$uuid = Uuid::uuid4();
$this->SessionId = $uuid->toString();
$this->Created = new DateTime();
Db::Query('
INSERT into Sessions (UserId, SessionId, Created)
values (?,
?,
?)
', [$this->UserId, $this->SessionId, $this->Created]);
}
self::SetSessionCookie($this->SessionId);
}
else{
$uuid = Uuid::uuid4();
$this->SessionId = $uuid->toString();
$this->Created = new DateTime();
Db::Query('
INSERT into Sessions (UserId, SessionId, Created)
values (?,
?,
?)
', [$this->UserId, $this->SessionId, $this->Created]);
catch(Exceptions\InvalidUserException){
throw new InvalidLoginException();
}
self::SetSessionCookie($this->SessionId);
}
public static function GetLoggedInUser(): ?User{

4
lib/User.php
View file

@ -114,6 +114,10 @@ class User extends PropertiesBase{
// ***********
public static function Get(?int $userId): User{
if($userId === null){
throw new Exceptions\InvalidUserException();
}
$result = Db::Query('
SELECT *
from Users

2
www/artworks/get.php
View file

@ -82,7 +82,7 @@ catch(Exceptions\ArtworkNotFoundException){
<? 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>
<td><? if($artwork->Submitter === 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>
<? if($artwork->Reviewer !== null){ ?>
<tr>