MAPG-166 response to HEAD request with the GET content

MAPG-164 use env variable for mail sender instead of hardcoded value

.env.example

@@ -1,3 +1,4 @@
+APP_NAME=MapQuiz
 DEV=1
 DB_HOST=mariadb
 DB_USER=mapguesser

mail/signup-noconfirm.html

@@ -1,9 +1,9 @@
 Hi,
 <br><br>
-You recently signed up on MapGuesser with this Google account ({{EMAIL}}).
+You recently signed up on {{APP_NAME}} with this Google account ({{EMAIL}}).
 <br><br>
-Have fun on MapGuesser!
+Have fun on {{APP_NAME}}!
 <br><br>
 Regards,<br>
-MapGuesser<br>
+{{APP_NAME}}<br>
-<a href="{{BASE_URL}}" title="MapGuesser">{{BASE_URL}}</a>
+<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

mail/signup.html

@@ -1,14 +1,14 @@
 Hi,
 <br><br>
-You recently signed up on MapGuesser with this email address ({{EMAIL}}). To activate your account, please click on the following link:<br>
+You recently signed up on {{APP_NAME}} with this email address ({{EMAIL}}). To activate your account, please click on the following link:<br>
 <a href="{{ACTIVATE_LINK}}" title="Account activation">{{ACTIVATE_LINK}}</a>
 <br><br>
-If you did not sign up on MapGuesser or changed your mind, no further action is required, your email address will be deleted soon.<br>
+If you did not sign up on {{APP_NAME}} or changed your mind, no further action is required, your email address will be deleted soon.<br>
 However if you want to immediately delete it, please click on the following link:<br>
 <a href="{{CANCEL_LINK}}" title="Sign up cancellation">{{CANCEL_LINK}}</a>
 <br><br>
-Have fun on MapGuesser!
+Have fun on {{APP_NAME}}!
 <br><br>
 Regards,<br>
-MapGuesser<br>
+{{APP_NAME}}<br>
-<a href="{{BASE_URL}}" title="MapGuesser">{{BASE_URL}}</a>
+<a href="{{BASE_URL}}" title="{{APP_NAME}}">{{BASE_URL}}</a>

src/Controller/LoginController.php

@@ -373,12 +373,11 @@ class LoginController
     {
         $mail = new Mail();
         $mail->addRecipient($email);
-        $mail->setSubject('Welcome to MapGuesser - Activate your account');
+        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME'] . ' - Activate your account');
         $mail->setBodyFromTemplate('signup', [
             'EMAIL' => $email,
             'ACTIVATE_LINK' => $this->request->getBase() . '/'. \Container::$routeCollection->getRoute('signup.activate')->generateLink(['token' => $token]),
             'CANCEL_LINK' => $this->request->getBase() . '/' . \Container::$routeCollection->getRoute('signup.cancel')->generateLink(['token' => $token]),
-            'BASE_URL' => $this->request->getBase(),
         ]);
         $mail->send();
     }
@@ -387,10 +386,9 @@ class LoginController
     {
         $mail = new Mail();
         $mail->addRecipient($email);
-        $mail->setSubject('Welcome to MapGuesser');
+        $mail->setSubject('Welcome to ' . $_ENV['APP_NAME']);
         $mail->setBodyFromTemplate('signup-noconfirm', [
             'EMAIL' => $email,
-            'BASE_URL' => $this->request->getBase(),
         ]);
         $mail->send();
     }

src/Mailing/Mail.php

@@ -29,6 +29,13 @@ class Mail
     {
         $this->body = file_get_contents(ROOT . '/mail/' . $template . '.html');
 
+        $baseParameters = [
+            'APP_NAME' => $_ENV['APP_NAME'],
+            'BASE_URL' => \Container::$request->getBase(),
+        ];
+
+        $params = array_merge($baseParameters, $params);
+
         foreach ($params as $key => $param) {
             $this->body = str_replace('{{' . $key . '}}', $param, $this->body);
         }
@@ -58,8 +65,8 @@ class Mail
             $mailer->Mailer = 'mail';
         }
 
-        $mailer->setFrom($_ENV['MAIL_FROM'], 'MapGuesser');
+        $mailer->setFrom($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
-        $mailer->addReplyTo($_ENV['MAIL_FROM'], 'MapGuesser');
+        $mailer->addReplyTo($_ENV['MAIL_FROM'], $_ENV['APP_NAME']);
 
         $mailer->Sender = !empty($_ENV['MAIL_BOUNCE']) ? $_ENV['MAIL_BOUNCE'] : $_ENV['MAIL_FROM'];
         $mailer->Subject = $this->subject;

src/Routing/RouteCollection.php

@@ -45,6 +45,11 @@ class RouteCollection
     {
         $groupNumber = count($uri);
 
+        // response to HEAD request with the GET content
+        if ($method === 'head') {
+            $method = 'get';
+        }
+
         if (!isset($this->searchTable[$method][$groupNumber])) {
             return null;
         }

views/admin/map_editor.php

@@ -17,7 +17,7 @@ $jsFiles = [
     <h1>
         <a href="/maps" title="Back to playable maps">
             <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
-         --><span>MapGuesser</span>
+         --><span><?= $_ENV['APP_NAME'] ?></span>
         </a>
     </h1>
     <p class="header">

views/error/404.php

@@ -1,6 +1,6 @@
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
     <h2>404 | Page not found</h2>
-    <p>The requested URL was not found on this server. <a href="/" title="MapGuesser">Back to start.</a></p>
+    <p>The requested URL was not found on this server. <a href="/" title="<?= $_ENV['APP_NAME'] ?>">Back to start.</a></p>
 <?php require ROOT . '/views/templates/footer.php'; ?>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>

views/game.php

@@ -12,7 +12,7 @@ $jsFiles = [
     <h1>
         <a href="/maps" title="Back to playable maps">
             <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
-         --><span>MapGuesser</span>
+         --><span><?= $_ENV['APP_NAME'] ?></span>
         </a>
     </h1>
     <p class="header">

views/templates/footer.php

@@ -1,5 +1,5 @@
 </main>
 <footer>
-    <p><span class="bold">MapGuesser</span> <?= VERSION ?></p><!--
+    <p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!--
  --><p>&copy; Pőcze Bence <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
 </footer>

views/templates/header.php

@@ -1,8 +1,8 @@
 <header>
     <h1>
-        <a href="/" title="MapGuesser">
+        <a href="/" title="<?= $_ENV['APP_NAME'] ?>">
             <img class="inline" width="1em" height="1em" src="<?= $_ENV['STATIC_ROOT'] ?>/img/icon.svg?rev=<?= REVISION ?>"><!--
-         --><span>MapGuesser</span>
+         --><span><?= $_ENV['APP_NAME'] ?></span>
         </a>
     </h1>
     <p>

views/templates/main_header.php

@@ -3,7 +3,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>MapGuesser</title>
+    <title><?= $_ENV['APP_NAME'] ?></title>
     <link href="<?= $_ENV['STATIC_ROOT'] ?>/css/mapguesser.css?rev=<?= REVISION ?>" rel="stylesheet">
     <?php if (isset($cssFiles)) : ?>
         <?php foreach ($cssFiles as $cssFile) : ?>