From 38fa75402b64fe22f9fa768e2b17bf900f438bba Mon Sep 17 00:00:00 2001
From: Pablo Ferreiro <pferreiromero@gmail.com>
Date: Fri, 7 Jan 2022 00:28:28 +0100
Subject: [PATCH] Fixed issue with cookies

---
 .env.example         | 2 +-
 helpers/Misc.php     | 6 +++++-
 helpers/Settings.php | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index 3e24066..0e63d29 100644
--- a/.env.example
+++ b/.env.example
@@ -1 +1 @@
-APP_SUBDIR=/  # Subpath your app is running, LEAVE EMPTY IF RUNNING FROM /
+APP_SUBDIR=/  # Subpath your app is running, defaults to /
diff --git a/helpers/Misc.php b/helpers/Misc.php
index aa59a3b..b2dd030 100644
--- a/helpers/Misc.php
+++ b/helpers/Misc.php
@@ -4,7 +4,7 @@ use Helpers\Settings;
 
 class Misc {
     static public function getSubDir(): string {
-        return isset($_ENV['APP_SUBDIR']) && !empty($_ENV['APP_SUBDIR']) ? $_ENV['APP_SUBDIR'] : '';
+        return isset($_ENV['APP_SUBDIR']) && !empty($_ENV['APP_SUBDIR']) ? $_ENV['APP_SUBDIR'] : '/';
     }
 
     static public function getView(string $template): string {
@@ -24,7 +24,11 @@ class Misc {
     }
 
     static public function latte(): \Latte\Engine {
+        // Workaround to avoid weird path issues
         $subdir = Misc::getSubDir();
+        if ($subdir === '/') {
+            $subdir = '';
+        }
         $latte = new \Latte\Engine;
         $latte->setTempDirectory(__DIR__ . '/../cache/views');
         $latte->addFunction('assets', function (string $name, string $type)  use ($subdir) {
diff --git a/helpers/Settings.php b/helpers/Settings.php
index ae7594a..5da0749 100644
--- a/helpers/Settings.php
+++ b/helpers/Settings.php
@@ -16,6 +16,6 @@ class Settings {
     }
 
     static public function set(string $name, string $value) {
-        setcookie($name, $value, time()+60*60*24*30, '', '', true, true);
+        setcookie($name, $value, time()+60*60*24*30, Misc::getSubDir(), '', isset($_SERVER['HTTPS']), true);
     }
 };