typicalname0 / 4grounds

func/func.php

Indentation +110 added lines, -110 removed lines

@@ -11,144 +11,144 @@
 }
 
 function validateCSS($validate) {
-	$DISALLOWED = array("<?php", "?>", "behavior: url", ".php", "@import", "@\import", "@/import"); 
+    $DISALLOWED = array("<?php", "?>", "behavior: url", ".php", "@import", "@\import", "@/import"); 
 
-	$validated = str_replace($DISALLOWED, "", $validate);
+    $validated = str_replace($DISALLOWED, "", $validate);
     return $validated;
 }
 function validateMarkdown($comment) {
-	$markdown = new Michelf\Markdown;
-	$markdown->no_markup = true;
-	$transformed = $markdown->transform($comment);
-	return preg_replace(
-		"/<a href=(?:'|\")javascript:(.*?)(?:'|\")>(.*?)<\/a>/i",
-		"Attempted XSS: $2 ($1)",
-		$transformed
-	);
+    $markdown = new Michelf\Markdown;
+    $markdown->no_markup = true;
+    $transformed = $markdown->transform($comment);
+    return preg_replace(
+        "/<a href=(?:'|\")javascript:(.*?)(?:'|\")>(.*?)<\/a>/i",
+        "Attempted XSS: $2 ($1)",
+        $transformed
+    );
 }
 
 function validateCaptcha($privatekey, $response) {
-	$responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$privatekey.'&response='.$response));
-	return $responseData->success;
+    $responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$privatekey.'&response='.$response));
+    return $responseData->success;
 }
 
 function requireLogin() {
-	if (!isset($_SESSION['user'])) {
-		header("Location: /login.php?r_login"); die();
-	}
+    if (!isset($_SESSION['user'])) {
+        header("Location: /login.php?r_login"); die();
+    }
 }
 
 function getGroup($id, $conn) {
-	$stmt = $conn->prepare("SELECT * FROM `groups` WHERE `id` = ?");
-	$stmt->bind_param("i", $id);
-	$stmt->execute();
-	$result = $stmt->get_result();
-	if ($result->num_rows === 0) return 'error';
-	return $result->fetch_assoc();
+    $stmt = $conn->prepare("SELECT * FROM `groups` WHERE `id` = ?");
+    $stmt->bind_param("i", $id);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    if ($result->num_rows === 0) return 'error';
+    return $result->fetch_assoc();
 }
 
 function getID($user, $connection) {
-	$stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
-	$stmt->bind_param("s", $user);
-	$stmt->execute();
-	$result = $stmt->get_result();
-	if($result->num_rows === 0) return 'error';
-	while($row = $result->fetch_assoc()) {
-		$id = $row['id'];
-	} 
-	$stmt->close();
-	return $id;
+    $stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
+    $stmt->bind_param("s", $user);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    if($result->num_rows === 0) return 'error';
+    while($row = $result->fetch_assoc()) {
+        $id = $row['id'];
+    } 
+    $stmt->close();
+    return $id;
 }
 
 function getName($id, $connection) {
-	$stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
-	$stmt->bind_param("s", $id);
-	$stmt->execute();
-	$result = $stmt->get_result();
-	if($result->num_rows === 0) return('error');
-	while($row = $result->fetch_assoc()) {
-		$name = htmlspecialchars($row['username']);
-	} 
-	$stmt->close();
-	return $name;
+    $stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
+    $stmt->bind_param("s", $id);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    if($result->num_rows === 0) return('error');
+    while($row = $result->fetch_assoc()) {
+        $name = htmlspecialchars($row['username']);
+    } 
+    $stmt->close();
+    return $name;
 }
 
 function getPFP($user, $connection) {
-	$stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
-	$stmt->bind_param("s", $user);
-	$stmt->execute();
-	$result = $stmt->get_result();
-	if($result->num_rows === 0) return('error');
-	while($row = $result->fetch_assoc()) {
-		$pfp = htmlspecialchars($row['pfp']);
-	} 
-	$stmt->close();
-	return $pfp;
+    $stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
+    $stmt->bind_param("s", $user);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    if($result->num_rows === 0) return('error');
+    while($row = $result->fetch_assoc()) {
+        $pfp = htmlspecialchars($row['pfp']);
+    } 
+    $stmt->close();
+    return $pfp;
 }
 
 function checkIfFriended($friend1, $friend2, $connection)
 {
-	$stmt = $connection->prepare("SELECT * FROM `friends` WHERE reciever = ? AND sender = ? OR reciever = ? AND sender = ?");
-	$stmt->bind_param("ssss", $friend1, $friend2, $friend2, $friend1);
-	$stmt->execute();
-	$result = $stmt->get_result();
-	if($result->num_rows === 1){ return true; }
-	return false;
+    $stmt = $connection->prepare("SELECT * FROM `friends` WHERE reciever = ? AND sender = ? OR reciever = ? AND sender = ?");
+    $stmt->bind_param("ssss", $friend1, $friend2, $friend2, $friend1);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    if($result->num_rows === 1){ return true; }
+    return false;
 }
 
 function getUser($id, $connection) {
-	$userResult = array();
-	$stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
-	$stmt->bind_param("i", $id);
-	$stmt->execute();
-	$result = $stmt->get_result();
-	if($result->num_rows === 0) echo('That user does not exist.');
-	while($row = $result->fetch_assoc()) {
-		$userResult['username'] = $row['username'];
-		$userResult['id'] = $row['id'];
-		$userResult['date'] = $row['date'];
-		$userResult['bio'] = $row['bio'];
-		$userResult['css'] = $row['css'];
-		$userResult['pfp'] = $row['pfp'];
-		$userResult['badges'] = explode(';', $row['badges']);
-		$userResult['music'] = $row['music'];
-		$userResult['rank'] = $row['rank'];
-		$userResult['currentgroup'] = $row['currentgroup'];
-	}
-	$stmt->close();
-
-	$stmt = $connection->prepare("SELECT * FROM gamecomments WHERE author = ?");
-	$stmt->bind_param("s", $userResult['username']);
-	$stmt->execute();
-	$result = $stmt->get_result();
-
-	$userResult['comments'] = 0;
-	while($row = $result->fetch_assoc()) {
-		$userResult['comments']++;
-	}
-	$stmt->close();
-
-	$stmt = $connection->prepare("SELECT * FROM comments WHERE author = ?");
-	$stmt->bind_param("s", $userResult['username']);
-	$stmt->execute();
-	$result = $stmt->get_result();
-
-	$userResult['profilecomments'] = 0;
-	while($row = $result->fetch_assoc()) {
-		$userResult['profilecomments']++;
-	}
-	$stmt->close();
-
-	$stmt = $connection->prepare("SELECT * FROM files WHERE author = ? AND status='y'");
-	$stmt->bind_param("s", $userResult['username']);
-	$stmt->execute();
-	$result = $stmt->get_result();
-
-	$userResult['filesuploaded'] = 0;
-	while($row = $result->fetch_assoc()) {
-		$userResult['filesuploaded']++;
-	}
-	$stmt->close();
-	return $userResult;
+    $userResult = array();
+    $stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
+    $stmt->bind_param("i", $id);
+    $stmt->execute();
+    $result = $stmt->get_result();
+    if($result->num_rows === 0) echo('That user does not exist.');
+    while($row = $result->fetch_assoc()) {
+        $userResult['username'] = $row['username'];
+        $userResult['id'] = $row['id'];
+        $userResult['date'] = $row['date'];
+        $userResult['bio'] = $row['bio'];
+        $userResult['css'] = $row['css'];
+        $userResult['pfp'] = $row['pfp'];
+        $userResult['badges'] = explode(';', $row['badges']);
+        $userResult['music'] = $row['music'];
+        $userResult['rank'] = $row['rank'];
+        $userResult['currentgroup'] = $row['currentgroup'];
+    }
+    $stmt->close();
+
+    $stmt = $connection->prepare("SELECT * FROM gamecomments WHERE author = ?");
+    $stmt->bind_param("s", $userResult['username']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+
+    $userResult['comments'] = 0;
+    while($row = $result->fetch_assoc()) {
+        $userResult['comments']++;
+    }
+    $stmt->close();
+
+    $stmt = $connection->prepare("SELECT * FROM comments WHERE author = ?");
+    $stmt->bind_param("s", $userResult['username']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+
+    $userResult['profilecomments'] = 0;
+    while($row = $result->fetch_assoc()) {
+        $userResult['profilecomments']++;
+    }
+    $stmt->close();
+
+    $stmt = $connection->prepare("SELECT * FROM files WHERE author = ? AND status='y'");
+    $stmt->bind_param("s", $userResult['username']);
+    $stmt->execute();
+    $result = $stmt->get_result();
+
+    $userResult['filesuploaded'] = 0;
+    while($row = $result->fetch_assoc()) {
+        $userResult['filesuploaded']++;
+    }
+    $stmt->close();
+    return $userResult;
 }
 ?>
\ No newline at end of file

Braces +15 added lines, -5 removed lines

@@ -43,7 +43,9 @@ 
 	$stmt->bind_param("i", $id);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if ($result->num_rows === 0) return 'error';
+	if ($result->num_rows === 0) {
+	    return 'error';
+	}
 	return $result->fetch_assoc();
 }
 
@@ -52,7 +54,9 @@ 
 	$stmt->bind_param("s", $user);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 0) return 'error';
