From a9780f59e7dbceb15b778d8ded960481ff622522 Mon Sep 17 00:00:00 2001
From: Fluffy-Bean <michal-gdula@protonmail.com>
Date: Sun, 25 Sep 2022 15:49:11 +0000
Subject: [PATCH] Code cleany cleany

---
 account.php             |  2 +-
 app/account/account.php |  4 ++--
 app/app.php             |  6 +++---
 app/image/group.php     |  7 +++----
 group.php               | 41 +++++++++++++++++++++++++++++++----------
 index.php               |  8 ++++++++
 6 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/account.php b/account.php
index c0a5557..923f19b 100644
--- a/account.php
+++ b/account.php
@@ -344,7 +344,7 @@
 									var header = "With great power comes great responsibility...";
 									var description = "Do you trust this user? With admin permitions they can cause a whole lot of damage to this place, so make sure you're very very sure";
 									var actionBox = "<form id='toggleAdminConfirm' method='POST'>\
-									<button id='toggleAdminSubmit' class='btn btn-bad' type='submit' value='"+id+"'>Make "+username+" powerfull!</button>\
+									<button id='toggleAdminSubmit' class='btn btn-bad' type='submit' value='"+id+"'>Toggle "+username+"'s admin status</button>\
 									</form>";
 
 									flyoutShow(header, description, actionBox);
diff --git a/app/account/account.php b/app/account/account.php
index 50380d8..819632a 100644
--- a/app/account/account.php
+++ b/app/account/account.php
@@ -125,10 +125,10 @@ if (isset($_POST['submit_login'])) {
                             // let the user know
                             ?>
                                 <script>
-                                    sniffleAdd('O hi <?php echo $_SESSION["username"]; ?>', 'You are now logged in! You will be redirected in a few seconds', 'var(--green)', 'assets/icons/hand-waving.svg');
-                                    setTimeout(function(){window.location.href = "index.php";}, 2000);
+                                    window.location.href = "index.php";
                                 </script>
                             <?php
+                            $_SESSION['welc'] = true;
 
                             mysqli_query($conn,"INSERT INTO logs (ipaddress, action) VALUES('$user_ip','New loggin to ".$_SESSION['username']."')");
 
diff --git a/app/app.php b/app/app.php
index 9456284..5eb7d2c 100644
--- a/app/app.php
+++ b/app/app.php
@@ -37,7 +37,7 @@ class Make {
 
         $string = preg_replace('/ +/', ' ', $string);
 
-        $string = explode(" ", $string);
+        $string = explode(' ', $string);
         $string_list = array();
 
         foreach ($string as $i) {
@@ -46,9 +46,9 @@ class Make {
             }
         }
 
-        $string = implode(" ", $string_list);
+        $string = implode(' ', $string_list);
 
-        return $string;
+        return trim($string);
     }
 }
 
