Inspection of "organize hierarchy and add configuration system" - typicalname0/4grounds - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Pull Request — master (#20)

unknown

created 2020-08-16 04:33 UTC

Status

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -12,8 +12,8 @@  discard block
 block discarded – undo
     <body> 
         <?php require(__DIR__ . "/important/header.php"); 
         
-        if(@$_POST['submit']) {
-            if(isset($_SESSION['user'])) {
+        if (@$_POST['submit']) {
+            if (isset($_SESSION['user'])) {
                 $stmt = $conn->prepare("INSERT INTO files (type, title, extrainfo, author, filename) VALUES ('review', ?, ?, ?, '')");
                 $stmt->bind_param("sss", $title, $description, $_SESSION['user']);
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
                 $stmt->execute();
                 $result = $stmt->get_result();
 
-                while($row = $result->fetch_assoc()) { 
+                while ($row = $result->fetch_assoc()) { 
                     echo "<br><img style='position: absolute;border: 1px solid white; width: 5em;' src='/pfp/" . getPFP($row['author'], $conn) . "'>
                     <small>
                     <a href='/view?id=" . $row['id'] . "'><span style='float:right;color: gold;'><i>[" . $row['agerating'] . "] " . $row['title'] . "</a></i></span><br>

Please login to merge, or discard this patch.

adminpanel/ban.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@
 block discarded – undo
 <?php
 require("dependencies.php");
 
-if(isset($_SESSION['user'])) {
-    if(isset($_GET['id'])) {
-        if(isAdmin($_SESSION['user'], $conn) == "admin") {
+if (isset($_SESSION['user'])) {
+    if (isset($_GET['id'])) {
+        if (isAdmin($_SESSION['user'], $conn) == "admin") {
             $stmt = $conn->prepare("DELETE FROM users WHERE id = ?");
             $stmt->bind_param("i", $_GET['id']);
             $stmt->execute();

Please login to merge, or discard this patch.

adminpanel/deny.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@
 block discarded – undo
 <?php
 require("dependencies.php");
 
-if(isset($_SESSION['user'])) {
-    if(isset($_GET['id'])) {
-        if(isAdmin($_SESSION['user'], $conn) == "admin") {
+if (isset($_SESSION['user'])) {
+    if (isset($_GET['id'])) {
+        if (isAdmin($_SESSION['user'], $conn) == "admin") {
             $stmt = $conn->prepare("UPDATE files SET status = 'd' WHERE id = ?");
             $stmt->bind_param("i", $_GET['id']);
             $stmt->execute();

Please login to merge, or discard this patch.

adminpanel/index.php 2 patches

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -1,8 +1,8 @@  discard block
 block discarded – undo
 <?php
 require("dependencies.php");
 
-if(isset($_SESSION['user'])) {
-    if(isAdmin($_SESSION['user'], $conn) == "admin") {
+if (isset($_SESSION['user'])) {
+    if (isAdmin($_SESSION['user'], $conn) == "admin") {
         echo "<h1>Welcome</h1>";
     } else {
         die("not a admin");
@@ -33,8 +33,8 @@  discard block
 block discarded – undo
     $stmt = $conn->prepare("SELECT * FROM files WHERE status = 'n'");
     $stmt->execute();
     $result = $stmt->get_result();
-    if($result->num_rows === 0) echo('There are no items waiting for approval.');
-    while($row = $result->fetch_assoc()) {
+    if ($result->num_rows === 0) echo('There are no items waiting for approval.');
+    while ($row = $result->fetch_assoc()) {
         echo "" . $row['title'] . " by " . $row['author'] . " @ " . $row['date'] . " | <a href='approve.php?id=" . $row['id'] . "'>Approve</a> | <a href='deny.php?id=" . $row['id'] . "'>Deny</a><br>";
     }
 ?>
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
     $stmt = $conn->prepare("SELECT * FROM users ORDER BY id DESC");
     $stmt->execute();
     $result = $stmt->get_result();
-    if($result->num_rows === 0) echo('There are no items waiting for approval.');
-    while($row = $result->fetch_assoc()) {
+    if ($result->num_rows === 0) echo('There are no items waiting for approval.');
+    while ($row = $result->fetch_assoc()) {
         echo "<a href='/index.php?id=" . $row['id'] . "'>" . $row['username'] . "</a> | <a href='ban.php?id=" . $row['id'] . "'>Ban</a><br>";
     }
 ?>
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -33,7 +33,9 @@  discard block
 block discarded – undo
     $stmt = $conn->prepare("SELECT * FROM files WHERE status = 'n'");
     $stmt->execute();
     $result = $stmt->get_result();
-    if($result->num_rows === 0) echo('There are no items waiting for approval.');
+    if($result->num_rows === 0) {
+        echo('There are no items waiting for approval.');
+    }
     while($row = $result->fetch_assoc()) {
         echo "" . $row['title'] . " by " . $row['author'] . " @ " . $row['date'] . " | <a href='approve.php?id=" . $row['id'] . "'>Approve</a> | <a href='deny.php?id=" . $row['id'] . "'>Deny</a><br>";
     }
@@ -45,7 +47,9 @@  discard block
 block discarded – undo
     $stmt = $conn->prepare("SELECT * FROM users ORDER BY id DESC");
     $stmt->execute();
     $result = $stmt->get_result();
-    if($result->num_rows === 0) echo('There are no items waiting for approval.');
+    if($result->num_rows === 0) {
+        echo('There are no items waiting for approval.');
+    }
     while($row = $result->fetch_assoc()) {
         echo "<a href='/index.php?id=" . $row['id'] . "'>" . $row['username'] . "</a> | <a href='ban.php?id=" . $row['id'] . "'>Ban</a><br>";
     }

Please login to merge, or discard this patch.

adminpanel/dependencies.php 2 patches

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -7,9 +7,9 @@
 block discarded – undo
     $stmt->bind_param("s", $user);
     $stmt->execute();
     $result = $stmt->get_result();
-    if($result->num_rows === 0) return "user doesn't exist";
-    while($row = $result->fetch_assoc()) {
-        if($row['rank'] == "Admin" || $row['rank'] == "Owner") {
+    if ($result->num_rows === 0) return "user doesn't exist";
+    while ($row = $result->fetch_assoc()) {
+        if ($row['rank'] == "Admin" || $row['rank'] == "Owner") {
             return "admin";
         } else {
             return "not admin";

Please login to merge, or discard this patch.

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,7 +7,9 @@
 block discarded – undo
     $stmt->bind_param("s", $user);
     $stmt->execute();
     $result = $stmt->get_result();
-    if($result->num_rows === 0) return "user doesn't exist";
+    if($result->num_rows === 0) {
+        return "user doesn't exist";
+    }
     while($row = $result->fetch_assoc()) {
         if($row['rank'] == "Admin" || $row['rank'] == "Owner") {
             return "admin";

Please login to merge, or discard this patch.

adminpanel/approve.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,9 +1,9 @@
 block discarded – undo
 <?php
 require("dependencies.php");
 
-if(isset($_SESSION['user'])) {
-    if(isset($_GET['id'])) {
-        if(isAdmin($_SESSION['user'], $conn) == "admin") {
+if (isset($_SESSION['user'])) {
+    if (isset($_GET['id'])) {
+        if (isAdmin($_SESSION['user'], $conn) == "admin") {
             $stmt = $conn->prepare("UPDATE files SET status = 'y' WHERE id = ?");
             $stmt->bind_param("i", $_GET['id']);
             $stmt->execute();

Please login to merge, or discard this patch.

newreview.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -12,8 +12,8 @@
 block discarded – undo
     <body> 
         <?php require(__DIR__ . "/important/header.php"); 
         
-        if(@$_POST['submit']) {
-            if(isset($_SESSION['user'])) {
+        if (@$_POST['submit']) {
+            if (isset($_SESSION['user'])) {
                 $stmt = $conn->prepare("INSERT INTO files (type, title, extrainfo, author, filename) VALUES ('review', ?, ?, ?, '')");
                 $stmt->bind_param("sss", $title, $description, $_SESSION['user']);
 

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -16,8 +16,8 @@  discard block
 block discarded – undo
                 if ($_SERVER['REQUEST_METHOD'] == 'GET' && isset($_GET["r_login"])) {
                     $error = "The page you tried to access requires you to be logged in.";
                 }
-                if($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) {
-                    if(isset($_POST['remember'])) {
+                if ($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) {
+                    if (isset($_POST['remember'])) {
                         $rememberMe = true;
                     } else {
                         $rememberMe = false;
@@ -26,12 +26,12 @@  discard block
 block discarded – undo
                     $stmt->bind_param("s", $_POST['username']);
                     $stmt->execute();
                     $result = $stmt->get_result();
-                    if(!mysqli_num_rows($result)){ { $error = "incorrect username or password"; goto skip; } }
+                    if (!mysqli_num_rows($result)) { { $error = "incorrect username or password"; goto skip; } }
                     
                     $row = $result->fetch_assoc();
                     $hash = $row['password'];
                     
-                    if(!password_verify($_POST['password'], $hash)) {
+                    if (!password_verify($_POST['password'], $hash)) {
                         $error = "incorrect username or password"; goto skip;
                     }
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
                     if (isset($result['otpsecret'])) {
                         $otp = true;
                         if (isset($_POST['totp'])) {
-                            if ($_POST['totp'] === $result['otpbackupcode']) {goto skip2fa;}
+                            if ($_POST['totp'] === $result['otpbackupcode']) {goto skip2fa; }
                             require("vendor/autoload.php");
                             $totp = OTPHP\TOTP::create($result['otpsecret']);
                             if (!$totp->verify($_POST['totp'])) {
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
                     }
                     skip2fa:
 
-                    if($rememberMe) {
+                    if ($rememberMe) {
                         session_write_close();
                         session_set_cookie_params("2678400");
                         ini_set('session.gc_maxlifetime', 2678400);
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
                 } 
                 skip:
 
-                if(isset($error)) { echo "<small style='color:red'>".$error."</small>"; } 
+                if (isset($error)) { echo "<small style='color:red'>" . $error . "</small>"; } 
             ?>
             <form method="post">
                 <input required placeholder="Username" type="text" name="username"><br>

Please login to merge, or discard this patch.

func/func.php 3 patches

Indentation +102 added lines, -102 removed lines patch added patch discarded remove patch

@@ -11,133 +11,133 @@
 block discarded – undo
 }
 
 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 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'];
-	}
-	$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'];
+    }
+    $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

Please login to merge, or discard this patch.

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
 
 define("DEBUG_MODE", true);
 session_start();
-if(defined("DEBUG_MODE") && DEBUG_MODE) {
+if (defined("DEBUG_MODE") && DEBUG_MODE) {
     ini_set('display_errors', 1);
     ini_set('display_startup_errors', 1);
     error_reporting(E_ALL);
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 }
 
 function validateCaptcha($privatekey, $response) {
-	$responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$privatekey.'&response='.$response));
+	$responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $privatekey . '&response=' . $response));
 	return $responseData->success;
 }
 
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
 	$stmt->bind_param("s", $user);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 0) return 'error';
-	while($row = $result->fetch_assoc()) {
+	if ($result->num_rows === 0) return 'error';
+	while ($row = $result->fetch_assoc()) {
 		$id = $row['id'];
 	} 
 	$stmt->close();
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
 	$stmt->bind_param("s", $id);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 0) return('error');
-	while($row = $result->fetch_assoc()) {
+	if ($result->num_rows === 0) return('error');
+	while ($row = $result->fetch_assoc()) {
 		$name = htmlspecialchars($row['username']);
 	} 
 	$stmt->close();
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
 	$stmt->bind_param("s", $user);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 0) return('error');
-	while($row = $result->fetch_assoc()) {
+	if ($result->num_rows === 0) return('error');
+	while ($row = $result->fetch_assoc()) {
 		$pfp = htmlspecialchars($row['pfp']);
 	} 
 	$stmt->close();
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
 	$stmt->bind_param("ssss", $friend1, $friend2, $friend2, $friend1);
 	$stmt->execute();
 	$result = $stmt->get_result();
-	if($result->num_rows === 1){ return true; }
+	if ($result->num_rows === 1) { return true; }
 	return false;
 }
 
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
 	$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()) {
+	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'];
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 	$result = $stmt->get_result();
 
 	$userResult['comments'] = 0;
-	while($row = $result->fetch_assoc()) {
+	while ($row = $result->fetch_assoc()) {
 		$userResult['comments']++;
 	}
 	$stmt->close();
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
 	$result = $stmt->get_result();
 
 	$userResult['profilecomments'] = 0;
-	while($row = $result->fetch_assoc()) {
+	while ($row = $result->fetch_assoc()) {
 		$userResult['profilecomments']++;
 	}
 	$stmt->close();
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
 	$result = $stmt->get_result();
 
 	$userResult['filesuploaded'] = 0;
-	while($row = $result->fetch_assoc()) {
+	while ($row = $result->fetch_assoc()) {
 		$userResult['filesuploaded']++;
 	}
 	$stmt->close();

Please login to merge, or discard this patch.

Braces +12 added lines, -4 removed lines patch added patch discarded remove patch

@@ -43,7 +43,9 @@  discard block
 block discarded – undo
 	$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'];
 	} 
@@ -56,7 +58,9 @@  discard block
 block discarded – undo
 	$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']);
 	} 
@@ -69,7 +73,9 @@  discard block
 block discarded – undo
 	$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']);
 	} 
@@ -93,7 +99,9 @@  discard block
 block discarded – undo
 	$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'];

Please login to merge, or discard this patch.

		@@ -12,8 +12,8 @@ discard block
		block discarded – undo
12	12	<body>
13	13	<?php require(__DIR__ . "/important/header.php");
14	14
15		- if(@$_POST['submit']) {
16		- if(isset($_SESSION['user'])) {
	15	+ if (@$_POST['submit']) {
	16	+ if (isset($_SESSION['user'])) {
17	17	$stmt = $conn->prepare("INSERT INTO files (type, title, extrainfo, author, filename) VALUES ('review', ?, ?, ?, '')");
18	18	$stmt->bind_param("sss", $title, $description, $_SESSION['user']);
19	19
		@@ -34,7 +34,7 @@ discard block
		block discarded – undo
34	34	$stmt->execute();
35	35	$result = $stmt->get_result();
36	36
37		- while($row = $result->fetch_assoc()) {
	37	+ while ($row = $result->fetch_assoc()) {
38	38	echo "<br><img style='position: absolute;border: 1px solid white; width: 5em;' src='/pfp/" . getPFP($row['author'], $conn) . "'>
39	39	<small>
40	40	<a href='/view?id=" . $row['id'] . "'><span style='float:right;color: gold;'><i>[" . $row['agerating'] . "] " . $row['title'] . "</a></i></span><br>

		@@ -1,9 +1,9 @@
		block discarded – undo
1	1	<?php
2	2	require("dependencies.php");
3	3
4		-if(isset($_SESSION['user'])) {
5		- if(isset($_GET['id'])) {
6		- if(isAdmin($_SESSION['user'], $conn) == "admin") {
	4	+if (isset($_SESSION['user'])) {
	5	+ if (isset($_GET['id'])) {
	6	+ if (isAdmin($_SESSION['user'], $conn) == "admin") {
7	7	$stmt = $conn->prepare("DELETE FROM users WHERE id = ?");
8	8	$stmt->bind_param("i", $_GET['id']);
9	9	$stmt->execute();

		@@ -1,8 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2	require("dependencies.php");
3	3
4		-if(isset($_SESSION['user'])) {
5		- if(isAdmin($_SESSION['user'], $conn) == "admin") {
	4	+if (isset($_SESSION['user'])) {
	5	+ if (isAdmin($_SESSION['user'], $conn) == "admin") {
6	6	echo "<h1>Welcome</h1>";
7	7	} else {
8	8	die("not a admin");
		@@ -33,8 +33,8 @@ discard block
		block discarded – undo
33	33	$stmt = $conn->prepare("SELECT * FROM files WHERE status = 'n'");
34	34	$stmt->execute();
35	35	$result = $stmt->get_result();
36		- if($result->num_rows === 0) echo('There are no items waiting for approval.');
37		- while($row = $result->fetch_assoc()) {
	36	+ if ($result->num_rows === 0) echo('There are no items waiting for approval.');
	37	+ while ($row = $result->fetch_assoc()) {
38	38	echo "" . $row['title'] . " by " . $row['author'] . " @ " . $row['date'] . " \| <a href='approve.php?id=" . $row['id'] . "'>Approve</a> \| <a href='deny.php?id=" . $row['id'] . "'>Deny</a><br>";
39	39	}
40	40	?>
		@@ -45,8 +45,8 @@ discard block
		block discarded – undo
45	45	$stmt = $conn->prepare("SELECT * FROM users ORDER BY id DESC");
46	46	$stmt->execute();
47	47	$result = $stmt->get_result();
48		- if($result->num_rows === 0) echo('There are no items waiting for approval.');
49		- while($row = $result->fetch_assoc()) {
	48	+ if ($result->num_rows === 0) echo('There are no items waiting for approval.');
	49	+ while ($row = $result->fetch_assoc()) {
50	50	echo "<a href='/index.php?id=" . $row['id'] . "'>" . $row['username'] . "</a> \| <a href='ban.php?id=" . $row['id'] . "'>Ban</a><br>";
51	51	}
52	52	?>
53	53	\ No newline at end of file

		@@ -33,7 +33,9 @@ discard block
		block discarded – undo
33	33	$stmt = $conn->prepare("SELECT * FROM files WHERE status = 'n'");
34	34	$stmt->execute();
35	35	$result = $stmt->get_result();
36		- if($result->num_rows === 0) echo('There are no items waiting for approval.');
	36	+ if($result->num_rows === 0) {
	37	+ echo('There are no items waiting for approval.');
	38	+ }
37	39	while($row = $result->fetch_assoc()) {
38	40	echo "" . $row['title'] . " by " . $row['author'] . " @ " . $row['date'] . " \| <a href='approve.php?id=" . $row['id'] . "'>Approve</a> \| <a href='deny.php?id=" . $row['id'] . "'>Deny</a><br>";
39	41	}
		@@ -45,7 +47,9 @@ discard block
		block discarded – undo
45	47	$stmt = $conn->prepare("SELECT * FROM users ORDER BY id DESC");
46	48	$stmt->execute();
47	49	$result = $stmt->get_result();
48		- if($result->num_rows === 0) echo('There are no items waiting for approval.');
	50	+ if($result->num_rows === 0) {
	51	+ echo('There are no items waiting for approval.');
	52	+ }
49	53	while($row = $result->fetch_assoc()) {
50	54	echo "<a href='/index.php?id=" . $row['id'] . "'>" . $row['username'] . "</a> \| <a href='ban.php?id=" . $row['id'] . "'>Ban</a><br>";
51	55	}

		@@ -7,9 +7,9 @@
		block discarded – undo
7	7	$stmt->bind_param("s", $user);
8	8	$stmt->execute();
9	9	$result = $stmt->get_result();
10		- if($result->num_rows === 0) return "user doesn't exist";
11		- while($row = $result->fetch_assoc()) {
12		- if($row['rank'] == "Admin" \|\| $row['rank'] == "Owner") {
	10	+ if ($result->num_rows === 0) return "user doesn't exist";
	11	+ while ($row = $result->fetch_assoc()) {
	12	+ if ($row['rank'] == "Admin" \|\| $row['rank'] == "Owner") {
13	13	return "admin";
14	14	} else {
15	15	return "not admin";

		@@ -7,7 +7,9 @@
		block discarded – undo
7	7	$stmt->bind_param("s", $user);
8	8	$stmt->execute();
9	9	$result = $stmt->get_result();
10		- if($result->num_rows === 0) return "user doesn't exist";
	10	+ if($result->num_rows === 0) {
	11	+ return "user doesn't exist";
	12	+ }
11	13	while($row = $result->fetch_assoc()) {
12	14	if($row['rank'] == "Admin" \|\| $row['rank'] == "Owner") {
13	15	return "admin";

		@@ -12,8 +12,8 @@
		block discarded – undo
12	12	<body>
13	13	<?php require(__DIR__ . "/important/header.php");
14	14
15		- if(@$_POST['submit']) {
16		- if(isset($_SESSION['user'])) {
	15	+ if (@$_POST['submit']) {
	16	+ if (isset($_SESSION['user'])) {
17	17	$stmt = $conn->prepare("INSERT INTO files (type, title, extrainfo, author, filename) VALUES ('review', ?, ?, ?, '')");
18	18	$stmt->bind_param("sss", $title, $description, $_SESSION['user']);
19	19

		@@ -16,8 +16,8 @@ discard block
		block discarded – undo
16	16	if ($_SERVER['REQUEST_METHOD'] == 'GET' && isset($_GET["r_login"])) {
17	17	$error = "The page you tried to access requires you to be logged in.";
18	18	}
19		- if($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) {
20		- if(isset($_POST['remember'])) {
	19	+ if ($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) {
	20	+ if (isset($_POST['remember'])) {
21	21	$rememberMe = true;
22	22	} else {
23	23	$rememberMe = false;
		@@ -26,12 +26,12 @@ discard block
		block discarded – undo
26	26	$stmt->bind_param("s", $_POST['username']);
27	27	$stmt->execute();
28	28	$result = $stmt->get_result();
29		- if(!mysqli_num_rows($result)){ { $error = "incorrect username or password"; goto skip; } }
	29	+ if (!mysqli_num_rows($result)) { { $error = "incorrect username or password"; goto skip; } }
30	30
31	31	$row = $result->fetch_assoc();
32	32	$hash = $row['password'];
33	33
34		- if(!password_verify($_POST['password'], $hash)) {
	34	+ if (!password_verify($_POST['password'], $hash)) {
35	35	$error = "incorrect username or password"; goto skip;
36	36	}
37	37
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	if (isset($result['otpsecret'])) {
43	43	$otp = true;
44	44	if (isset($_POST['totp'])) {
45		- if ($_POST['totp'] === $result['otpbackupcode']) {goto skip2fa;}
	45	+ if ($_POST['totp'] === $result['otpbackupcode']) {goto skip2fa; }
46	46	require("vendor/autoload.php");
47	47	$totp = OTPHP\TOTP::create($result['otpsecret']);
48	48	if (!$totp->verify($_POST['totp'])) {
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	}
57	57	skip2fa:
58	58
59		- if($rememberMe) {
	59	+ if ($rememberMe) {
60	60	session_write_close();
61	61	session_set_cookie_params("2678400");
62	62	ini_set('session.gc_maxlifetime', 2678400);
		@@ -70,7 +70,7 @@ discard block
		block discarded – undo
70	70	}
71	71	skip:
72	72
73		- if(isset($error)) { echo "<small style='color:red'>".$error."</small>"; }
	73	+ if (isset($error)) { echo "<small style='color:red'>" . $error . "</small>"; }
74	74	?>
75	75	<form method="post">
76	76	<input required placeholder="Username" type="text" name="username"><br>

		@@ -11,133 +11,133 @@
		block discarded – undo
11	11	}
12	12
13	13	function validateCSS($validate) {
14		- $DISALLOWED = array("<?php", "?>", "behavior: url", ".php", "@import", "@\import", "@/import");
	14	+ $DISALLOWED = array("<?php", "?>", "behavior: url", ".php", "@import", "@\import", "@/import");
15	15
16		- $validated = str_replace($DISALLOWED, "", $validate);
	16	+ $validated = str_replace($DISALLOWED, "", $validate);
17	17	return $validated;
18	18	}
19	19	function validateMarkdown($comment) {
20		- $markdown = new Michelf\Markdown;
21		- $markdown->no_markup = true;
22		- $transformed = $markdown->transform($comment);
23		- return preg_replace(
24		- "/<a href=(?:'\|\")javascript:(.?)(?:'\|\")>(.?)<\/a>/i",
25		- "Attempted XSS: $2 ($1)",
26		- $transformed
27		- );
	20	+ $markdown = new Michelf\Markdown;
	21	+ $markdown->no_markup = true;
	22	+ $transformed = $markdown->transform($comment);
	23	+ return preg_replace(
	24	+ "/<a href=(?:'\|\")javascript:(.?)(?:'\|\")>(.?)<\/a>/i",
	25	+ "Attempted XSS: $2 ($1)",
	26	+ $transformed
	27	+ );
28	28	}
29	29
30	30	function validateCaptcha($privatekey, $response) {
31		- $responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$privatekey.'&response='.$response));
32		- return $responseData->success;
	31	+ $responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$privatekey.'&response='.$response));
	32	+ return $responseData->success;
33	33	}
34	34
35	35	function requireLogin() {
36		- if (!isset($_SESSION['user'])) {
37		- header("Location: /login.php?r_login"); die();
38		- }
	36	+ if (!isset($_SESSION['user'])) {
	37	+ header("Location: /login.php?r_login"); die();
	38	+ }
39	39	}
40	40
41	41	function getID($user, $connection) {
42		- $stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
43		- $stmt->bind_param("s", $user);
44		- $stmt->execute();
45		- $result = $stmt->get_result();
46		- if($result->num_rows === 0) return 'error';
47		- while($row = $result->fetch_assoc()) {
48		- $id = $row['id'];
49		- }
50		- $stmt->close();
51		- return $id;
	42	+ $stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
	43	+ $stmt->bind_param("s", $user);
	44	+ $stmt->execute();
	45	+ $result = $stmt->get_result();
	46	+ if($result->num_rows === 0) return 'error';
	47	+ while($row = $result->fetch_assoc()) {
	48	+ $id = $row['id'];
	49	+ }
	50	+ $stmt->close();
	51	+ return $id;
52	52	}
53	53
54	54	function getName($id, $connection) {
55		- $stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
56		- $stmt->bind_param("s", $id);
57		- $stmt->execute();
58		- $result = $stmt->get_result();
59		- if($result->num_rows === 0) return('error');
60		- while($row = $result->fetch_assoc()) {
61		- $name = htmlspecialchars($row['username']);
62		- }
63		- $stmt->close();
64		- return $name;
	55	+ $stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
	56	+ $stmt->bind_param("s", $id);
	57	+ $stmt->execute();
	58	+ $result = $stmt->get_result();
	59	+ if($result->num_rows === 0) return('error');
	60	+ while($row = $result->fetch_assoc()) {
	61	+ $name = htmlspecialchars($row['username']);
	62	+ }
	63	+ $stmt->close();
	64	+ return $name;
65	65	}
66	66
67	67	function getPFP($user, $connection) {
68		- $stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
69		- $stmt->bind_param("s", $user);
70		- $stmt->execute();
71		- $result = $stmt->get_result();
72		- if($result->num_rows === 0) return('error');
73		- while($row = $result->fetch_assoc()) {
74		- $pfp = htmlspecialchars($row['pfp']);
75		- }
76		- $stmt->close();
77		- return $pfp;
	68	+ $stmt = $connection->prepare("SELECT * FROM users WHERE username = ?");
	69	+ $stmt->bind_param("s", $user);
	70	+ $stmt->execute();
	71	+ $result = $stmt->get_result();
	72	+ if($result->num_rows === 0) return('error');
	73	+ while($row = $result->fetch_assoc()) {
	74	+ $pfp = htmlspecialchars($row['pfp']);
	75	+ }
	76	+ $stmt->close();
	77	+ return $pfp;
78	78	}
79	79
80	80	function checkIfFriended($friend1, $friend2, $connection)
81	81	{
82		- $stmt = $connection->prepare("SELECT * FROM `friends` WHERE reciever = ? AND sender = ? OR reciever = ? AND sender = ?");
83		- $stmt->bind_param("ssss", $friend1, $friend2, $friend2, $friend1);
84		- $stmt->execute();
85		- $result = $stmt->get_result();
86		- if($result->num_rows === 1){ return true; }
87		- return false;
	82	+ $stmt = $connection->prepare("SELECT * FROM `friends` WHERE reciever = ? AND sender = ? OR reciever = ? AND sender = ?");
	83	+ $stmt->bind_param("ssss", $friend1, $friend2, $friend2, $friend1);
	84	+ $stmt->execute();
	85	+ $result = $stmt->get_result();
	86	+ if($result->num_rows === 1){ return true; }
	87	+ return false;
88	88	}
89	89
90	90	function getUser($id, $connection) {
91		- $userResult = array();
92		- $stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
93		- $stmt->bind_param("i", $id);
94		- $stmt->execute();
95		- $result = $stmt->get_result();
96		- if($result->num_rows === 0) echo('That user does not exist.');
97		- while($row = $result->fetch_assoc()) {
98		- $userResult['username'] = $row['username'];
99		- $userResult['id'] = $row['id'];
100		- $userResult['date'] = $row['date'];
101		- $userResult['bio'] = $row['bio'];
102		- $userResult['css'] = $row['css'];
103		- $userResult['pfp'] = $row['pfp'];
104		- $userResult['badges'] = explode(';', $row['badges']);
105		- $userResult['music'] = $row['music'];
106		- }
107		- $stmt->close();
108		-
109		- $stmt = $connection->prepare("SELECT * FROM gamecomments WHERE author = ?");
110		- $stmt->bind_param("s", $userResult['username']);
111		- $stmt->execute();
112		- $result = $stmt->get_result();
113		-
114		- $userResult['comments'] = 0;
115		- while($row = $result->fetch_assoc()) {
116		- $userResult['comments']++;
117		- }
118		- $stmt->close();
119		-
120		- $stmt = $connection->prepare("SELECT * FROM comments WHERE author = ?");
121		- $stmt->bind_param("s", $userResult['username']);
122		- $stmt->execute();
123		- $result = $stmt->get_result();
124		-
125		- $userResult['profilecomments'] = 0;
126		- while($row = $result->fetch_assoc()) {
127		- $userResult['profilecomments']++;
128		- }
129		- $stmt->close();
130		-
131		- $stmt = $connection->prepare("SELECT * FROM files WHERE author = ? AND status='y'");
132		- $stmt->bind_param("s", $userResult['username']);
133		- $stmt->execute();
134		- $result = $stmt->get_result();
135		-
136		- $userResult['filesuploaded'] = 0;
137		- while($row = $result->fetch_assoc()) {
138		- $userResult['filesuploaded']++;
139		- }
140		- $stmt->close();
141		- return $userResult;
	91	+ $userResult = array();
	92	+ $stmt = $connection->prepare("SELECT * FROM users WHERE id = ?");
	93	+ $stmt->bind_param("i", $id);
	94	+ $stmt->execute();
	95	+ $result = $stmt->get_result();
	96	+ if($result->num_rows === 0) echo('That user does not exist.');
	97	+ while($row = $result->fetch_assoc()) {
	98	+ $userResult['username'] = $row['username'];
	99	+ $userResult['id'] = $row['id'];
	100	+ $userResult['date'] = $row['date'];
	101	+ $userResult['bio'] = $row['bio'];
	102	+ $userResult['css'] = $row['css'];
	103	+ $userResult['pfp'] = $row['pfp'];
	104	+ $userResult['badges'] = explode(';', $row['badges']);
	105	+ $userResult['music'] = $row['music'];
	106	+ }
	107	+ $stmt->close();
	108	+
	109	+ $stmt = $connection->prepare("SELECT * FROM gamecomments WHERE author = ?");
	110	+ $stmt->bind_param("s", $userResult['username']);
	111	+ $stmt->execute();
	112	+ $result = $stmt->get_result();
	113	+
	114	+ $userResult['comments'] = 0;
	115	+ while($row = $result->fetch_assoc()) {
	116	+ $userResult['comments']++;
	117	+ }
	118	+ $stmt->close();
	119	+
	120	+ $stmt = $connection->prepare("SELECT * FROM comments WHERE author = ?");
	121	+ $stmt->bind_param("s", $userResult['username']);
	122	+ $stmt->execute();
	123	+ $result = $stmt->get_result();
	124	+
	125	+ $userResult['profilecomments'] = 0;
	126	+ while($row = $result->fetch_assoc()) {
	127	+ $userResult['profilecomments']++;
	128	+ }
	129	+ $stmt->close();
	130	+
	131	+ $stmt = $connection->prepare("SELECT * FROM files WHERE author = ? AND status='y'");
	132	+ $stmt->bind_param("s", $userResult['username']);
	133	+ $stmt->execute();
	134	+ $result = $stmt->get_result();
	135	+
	136	+ $userResult['filesuploaded'] = 0;
	137	+ while($row = $result->fetch_assoc()) {
	138	+ $userResult['filesuploaded']++;
	139	+ }
	140	+ $stmt->close();
	141	+ return $userResult;
142	142	}
143	143	?>
144	144	\ No newline at end of file

		@@ -4,7 +4,7 @@ discard block
		block discarded – undo
4	4
5	5	define("DEBUG_MODE", true);
6	6	session_start();
7		-if(defined("DEBUG_MODE") && DEBUG_MODE) {
	7	+if (defined("DEBUG_MODE") && DEBUG_MODE) {
8	8	ini_set('display_errors', 1);
9	9	ini_set('display_startup_errors', 1);
10	10	error_reporting(E_ALL);
		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28	}
29	29
30	30	function validateCaptcha($privatekey, $response) {
31		- $responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$privatekey.'&response='.$response));
	31	+ $responseData = json_decode(file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $privatekey . '&response=' . $response));
32	32	return $responseData->success;
33	33	}
34	34
		@@ -43,8 +43,8 @@ discard block
		block discarded – undo
43	43	$stmt->bind_param("s", $user);
44	44	$stmt->execute();
45	45	$result = $stmt->get_result();
46		- if($result->num_rows === 0) return 'error';
47		- while($row = $result->fetch_assoc()) {
	46	+ if ($result->num_rows === 0) return 'error';
	47	+ while ($row = $result->fetch_assoc()) {
48	48	$id = $row['id'];
49	49	}
50	50	$stmt->close();
		@@ -56,8 +56,8 @@ discard block
		block discarded – undo
56	56	$stmt->bind_param("s", $id);
57	57	$stmt->execute();
58	58	$result = $stmt->get_result();
59		- if($result->num_rows === 0) return('error');
60		- while($row = $result->fetch_assoc()) {
	59	+ if ($result->num_rows === 0) return('error');
	60	+ while ($row = $result->fetch_assoc()) {
61	61	$name = htmlspecialchars($row['username']);
62	62	}
63	63	$stmt->close();
		@@ -69,8 +69,8 @@ discard block
		block discarded – undo
69	69	$stmt->bind_param("s", $user);
70	70	$stmt->execute();
71	71	$result = $stmt->get_result();
72		- if($result->num_rows === 0) return('error');
73		- while($row = $result->fetch_assoc()) {
	72	+ if ($result->num_rows === 0) return('error');
	73	+ while ($row = $result->fetch_assoc()) {
74	74	$pfp = htmlspecialchars($row['pfp']);
75	75	}
76	76	$stmt->close();
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	$stmt->bind_param("ssss", $friend1, $friend2, $friend2, $friend1);
84	84	$stmt->execute();
85	85	$result = $stmt->get_result();
86		- if($result->num_rows === 1){ return true; }
	86	+ if ($result->num_rows === 1) { return true; }
87	87	return false;
88	88	}
89	89
		@@ -93,8 +93,8 @@ discard block
		block discarded – undo
93	93	$stmt->bind_param("i", $id);
94	94	$stmt->execute();
95	95	$result = $stmt->get_result();
96		- if($result->num_rows === 0) echo('That user does not exist.');
97		- while($row = $result->fetch_assoc()) {
	96	+ if ($result->num_rows === 0) echo('That user does not exist.');
	97	+ while ($row = $result->fetch_assoc()) {
98	98	$userResult['username'] = $row['username'];
99	99	$userResult['id'] = $row['id'];
100	100	$userResult['date'] = $row['date'];
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	$result = $stmt->get_result();
113	113
114	114	$userResult['comments'] = 0;
115		- while($row = $result->fetch_assoc()) {
	115	+ while ($row = $result->fetch_assoc()) {
116	116	$userResult['comments']++;
117	117	}
118	118	$stmt->close();
		@@ -123,7 +123,7 @@ discard block
		block discarded – undo
123	123	$result = $stmt->get_result();
124	124
125	125	$userResult['profilecomments'] = 0;
126		- while($row = $result->fetch_assoc()) {
	126	+ while ($row = $result->fetch_assoc()) {
127	127	$userResult['profilecomments']++;
128	128	}
129	129	$stmt->close();
		@@ -134,7 +134,7 @@ discard block
		block discarded – undo
134	134	$result = $stmt->get_result();
135	135
136	136	$userResult['filesuploaded'] = 0;
137		- while($row = $result->fetch_assoc()) {
	137	+ while ($row = $result->fetch_assoc()) {
138	138	$userResult['filesuploaded']++;
139	139	}
140	140	$stmt->close();

		@@ -43,7 +43,9 @@ discard block
		block discarded – undo
43	43	$stmt->bind_param("s", $user);
44	44	$stmt->execute();
45	45	$result = $stmt->get_result();
46		- if($result->num_rows === 0) return 'error';
	46	+ if($result->num_rows === 0) {
	47	+ return 'error';
	48	+ }
47	49	while($row = $result->fetch_assoc()) {
48	50	$id = $row['id'];
49	51	}
		@@ -56,7 +58,9 @@ discard block
		block discarded – undo
56	58	$stmt->bind_param("s", $id);
57	59	$stmt->execute();
58	60	$result = $stmt->get_result();
59		- if($result->num_rows === 0) return('error');
	61	+ if($result->num_rows === 0) {
	62	+ return('error');
	63	+ }
60	64	while($row = $result->fetch_assoc()) {
61	65	$name = htmlspecialchars($row['username']);
62	66	}
		@@ -69,7 +73,9 @@ discard block
		block discarded – undo
69	73	$stmt->bind_param("s", $user);
70	74	$stmt->execute();
71	75	$result = $stmt->get_result();
72		- if($result->num_rows === 0) return('error');
	76	+ if($result->num_rows === 0) {
	77	+ return('error');
	78	+ }
73	79	while($row = $result->fetch_assoc()) {
74	80	$pfp = htmlspecialchars($row['pfp']);
75	81	}
		@@ -93,7 +99,9 @@ discard block
		block discarded – undo
93	99	$stmt->bind_param("i", $id);
94	100	$stmt->execute();
95	101	$result = $stmt->get_result();
96		- if($result->num_rows === 0) echo('That user does not exist.');
	102	+ if($result->num_rows === 0) {
	103	+ echo('That user does not exist.');
	104	+ }
97	105	while($row = $result->fetch_assoc()) {
98	106	$userResult['username'] = $row['username'];
99	107	$userResult['id'] = $row['id'];

typicalname0 / 4grounds

Pull Request — master (#20)

Status

Category

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Indentation +102 added lines, -102 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

Braces +12 added lines, -4 removed lines patch added patch discarded remove patch