From 3a167068142dd79b9fabbd488b3073bc17c1c68a Mon Sep 17 00:00:00 2001
From: Galexion <voltaire577@gmail.com>
Date: Fri, 17 Feb 2023 01:33:10 -0500
Subject: [PATCH] fixed bug where index.ejs wouldnt send people to /user if
 they were already signed in, documented stuff

---
 views/index.ejs | 32 +++++++++++++++++++++++++-------
 views/user.ejs  |  8 ++++----
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/views/index.ejs b/views/index.ejs
index a663eee..3c3f46c 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1,6 +1,6 @@
 <% var rootPath='../' ; %>
     <%- include(rootPath + 'templates/header.ejs' ); %>
-        
+
         <div id="loginContent">
             <h1>MaiMaiDX.Net</h1>
             <h5>Total Users Registered: <%= params.totalUsers %>
@@ -13,14 +13,32 @@
             </form>
 
             <script>
-                const extId = localStorage.getItem('ext_id');
-                const luid = localStorage.getItem('luid');
+                // Get the cookie string
+                const cookieString = document.cookie;
 
-                if (extId === null || luid === null) {
-                    console.log('User Data Not Detected! Please Sign In.');
-                } else {
-                    console.log(`User Data Found! Redirecting to User Page.`);
+                // Parse the cookie string and extract the values
+                const cookies = cookieString.split(';');
+                let ext_id2, luid2;
+
+                for (let i = 0; i < cookies.length; i++) {
+                    const cookie = cookies[i].trim();
+                    const cookieParts = cookie.split('=');
+
+                    if (cookieParts[0] === 'ext_id') {
+                        ext_id2 = cookieParts[1];
+                    }
+
+                    if (cookieParts[0] === 'luid') {
+                        luid2 = cookieParts[1];
+                    }
+                }
+
+                // Sends user to User Page if already signed in
+                if (ext_id2 && luid2) {
+                    console.log(`User Data Detected, sending to user page.`);
                     window.location = "/user";
+                } else {
+                    console.log('User Data Not Detected! Please Sign In.');
                 }
 
 
diff --git a/views/user.ejs b/views/user.ejs
index 68ec176..088787d 100644
--- a/views/user.ejs
+++ b/views/user.ejs
@@ -54,7 +54,7 @@
                         }
                     }
 
-                    // Use the values as needed
+                    // Sends user to the sign in page if they aren't already signed in to the website.
                     if (ext_id2 && luid2) {
                         console.log(`ext_id: ${ext_id2}, luid: ${luid2}`);
 
@@ -64,7 +64,7 @@
                     }
                 </script>
 
-                <% if(userdata.icon_id===10) { %>
+                <% if(userdata.icon_id===10) { %> <!-- If the user icon id is set to 10, it's a custom image and you need to grab the image that the user uploaded. -->
                     <img id="user-image" src="" alt="User Image">
 
                     <script>
@@ -72,14 +72,14 @@
                         userImage.src = "images/" + ext_id2 + '-up.jpg';
                     </script>
 
-                    <% } else {%>
+                    <% } else {%> <!-- If Not, use the userdata.icon_id variable to find which icon you need. -->
                         <img id="user-image" src="" alt="User Image">
 
                         <script data-userdata="<%=JSON.stringify(userdata)%>">
                             const userdata = JSON.parse(document.currentScript.getAttribute('data-userdata'));
                             const userImage = document.getElementById('user-image');
                             const UI_Icon = userdata.icon_id
-                            function padNumber(num, size) {
+                            function padNumber(num, size) { // pad the number because haha game weird
                                 var s = num + "";
                                 while (s.length < size) s = "0" + s;
                                 return s;