+	if($result->num_rows === 0) {
+	    return 'error';
+	}
 	while($row = $result->fetch_assoc()) {
 		$id = $row['id'];
 	} 
@@ -65,7 +69,9 @@ 
 	$stmt->bind_param("s", $id);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 0) return('error');
+	if($result->num_rows === 0) {
+	    return('error');
+	}
 	while($row = $result->fetch_assoc()) {
 		$name = htmlspecialchars($row['username']);
 	} 
@@ -78,7 +84,9 @@ 
 	$stmt->bind_param("s", $user);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 0) return('error');
+	if($result->num_rows === 0) {
+	    return('error');
+	}
 	while($row = $result->fetch_assoc()) {
 		$pfp = htmlspecialchars($row['pfp']);
 	} 
@@ -102,7 +110,9 @@ 
 	$stmt->bind_param("i", $id);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 0) echo('That user does not exist.');
+	if($result->num_rows === 0) {
+	    echo('That user does not exist.');
+	}
 	while($row = $result->fetch_assoc()) {
 		$userResult['username'] = $row['username'];
 		$userResult['id'] = $row['id'];

view/profile.php

Spacing +18 added lines, -18 removed lines

@@ -18,11 +18,11 @@ 
     <body> 
         <?php require(__DIR__ . "/../important/header.php"); 
         
-        if($_SERVER['REQUEST_METHOD'] == 'POST') 
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') 
         {
-            if(!isset($_SESSION['user'])){ $error = "you are not logged in"; goto skipcomment; }
-            if(!$_POST['comment']){ $error = "your comment cannot be blank"; goto skipcomment; }
-            if(strlen($_POST['comment']) > 500){ $error = "your comment must be shorter than 500 characters"; goto skipcomment; }
+            if (!isset($_SESSION['user'])) { $error = "you are not logged in"; goto skipcomment; }
+            if (!$_POST['comment']) { $error = "your comment cannot be blank"; goto skipcomment; }
+            if (strlen($_POST['comment']) > 500) { $error = "your comment must be shorter than 500 characters"; goto skipcomment; }
 
             $stmt = $conn->prepare("INSERT INTO `comments` (toid, author, text) VALUES (?, ?, ?)");
             $stmt->bind_param("sss", $_GET['id'], $_SESSION['user'], $text);
@@ -47,13 +47,13 @@ 
                     </center>
                     <hr style="border-top: 1px dashed gray;">
                     <div id="userinfo" style="padding-left: 20px;">
-                        <span style="color: gold;">Rank:</span> <?php echo $user['rank'];?><br>
-                        <span style="color: gold;">ID:</span> <?php echo $user['id'];?><br>
-                        <span style="color: gold;">Other Comments:</span> <?php echo $user['comments'];?><br>
-                        <span style="color: gold;">Profile Comments:</span> <?php echo $user['profilecomments'];?><br>
-                        <?php $userGroup = getGroup($user['currentgroup'], $conn);?>
-                        <span style="color: gold;">Current Group:</span> <a href="/view/group?id=<?php echo $userGroup['id'];?>"><?php echo $userGroup['title'];?></a><br>
-                        <span style="color: gold;">Files Uploaded:</span> <?php echo $user['filesuploaded'];?>
+                        <span style="color: gold;">Rank:</span> <?php echo $user['rank']; ?><br>
+                        <span style="color: gold;">ID:</span> <?php echo $user['id']; ?><br>
+                        <span style="color: gold;">Other Comments:</span> <?php echo $user['comments']; ?><br>
+                        <span style="color: gold;">Profile Comments:</span> <?php echo $user['profilecomments']; ?><br>
+                        <?php $userGroup = getGroup($user['currentgroup'], $conn); ?>
+                        <span style="color: gold;">Current Group:</span> <a href="/view/group?id=<?php echo $userGroup['id']; ?>"><?php echo $userGroup['title']; ?></a><br>
+                        <span style="color: gold;">Files Uploaded:</span> <?php echo $user['filesuploaded']; ?>
                     </div><br>
                         <?php if (!isset($_GET["ed"])) { ?>
                             <audio autoplay controls>
@@ -63,7 +63,7 @@ 
                     </div>
                     <br>
                     <div class="notegray">
-                    <?php if(isset($error)) { echo "<small style='color:red'>".$error."</small>"; } ?>
+                    <?php if (isset($error)) { echo "<small style='color:red'>" . $error . "</small>"; } ?>
                     <h2>Comment</h2>
                     <form method="post" enctype="multipart/form-data">
                         <textarea required cols="33" placeholder="Comment" name="comment"></textarea><br>
@@ -82,8 +82,8 @@ 
                     <div id="badges" class="notegray">
                         <h1>Badges</h1>
                         <?php
-                            foreach($user['badges'] as $badge) {
-                                if($badge == "good") {
+                            foreach ($user['badges'] as $badge) {
+                                if ($badge == "good") {
                                     echo "<img width='70px;' height='70px;' src='https://cdn.discordapp.com/attachments/740680780740821105/740776214523936808/340juojg3h.png'>";
                                 }
                             }
@@ -95,10 +95,10 @@ 
                         $stmt->bind_param("s", $username);
                         $stmt->execute();
                         $result = $stmt->get_result();
-                        if($result->num_rows > 0) echo('<h1>Files</h1>');
+                        if ($result->num_rows > 0) echo('<h1>Files</h1>');
                         
-                        while($row = $result->fetch_assoc()) { 
-                            echo '<a href="/view?id=' . $row['id'] . '">' . $row['title'] . ' [' , $row['type'] . ']</a><br>';
+                        while ($row = $result->fetch_assoc()) { 
+                            echo '<a href="/view?id=' . $row['id'] . '">' . $row['title'] . ' [', $row['type'] . ']</a><br>';
                         }?> 
                     </div><br>
                     <div id="bio" class="notegray">
@@ -112,7 +112,7 @@ 
                             $stmt->execute();
                             $result = $stmt->get_result();
                             
-                            while($row = $result->fetch_assoc()) { ?>
+                            while ($row = $result->fetch_assoc()) { ?>
                                 <div class='commentRight' style='display: grid; grid-template-columns: 75% auto; padding:5px;'>
                                     <div style="word-wrap: break-word;">
                                         <small><?php echo $row['date']; ?></small>

Braces +3 added lines, -1 removed lines

@@ -95,7 +95,9 @@
                         $stmt->bind_param("s", $username);
                         $stmt->execute();
                         $result = $stmt->get_result();
-                        if($result->num_rows > 0) echo('<h1>Files</h1>');
+                        if($result->num_rows > 0) {
+                            echo('<h1>Files</h1>');
+                        }
                         
                         while($row = $result->fetch_assoc()) { 
                             echo '<a href="/view?id=' . $row['id'] . '">' . $row['title'] . ' [' , $row['type'] . ']</a><br>';