diff --git a/config/apache/rewrites/users.conf b/config/apache/rewrites/users.conf index 2cdbae86..1d5d1e0f 100644 --- a/config/apache/rewrites/users.conf +++ b/config/apache/rewrites/users.conf @@ -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/([^/]+)/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] diff --git a/lib/Project.php b/lib/Project.php index 8637444c..c77922f3 100644 --- a/lib/Project.php +++ b/lib/Project.php @@ -277,27 +277,29 @@ class Project{ $this->ProjectId = Db::GetLastInsertedId(); - // Notify the manager. + // Notify the manager and reviewer. if($this->Status == Enums\ProjectStatusType::InProgress){ + // The manager is also the reviewer, just send one email. if($this->ManagerUserId == $this->ReviewerUserId){ if($this->Manager->Email !== null){ $em = new Email(); $em->From = ADMIN_EMAIL_ADDRESS; $em->To = $this->Manager->Email; $em->Subject = 'New ebook project to manage and review'; - $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'manage and review']); - $em->TextBody = Template::EmailManagerNewProjectText(['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', 'user' => $this->Manager]); $em->Send(); } } else{ + // Notify the manager. if($this->Manager->Email !== null){ $em = new Email(); $em->From = ADMIN_EMAIL_ADDRESS; $em->To = $this->Manager->Email; $em->Subject = 'New ebook project to manage'; - $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'manage']); - $em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'manage']); + $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'manage', 'user' => $this->Manager]); + $em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'manage', 'user' => $this->Manager]); $em->Send(); } @@ -307,8 +309,8 @@ class Project{ $em->From = ADMIN_EMAIL_ADDRESS; $em->To = $this->Reviewer->Email; $em->Subject = 'New ebook project to review'; - $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'review']); - $em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'review']); + $em->Body = Template::EmailManagerNewProject(['project' => $this, 'role' => 'review', 'user' => $this->Reviewer]); + $em->TextBody = Template::EmailManagerNewProjectText(['project' => $this, 'role' => 'review', 'user' => $this->Reviewer]); $em->Send(); } } diff --git a/templates/EmailManagerNewProject.php b/templates/EmailManagerNewProject.php index d6aee931..0c7d2e44 100644 --- a/templates/EmailManagerNewProject.php +++ b/templates/EmailManagerNewProject.php @@ -2,6 +2,7 @@ /** * @var Project $project * @var string $role + * @var User $user */ ?>= Template::EmailHeader(['hasDataTable' => true, 'letterhead' => true]) ?>
You’ve been assigned a new ebook project to = $role ?>:
@@ -55,7 +56,7 @@- See all of the ebook projects you’re currently assigned to. + See all of the ebook projects you’re currently assigned to.