From fea847afd2c5729443f04fdfae8658fe52ac9664 Mon Sep 17 00:00:00 2001
From: Chris <christian@haschek.at>
Date: Sun, 29 Oct 2023 15:58:16 +0100
Subject: [PATCH] auto login when chosen so

---
 .vscode/launch.json             | 21 +++++++++++++++++++++
 web/models/Dog.model.php        |  2 ++
 web/models/Tournament.model.php |  1 -
 web/pages/err/controller.php    |  9 ++++++++-
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..5b0fbbc
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,21 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch built-in server",
+            "type": "php",
+            "request": "launch",
+            "runtimeArgs": [
+                "-S",
+                "localhost:8080",
+                "-t",
+                "web"
+            ],
+            "hostname": "localhost",
+            "port": 5902,
+            "serverReadyAction": {
+                "action": "openExternally"
+            },
+        }
+    ]
+}
\ No newline at end of file
diff --git a/web/models/Dog.model.php b/web/models/Dog.model.php
index 4790ff7..3f4f23c 100644
--- a/web/models/Dog.model.php
+++ b/web/models/Dog.model.php
@@ -22,6 +22,8 @@ class Dog extends Model
 
         if (!$this->exists($dog))
             return false;
+        else if(!is_array($_SESSION['user']->data['dogs']))
+            return false;
         else {
             if (in_array($dog, $_SESSION['user']->data['dogs']))
                 return true;
diff --git a/web/models/Tournament.model.php b/web/models/Tournament.model.php
index 71c7c2c..e80e4f5 100644
--- a/web/models/Tournament.model.php
+++ b/web/models/Tournament.model.php
@@ -8,7 +8,6 @@ class Tournament extends Model
         'name' =>  ['type' => 'text', 'required'],
         'date' =>   ['type' => 'datetime','required'],
         'duration' =>   ['type' => 'int'], //in days
-        'referee' =>   ['type' => 'text'], 
         'text' => ['type' => 'text'],
         'url' =>   ['type' => 'text'], //if there is one
         'logo' =>  ['type' => 'text', 'default' => 'https://pictshare.net/prrnrk.jpg'],
diff --git a/web/pages/err/controller.php b/web/pages/err/controller.php
index c128acc..9c3ed8f 100644
--- a/web/pages/err/controller.php
+++ b/web/pages/err/controller.php
@@ -27,8 +27,15 @@ class Err extends Page {
 
             if($u->id)
             {
+                $u->load($u->id);
                 $u->login();
-                $this->redirect($_SERVER['REQUEST_URI']);
+                $url = '/'.implode('/',$GLOBALS['url']);
+                //var_dump($url);
+                $this->redirect($url);
+            }
+            else
+            {
+                setcookie('token', '', time() - 3600, "/");
             }
         }