diff --git a/app/image/group.php b/app/image/group.php
index 265b5fa..1450186 100644
--- a/app/image/group.php
+++ b/app/image/group.php
@@ -39,12 +39,10 @@ if (isset($_POST['group_submit'])) {
             if (mysqli_stmt_execute($stmt)) {
                 ?>
                     <script>
-                        sniffleAdd('Success!!!', 'Updates the image group! Redirecting.... soon', 'var(--green)', 'assets/icons/check.svg');
-                        setTimeout(function() {
-                            window.location.href = "group.php?id=<?php echo $_POST['group_id']; ?>";
-                        }, 2000);
+                        window.location.href = "group.php?id=<?php echo $_POST['group_id']; ?>";
                     </script>
                 <?php
+                $_SESSION['msg'] = "Updated the image group!";
             } else {
                 ?>
                     <script>
@@ -132,6 +130,7 @@ if (isset($_POST['new_group_submit'])) {
                 window.location.href = "group.php?id=<?php echo $group_id; ?>";
             </script>
         <?php
+        $_SESSION['msg'] = "New Group successfully made!";
     } else {
         ?>
             <script>
diff --git a/group.php b/group.php
index e0b04a5..37aba37 100644
--- a/group.php
+++ b/group.php
@@ -14,7 +14,10 @@
     if (isset($_GET['id'])) {
         $group = $group_info->get_group_info($conn, $_GET['id']);
 
-        if (!isset($group) || empty($group)) header("Location: group.php");
+        if (!isset($group) || empty($group)) {
+            header("Location: group.php");
+            $_SESSION['err'] = "You followed a broken link";
+        }
     }
 ?>
 
@@ -28,6 +31,15 @@
 
     <?php
         if (isset($_GET['id'])) {
+            if (isset($_SESSION['msg'])) {
+                ?>
+                    <script>
+                        sniffleAdd("Info", "<?php echo $_SESSION['msg']; ?>", "var(--green)", "assets/icons/check.svg");
+                    </script>
+                <?php
+                unset($_SESSION['msg']);
+            }
+
             $image_list = array_reverse(explode(" ", $group['image_list']));
 
             echo "<div class='group-banner defaultDecoration defaultSpacing defaultFonts'>
@@ -51,7 +63,7 @@
             if (!empty($group['image_list'])) echo "<p>Images: ".count(explode(" ", $group['image_list']))."</p>";
 
             $upload_time = new DateTime($group['created_on']);
-            echo "<p id='updateTime'>Created at: ".$upload_time->format('d/m/Y H:i:s T')."</p;>";
+            echo "<p id='updateTime'>Created at: ".$upload_time->format('d/m/Y H:i:s T')."</p>";
             ?>
                 <script>
                     var updateDate = new Date('<?php echo $upload_time->format('m/d/Y H:i:s T'); ?>');
@@ -138,15 +150,26 @@
 
             $image_list = explode(" ", $group['image_list']);
             $cover_image = $image_info->get_image_info($conn, $image_list[array_rand($image_list, 1)]);
-            // Getting thumbnail
+
             if (!empty($cover_image['imagename'])) {
-                echo "<div class='group-cover'>
-                <span></span>
-                <img src='images/".$cover_image['imagename']."'/>
-                </div>";
+                ?>
+                    <div class='group-cover'>
+                    <span></span>
+                    <img <?php if(str_contains($cover_image['tags'], "nsfw")) echo "class='nsfw-blur'"; ?> src='images/<?php echo $cover_image['imagename']; ?>'/>
+                    </div>
+                <?php
             }
 
             echo "</div>";
+        } else {
+            if (isset($_SESSION['err'])) {
+                ?>
+                    <script>
+                        sniffleAdd("Error", "<?php echo $_SESSION['msg']; ?>", "var(--red)", "assets/icons/trash.svg");
+                    </script>
+                <?php
+                unset($_SESSION['err']);
+            }
         }
     ?>
 
@@ -264,9 +287,7 @@
 
                     ?>
                         <script>
-                            $('#createGroup').click(function() {
-                                sniffleAdd('*Thinking*', 'Creating your group now!', 'var(--green)', 'assets/icons/package.svg');
-                                
+                            $('#createGroup').click(function() {                                
                                 $("#sniffle").load("app/image/group.php", {
                                     new_group_submit: "uwu"
                                 });
diff --git a/index.php b/index.php
index a068e79..5ffc534 100644
--- a/index.php
+++ b/index.php
@@ -19,6 +19,14 @@
 			<?php
 			unset($_SESSION['del']);
 		}
+		if (isset($_SESSION['welc'])) {
+			?>
+				<script>
+					sniffleAdd('O hi <?php echo $_SESSION["username"]; ?>', 'You are now logged in, enjoy your stay!', 'var(--green)', 'assets/icons/hand-waving.svg');
+				</script>
+			<?php
+			unset($_SESSION['welc']);
+		}
 	?>
 
 <div class="info-text defaultFonts">