Did some fixes with the cookie-system and added the metadata to the subdomain-page

florisweb · florisweb · commit a8ab5df9f6c9 · 2019-08-30T09:58:14.000+02:00
diff --git a/index.php b/index.php
@@ -1,21 +1,18 @@
 <?php
-	$root = realpath($_SERVER["DOCUMENT_ROOT"]);	
-	require_once "$root/git/todo/database/modules/app.php";
-
-
-	$isLinkUser = setLink();
 	// system that redirects the user to the welcome page if they're new
 	if (!isset($_COOKIE["Veratio_hasSeenWelcomeMessage"]))
 	{
-		if ($isLinkUser) 
+		if ($_GET["link"])
 		{
 			header("Location: welcome?link=" . $_GET["link"]);
 		} else header("Location: welcome");
-		setcookie("Veratio_hasSeenWelcomeMessage", true, time() + 60 * 60 * 24 * 365);
 	}
 
+	$root = realpath($_SERVER["DOCUMENT_ROOT"]);	
+	require_once "$root/git/todo/database/modules/app.php";
 
 
+	$isLinkUser = setLink();
 	if ($isLinkUser == "false") $GLOBALS["SESSION"]->clear("veratio_userLink");
 	if ($isLinkUser == "false" && userNeedsRedirect())
 	{
diff --git a/subdomain/.DS_Store b/subdomain/.DS_Store
diff --git a/subdomain/index.php b/subdomain/index.php
@@ -2,6 +2,10 @@
 <html>
 	<head>
 		<title>Veratio - Florisweb.tk</title>
+		<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0' name='viewport'/>
+		<meta name="theme-color" content="#636ad5">
+		<link rel="manifest" href="https://florisweb.tk/git/todo/manifest.json">
+		<link rel="shortcut icon" href="https://florisweb.tk/git/todo/images/pressSet/favicon.ico">
 		<style>
 			iframe {
 				position: fixed;
diff --git a/welcome/index.php b/welcome/index.php
@@ -1,8 +1,8 @@
 <?php
+	setcookie("Veratio_hasSeenWelcomeMessage", "1", time() + 60 * 60 * 24 * 365, "/git/todo");	
 	echo "<script>const LINKUSER_LINK = decodeURIComponent('" . urlencode((string)$_GET["link"]) . "');</script>";
 ?>
 
-
 <!DOCTYPE html>
 <html>
 	<head>
@@ -221,7 +221,7 @@
 				</div>
 				
 				<div class="button bBoxy bDefault text clickable" onclick="
-				window.location.replace('../?link=' + LINKUSER_LINK);
+					window.location.replace('../?link=' + LINKUSER_LINK);
 				" style="width: 100px">Open Veratio</div>
 			</div>
 		</div>

Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,18 @@`
`1`	`1`	`<?php`
`2`		`- $root = realpath($_SERVER["DOCUMENT_ROOT"]);`
`3`		`- require_once "$root/git/todo/database/modules/app.php";`
`4`		`-`
`5`		`-`
`6`		`- $isLinkUser = setLink();`
`7`	`2`	`// system that redirects the user to the welcome page if they're new`
`8`	`3`	`if (!isset($_COOKIE["Veratio_hasSeenWelcomeMessage"]))`
`9`	`4`	`{`
`10`		`- if ($isLinkUser)`
	`5`	`+ if ($_GET["link"])`
`11`	`6`	`{`
`12`	`7`	`header("Location: welcome?link=" . $_GET["link"]);`
`13`	`8`	`} else header("Location: welcome");`
`14`		`- setcookie("Veratio_hasSeenWelcomeMessage", true, time() + 60 * 60 * 24 * 365);`
`15`	`9`	`}`
`16`	`10`
	`11`	`+ $root = realpath($_SERVER["DOCUMENT_ROOT"]);`
	`12`	`+ require_once "$root/git/todo/database/modules/app.php";`
`17`	`13`
`18`	`14`
	`15`	`+ $isLinkUser = setLink();`
`19`	`16`	`if ($isLinkUser == "false") $GLOBALS["SESSION"]->clear("veratio_userLink");`
`20`	`17`	`if ($isLinkUser == "false" && userNeedsRedirect())`
`21`	`18`	`{`