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

Fix typos

Browse source
This commit is contained in:
Alex Cabal 2024-12-16 15:45:11 -06:00
parent 051e286a6d
commit 8e6b05a150
6 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/apache/rewrites/users.conf
View file

@ -3,6 +3,6 @@ RewriteRule ^/users/([\d]+)$ /users/post.php?user-id=$1 [L]
RewriteRule ^/users/([^/]+)$ /users/get.php?user-identifier=$1 [B,L] RewriteRule ^/users/([^/]+)$ /users/get.php?user-identifier=$1 [B,L]
RewriteRule ^/users/([^/]+)/edit$ /users/edit.php?user-identifier=$1 [L] RewriteRule ^/users/([^/]+)/edit$ /users/edit.php?user-identifier=$1 [B,L]
RewriteRule ^/users/([^/]+)/projects$ /users/projects/index.php?user-identifier=$1 [L] RewriteRule ^/users/([^/]+)/projects$ /users/projects/index.php?user-identifier=$1 [B,L]

16
lib/Project.php
View file

@ -277,27 +277,29 @@ class Project{
$this->ProjectId = Db::GetLastInsertedId(); $this->ProjectId = Db::GetLastInsertedId();
// Notify the manager. // Notify the manager and reviewer.
if($this->Status == Enums\ProjectStatusType::InProgress){ if($this->Status == Enums\ProjectStatusType::InProgress){
// The manager is also the reviewer, just send one email.
if($this->ManagerUserId == $this->ReviewerUserId){ if($this->ManagerUserId == $this->ReviewerUserId){
if($this->Manager->Email !== null){ if($this->Manager->Email !== null){
$em = new Email(); $em = new Email();
$em->From = ADMIN_EMAIL_ADDRESS; $em->From = ADMIN_EMAIL_ADDRESS;
$em->To = $this->Manager->Email; $em->To = $this->Manager->Email;
$em->Subject = 'New ebook project to manage and review'; $em->Subject = 'New ebook project to manage and review';
$em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'manage and review']); $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'manage and review', 'user' => $this->Manager]);
$em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'manage and review']); $em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'manage and review', 'user' => $this->Manager]);
$em->Send(); $em->Send();
} }
} }
else{ else{
// Notify the manager.
if($this->Manager->Email !== null){ if($this->Manager->Email !== null){
$em = new Email(); $em = new Email();
$em->From = ADMIN_EMAIL_ADDRESS; $em->From = ADMIN_EMAIL_ADDRESS;
$em->To = $this->Manager->Email; $em->To = $this->Manager->Email;
$em->Subject = 'New ebook project to manage'; $em->Subject = 'New ebook project to manage';
$em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'manage']); $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'manage', 'user' => $this->Manager]);
$em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'manage']); $em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'manage', 'user' => $this->Manager]);
$em->Send(); $em->Send();
} }
@ -307,8 +309,8 @@ class Project{
$em->From = ADMIN_EMAIL_ADDRESS; $em->From = ADMIN_EMAIL_ADDRESS;
$em->To = $this->Reviewer->Email; $em->To = $this->Reviewer->Email;
$em->Subject = 'New ebook project to review'; $em->Subject = 'New ebook project to review';
$em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'review']); $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'review', 'user' => $this->Reviewer]);
$em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'review']); $em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'review', 'user' => $this->Reviewer]);
$em->Send(); $em->Send();
} }
} }

3
templates/EmailManagerNewProject.php
View file

@ -2,6 +2,7 @@
/** /**
* @var Project $project * @var Project $project
* @var string $role * @var string $role
* @var User $user
*/ */
?><?= Template::EmailHeader(['hasDataTable' => true, 'letterhead' => true]) ?> ?><?= Template::EmailHeader(['hasDataTable' => true, 'letterhead' => true]) ?>
<p>You’ve been assigned a new ebook project to <strong><?= $role ?></strong>:</p> <p>You’ve been assigned a new ebook project to <strong><?= $role ?></strong>:</p>
@ -55,7 +56,7 @@
<ul> <ul>
<li> <li>
<p> <p>
<a href="<?= SITE_URL ?><?= $project->Manager->Url ?>/projects">See all of the ebook projects you’re currently assigned to.</a> <a href="<?= SITE_URL ?><?= $user->Url ?>/projects">See all of the ebook projects you’re currently assigned to.</a>
</p> </p>
</li> </li>
<li> <li>

1
templates/EmailManagerNewProjectText.php
View file

@ -2,6 +2,7 @@
/** /**
* @var Project $project * @var Project $project
* @var string $role * @var string $role
* @var User $user
*/ */
?> ?>
You’ve been assigned a new ebook project to **<?= $role ?>**: You’ve been assigned a new ebook project to **<?= $role ?>**:

2
templates/ProjectsTable.php
View file

@ -56,7 +56,7 @@ $includeStatus = $includeStatus ?? true;
</td> </td>
<? } ?> <? } ?>
<td> <td>
<a href="<?= Formatter::EscapeHtml($project->VcsUrl) ?>">Respository</a> <a href="<?= Formatter::EscapeHtml($project->VcsUrl) ?>">Repository</a>
</td> </td>
<td> <td>
<? if($project->DiscussionUrl !== null){ ?> <? if($project->DiscussionUrl !== null){ ?>

9
www/users/projects/index.php
View file

@ -38,7 +38,14 @@ catch(Exceptions\InvalidPermissionsException){
) ?> ) ?>
<main> <main>
<section> <section>
<nav class="breadcrumbs"><a href="<?= $user->Url ?>"><?= Formatter::EscapeHtml($user->DisplayName) ?></a> →</nav> <nav class="breadcrumbs">
<? if(Session::$User->Benefits->CanEditUsers){ ?>
<a href="<?= $user->Url ?>"><?= Formatter::EscapeHtml($user->DisplayName) ?></a>
<? }else{ ?>
<?= Formatter::EscapeHtml($user->DisplayName) ?>
<? } ?>
→
</nav>
<h1>Projects</h1> <h1>Projects</h1>
<section id="managing"> <section id="managing">
<h2>Managing</h2> <h2>Managing</h2>