Inspection of "Indentation" - typicalname0/4grounds - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( f3e91e...f82432 )

by Maxwell

created 2020-08-20 00:10 UTC

Status

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.

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

@@ -18,32 +18,32 @@  discard block
 block discarded – undo
          ?>
         <center><h1 style="display: inline-block;">4Grounds - Register</h1><br>
             <?php
-                if($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) 
+                if ($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) 
                 {
                     $email = htmlspecialchars(@$_POST['email']);
                     $username = htmlspecialchars(@$_POST['username']);
                     $password = @$_POST['password'];
                     $passwordhash = password_hash(@$password, PASSWORD_DEFAULT);
                     
-                    if($_POST['password'] !== $_POST['confirm']){ $error = "password and confirmation password do not match"; goto skip; }
+                    if ($_POST['password'] !== $_POST['confirm']) { $error = "password and confirmation password do not match"; goto skip; }
 
-                    if(strlen($username) > 21) { $error = "your username must be shorter than 21 characters"; goto skip; }
-                    if(strlen($password) < 8) { $error = "your password must be at least 8 characters long"; goto skip; }
-                    if(!preg_match('/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/', $password)) { $error = "please include both letters and numbers in your password"; goto skip; }
-                    if(!isset($_POST['g-recaptcha-response'])){ $error = "captcha validation failed"; goto skip; }
-                    if($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skip; }
+                    if (strlen($username) > 21) { $error = "your username must be shorter than 21 characters"; goto skip; }
+                    if (strlen($password) < 8) { $error = "your password must be at least 8 characters long"; goto skip; }
+                    if (!preg_match('/[A-Za-z].*[0-9]|[0-9].*[A-Za-z]/', $password)) { $error = "please include both letters and numbers in your password"; goto skip; }
+                    if (!isset($_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skip; }
+                    if ($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skip; }
     
                     $stmt = $conn->prepare("SELECT username FROM users WHERE username = ?");
                     $stmt->bind_param("s", $username);
                     $stmt->execute();
                     $result = $stmt->get_result();
-                    if($result->num_rows) { $error = "there's already a user with that same name!"; goto skip; }
+                    if ($result->num_rows) { $error = "there's already a user with that same name!"; goto skip; }
 
                     $stmt = $conn->prepare("SELECT email FROM users WHERE email = ?");
                     $stmt->bind_param("s", $email);
                     $stmt->execute();
                     $result = $stmt->get_result();
-                    if($result->num_rows) { $error = "there's already a user with that same email!"; goto skip; }
+                    if ($result->num_rows) { $error = "there's already a user with that same email!"; goto skip; }
                             
                     //TODO: add cloudflare ip thing 
                     $stmt = $conn->prepare("INSERT INTO `users` (`username`, `email`, `password`) VALUES (?, ?, ?)");
@@ -63,7 +63,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>
                 <input required placeholder="E-Mail" type="email" name="email"><br><br>

Please login to merge, or discard this patch.

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

@@ -14,7 +14,7 @@
 block discarded – undo
     <body> 
         <?php 
             require(__DIR__ . "/important/header.php"); 
-         ?>
+            ?>
         <center><h1 style="display: inline-block;">4Grounds - Register</h1><br>
             <?php
                 if($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username']) 

Please login to merge, or discard this patch.

view/index.php 3 patches

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

@@ -12,7 +12,9 @@  discard block
 block discarded – undo
                 $stmt->bind_param("i", $_GET['id']);
                 $stmt->execute();
                 $result = $stmt->get_result();
-                if($result->num_rows === 0) echo('There are no users.');
+                if($result->num_rows === 0) {
+                    echo('There are no users.');
+                }
                 while($row = $result->fetch_assoc()) {
                     $author = $row['author'];
                     $id = $row['id'];
@@ -215,12 +217,13 @@  discard block
 block discarded – undo
             <form method="post" enctype="multipart/form-data" id="submitform">
                 <textarea required cols="77" placeholder="Comment" name="comment"></textarea><br>
                 <input type="submit" value="Post" <?php 
-                  if ($config['use_recaptcha']) 
-                    echo 'class="g-recaptcha" data-sitekey="' . $config['recaptcha_sitekey'] . '" data-callback="onSubmit"'
+                  if ($config['use_recaptcha']) {
+                                      echo 'class="g-recaptcha" data-sitekey="' . $config['recaptcha_sitekey'] . '" data-callback="onSubmit"'
                 ?>> <small>max limit: 500 characters | supports <a href="https://www.markdownguide.org/basic-syntax">Markdown</a></small>
             </form>
             <?php
                 $stmt = $conn->prepare("SELECT * FROM `gamecomments` WHERE toid = ? ORDER BY id DESC");
+                  }
                 $stmt->bind_param("s", $_GET['id']);
                 $stmt->execute();
                 $result = $stmt->get_result();

Please login to merge, or discard this patch.

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

@@ -95,7 +95,7 @@
 block discarded – undo
             <form method="post" enctype="multipart/form-data" id="submitform">
                 <textarea required cols="77" placeholder="Comment" name="comment"></textarea><br>
                 <input type="submit" value="Post" <?php 
-                  if ($config['use_recaptcha']) 
+                    if ($config['use_recaptcha']) 
                     echo 'class="g-recaptcha" data-sitekey="' . $config['recaptcha_sitekey'] . '" data-callback="onSubmit"'
                 ?>> <small>max limit: 500 characters | supports <a href="https://www.markdownguide.org/basic-syntax">Markdown</a></small>
             </form>

Please login to merge, or discard this patch.

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

@@ -8,13 +8,13 @@  discard block
 block discarded – undo
             require(__DIR__ . "/func/func.php");
             require(__DIR__ . "/func/conn.php"); 
 
-            if(isset($_GET['id'])) {
+            if (isset($_GET['id'])) {
                 $stmt = $conn->prepare("SELECT * FROM files WHERE id = ?");
                 $stmt->bind_param("i", $_GET['id']);
                 $stmt->execute();
                 $result = $stmt->get_result();
-                if($result->num_rows === 0) echo('There are no users.');
-                while($row = $result->fetch_assoc()) {
+                if ($result->num_rows === 0) echo('There are no users.');
+                while ($row = $result->fetch_assoc()) {
                     $author = $row['author'];
                     $id = $row['id'];
                     $date = $row['date'];
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
                     $status = $row['status'];
                     $filename = $row['filename'];
 
-                    if($status != "y") {
+                    if ($status != "y") {
                         die("Item is not approved yet.");
                     }
                 }
@@ -38,13 +38,13 @@  discard block
 block discarded – undo
         
         <div class="container">
             <?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($_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skipcomment; }
-                    if($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; 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; }
+                    if (!isset($_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skipcomment; }
+                    if ($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skipcomment; }
 
                     $stmt = $conn->prepare("INSERT INTO `gamecomments` (toid, author, text, date) VALUES (?, ?, ?, now())");
                     $stmt->bind_param("sss", $_GET['id'], $_SESSION['user'], $text);
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
                     $stmt->close();
                 }
                 skipcomment:
-                if(isset($error)) {
+                if (isset($error)) {
                     echo "<span style='color: red;'><small>" . $error . "</small></span><br>";
                 }
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
                 <br><br>" . $extrainfo . "</small><hr>";
             ?>
             <?php 
-            switch($type) {
+            switch ($type) {
                 case "song":
                     echo '<audio controls> <source src="/dynamic/song/' . $filename . '"> </audio>';
                     break;
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
                 $result = $stmt->get_result();
             ?>
             <div class="commentsList">
-                <?php while($row = $result->fetch_assoc()) { ?>
+                <?php while ($row = $result->fetch_assoc()) { ?>
                 <div class='commentRight' style='display: grid; grid-template-columns: auto 85%; padding:5px;'>
                     <div>
                         <a style='float: left;' href='/view/profile?id=<?php echo getID($row['author'], $conn); ?>'><?php echo $row['author']; ?></a>
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
                     </div>
                     <div style="word-wrap: break-word;">
                         <small><?php echo $row['date']; ?></small><br>
-                        <?php echo validateMarkdown($row['text']);?>
+                        <?php echo validateMarkdown($row['text']); ?>
                     </div>
                 </div>
                 <?php } ?>

Please login to merge, or discard this patch.

view/group.php 2 patches

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

@@ -50,7 +50,9 @@  discard block
 block discarded – undo
                     $stmt->bind_param("i", $_GET['id']);
                     $stmt->execute();
                     $result = $stmt->get_result();
-                    if($result->num_rows === 0) echo('Group doesnt exist.');
+                    if($result->num_rows === 0) {
+                        echo('Group doesnt exist.');
+                    }
                     while($row = $result->fetch_assoc()) {
                         $id = $row['id'];
                         ?>
@@ -80,7 +82,9 @@  discard block
 block discarded – undo
                     $stmt->bind_param("i", $id);
                     $stmt->execute();
                     $result = $stmt->get_result();
-                    if($result->num_rows === 0) echo('There are no users.');
+                    if($result->num_rows === 0) {
+                        echo('There are no users.');
+                    }
                     $members = 0;
                     while($row = $result->fetch_assoc()) {
                         $members++;

Please login to merge, or discard this patch.

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

@@ -21,16 +21,16 @@  discard block
 block discarded – undo
         
         <div class="container">
             <?php
-                if($_SERVER['REQUEST_METHOD'] == 'POST')  {
-                    if(!isset($_SESSION['user'])) {
+                if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+                    if (!isset($_SESSION['user'])) {
                         $error = "you are not logged in";
                         goto skipcomment;
                     }
-                    if(!$_POST['comment']) {
+                    if (!$_POST['comment']) {
                         $error = "your comment cannot be blank";
                         goto skipcomment;
                     }
-                    if(strlen($_POST['comment']) > 500) {
+                    if (strlen($_POST['comment']) > 500) {
                         $error = "your comment must be shorter than 500 characters";
                         goto skipcomment;
                     }
@@ -43,26 +43,26 @@  discard block
 block discarded – undo
                 }
                 skipcomment:
 
-                if(isset($_GET['id'])) {
+                if (isset($_GET['id'])) {
                     $stmt = $conn->prepare("SELECT * FROM `groups` WHERE id = ?");
                     $stmt->bind_param("i", $_GET['id']);
                     $stmt->execute();
                     $result = $stmt->get_result();
-                    if($result->num_rows === 0) echo('Group doesnt exist.');
-                    while($row = $result->fetch_assoc()) {
+                    if ($result->num_rows === 0) echo('Group doesnt exist.');
+                    while ($row = $result->fetch_assoc()) {
                         $id = $row['id'];
                         ?>
                         <img style='border: 1px solid white; width: 5em;'
-                             src='/dynamic/pfp/<?php echo getPFP($row["author"], $conn);?>'>
+                             src='/dynamic/pfp/<?php echo getPFP($row["author"], $conn); ?>'>
                         <span style='float: right;text-align: right;'>
-                            <a href='/view/group?id=<?php echo $row["id"];?>' style='color: gold;font-size:1.5em'>
-                                <?php echo $row['title'];?>
+                            <a href='/view/group?id=<?php echo $row["id"]; ?>' style='color: gold;font-size:1.5em'>
+                                <?php echo $row['title']; ?>
                             </a><br>
                             <small>
                                 <i>
                                     Created by
-                                    <a href='/view/profile?id=<?php echo getID($row["author"], $conn);?>'>
-                                        <?php echo $row['author'];?>
+                                    <a href='/view/profile?id=<?php echo getID($row["author"], $conn); ?>'>
+                                        <?php echo $row['author']; ?>
                                     </a>
                                 </i><br>
                                 <?php echo $row['date']?>
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
                     $stmt->bind_param("i", $id);
                     $stmt->execute();
                     $result = $stmt->get_result();
-                    if($result->num_rows === 0) echo('There are no users.');
+                    if ($result->num_rows === 0) echo('There are no users.');
                     $members = 0;
-                    while($row = $result->fetch_assoc()) {
+                    while ($row = $result->fetch_assoc()) {
                         $members++;
                     }
-                    echo "<span style='float:right;'><a href='/joingroup?id=" . $id. "'><button>Join</button></a></span>";
+                    echo "<span style='float:right;'><a href='/joingroup?id=" . $id . "'><button>Join</button></a></span>";
                 } else {
                     header("Location: view/groups.php");
                 }
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
             <hr>
             <div>
                 <div class="left">
-                    <?php if(isset($error)) {echo "<small style='color:red'>" . $error . "</small>";}?>
+                    <?php if (isset($error)) {echo "<small style='color:red'>" . $error . "</small>"; }?>
                     <h2>Comments</h2>
                     <?php if (isset($_SESSION['user'])) { ?>
                         <form method="post" enctype="multipart/form-data">
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
                             $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 class="commentText" style="word-wrap: break-word;">
                                         <small><?php echo $row['date']; ?></small>
-                                        <?php echo validateMarkdown($row['text']);?>
+                                        <?php echo validateMarkdown($row['text']); ?>
                                     </div>
                                     <div>
                                         <a style='float: right;' href='/view/profile?id=<?php echo getID($row['author'], $conn); ?>'><?php echo $row['author']; ?></a>
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
                     </div>
                 </div>
                 <div class="right">
-                    <h2>Members (<?php echo $members;?>)</h2>
+                    <h2>Members (<?php echo $members; ?>)</h2>
                     <?php
                         $stmt = $conn->prepare("SELECT `username`, `id` FROM `users` WHERE `currentgroup` = ?");
                         $stmt->bind_param("i", $id);
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
 
                         echo "<ul>";
                         while ($row = $result->fetch_assoc()) {
-                            echo "<li><a href='/view/profile?id=" . $row['id'] . "'>". $row['username'] . "</a></li>";
+                            echo "<li><a href='/view/profile?id=" . $row['id'] . "'>" . $row['username'] . "</a></li>";
                         }
                         echo "</ul>";
                     ?>

Please login to merge, or discard this patch.

upload/game.php 1 patch

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

@@ -12,7 +12,7 @@
 block discarded – undo
     <body> 
         <?php require(__DIR__ . "/../important/header.php"); 
         
-        if(@$_POST['submit']) {
+        if (@$_POST['submit']) {
             $register = require(__DIR__ . "/../func/upload.php");
             $register("game", ["swf"], $conn);
         }

Please login to merge, or discard this patch.

upload/midi.php 1 patch

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

@@ -12,7 +12,7 @@
 block discarded – undo
     <body> 
         <?php require(__DIR__ . "/../important/header.php"); 
         
-        if(@$_POST['submit']) {
+        if (@$_POST['submit']) {
             $register = require(__DIR__ . "/../func/upload.php");
             $register("midi", ["mid"], $conn);
         }

Please login to merge, or discard this patch.

upload/video.php 1 patch

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

@@ -12,7 +12,7 @@
 block discarded – undo
     <body> 
         <?php require(__DIR__ . "/../important/header.php"); 
         
-        if(@$_POST['submit']) {
+        if (@$_POST['submit']) {
             $register = require(__DIR__ . "/../func/upload.php");
             $register("video", ["mp4"], $conn);
         }

Please login to merge, or discard this patch.

		@@ -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("UPDATE files SET status = 'y' WHERE id = ?");
8	8	$stmt->bind_param("i", $_GET['id']);
9	9	$stmt->execute();

		@@ -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>

		@@ -18,32 +18,32 @@ discard block
		block discarded – undo
18	18	?>
19	19	<center><h1 style="display: inline-block;">4Grounds - Register</h1><br>
20	20	<?php
21		- if($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username'])
	21	+ if ($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username'])
22	22	{
23	23	$email = htmlspecialchars(@$_POST['email']);
24	24	$username = htmlspecialchars(@$_POST['username']);
25	25	$password = @$_POST['password'];
26	26	$passwordhash = password_hash(@$password, PASSWORD_DEFAULT);
27	27
28		- if($_POST['password'] !== $_POST['confirm']){ $error = "password and confirmation password do not match"; goto skip; }
	28	+ if ($_POST['password'] !== $_POST['confirm']) { $error = "password and confirmation password do not match"; goto skip; }
29	29
30		- if(strlen($username) > 21) { $error = "your username must be shorter than 21 characters"; goto skip; }
31		- if(strlen($password) < 8) { $error = "your password must be at least 8 characters long"; goto skip; }
32		- if(!preg_match('/[A-Za-z].[0-9]\|[0-9].[A-Za-z]/', $password)) { $error = "please include both letters and numbers in your password"; goto skip; }
33		- if(!isset($_POST['g-recaptcha-response'])){ $error = "captcha validation failed"; goto skip; }
34		- if($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skip; }
	30	+ if (strlen($username) > 21) { $error = "your username must be shorter than 21 characters"; goto skip; }
	31	+ if (strlen($password) < 8) { $error = "your password must be at least 8 characters long"; goto skip; }
	32	+ if (!preg_match('/[A-Za-z].[0-9]\|[0-9].[A-Za-z]/', $password)) { $error = "please include both letters and numbers in your password"; goto skip; }
	33	+ if (!isset($_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skip; }
	34	+ if ($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skip; }
35	35
36	36	$stmt = $conn->prepare("SELECT username FROM users WHERE username = ?");
37	37	$stmt->bind_param("s", $username);
38	38	$stmt->execute();
39	39	$result = $stmt->get_result();
40		- if($result->num_rows) { $error = "there's already a user with that same name!"; goto skip; }
	40	+ if ($result->num_rows) { $error = "there's already a user with that same name!"; goto skip; }
41	41
42	42	$stmt = $conn->prepare("SELECT email FROM users WHERE email = ?");
43	43	$stmt->bind_param("s", $email);
44	44	$stmt->execute();
45	45	$result = $stmt->get_result();
46		- if($result->num_rows) { $error = "there's already a user with that same email!"; goto skip; }
	46	+ if ($result->num_rows) { $error = "there's already a user with that same email!"; goto skip; }
47	47
48	48	//TODO: add cloudflare ip thing
49	49	$stmt = $conn->prepare("INSERT INTO `users` (`username`, `email`, `password`) VALUES (?, ?, ?)");
		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	}
64	64	skip:
65	65
66		- if(isset($error)) { echo "<small style='color:red'>".$error."</small>"; } ?>
	66	+ if (isset($error)) { echo "<small style='color:red'>" . $error . "</small>"; } ?>
67	67	<form method="post">
68	68	<input required placeholder="Username" type="text" name="username"><br>
69	69	<input required placeholder="E-Mail" type="email" name="email"><br><br>

		@@ -14,7 +14,7 @@
		block discarded – undo
14	14	<body>
15	15	<?php
16	16	require(__DIR__ . "/important/header.php");
17		- ?>
	17	+ ?>
18	18	<center><h1 style="display: inline-block;">4Grounds - Register</h1><br>
19	19	<?php
20	20	if($_SERVER['REQUEST_METHOD'] == 'POST' && $_POST['password'] && $_POST['username'])

		@@ -12,7 +12,9 @@ discard block
		block discarded – undo
12	12	$stmt->bind_param("i", $_GET['id']);
13	13	$stmt->execute();
14	14	$result = $stmt->get_result();
15		- if($result->num_rows === 0) echo('There are no users.');
	15	+ if($result->num_rows === 0) {
	16	+ echo('There are no users.');
	17	+ }
16	18	while($row = $result->fetch_assoc()) {
17	19	$author = $row['author'];
18	20	$id = $row['id'];
		@@ -215,12 +217,13 @@ discard block
		block discarded – undo
215	217	<form method="post" enctype="multipart/form-data" id="submitform">
216	218	<textarea required cols="77" placeholder="Comment" name="comment"></textarea><br>
217	219	<input type="submit" value="Post" <?php
218		- if ($config['use_recaptcha'])
219		- echo 'class="g-recaptcha" data-sitekey="' . $config['recaptcha_sitekey'] . '" data-callback="onSubmit"'
	220	+ if ($config['use_recaptcha']) {
	221	+ echo 'class="g-recaptcha" data-sitekey="' . $config['recaptcha_sitekey'] . '" data-callback="onSubmit"'
220	222	?>> <small>max limit: 500 characters \| supports <a href="https://www.markdownguide.org/basic-syntax">Markdown</a></small>
221	223	</form>
222	224	<?php
223	225	$stmt = $conn->prepare("SELECT * FROM `gamecomments` WHERE toid = ? ORDER BY id DESC");
	226	+ }
224	227	$stmt->bind_param("s", $_GET['id']);
225	228	$stmt->execute();
226	229	$result = $stmt->get_result();

		@@ -95,7 +95,7 @@
		block discarded – undo
95	95	<form method="post" enctype="multipart/form-data" id="submitform">
96	96	<textarea required cols="77" placeholder="Comment" name="comment"></textarea><br>
97	97	<input type="submit" value="Post" <?php
98		- if ($config['use_recaptcha'])
	98	+ if ($config['use_recaptcha'])
99	99	echo 'class="g-recaptcha" data-sitekey="' . $config['recaptcha_sitekey'] . '" data-callback="onSubmit"'
100	100	?>> <small>max limit: 500 characters \| supports <a href="https://www.markdownguide.org/basic-syntax">Markdown</a></small>
101	101	</form>

		@@ -8,13 +8,13 @@ discard block
		block discarded – undo
8	8	require(__DIR__ . "/func/func.php");
9	9	require(__DIR__ . "/func/conn.php");
10	10
11		- if(isset($_GET['id'])) {
	11	+ if (isset($_GET['id'])) {
12	12	$stmt = $conn->prepare("SELECT * FROM files WHERE id = ?");
13	13	$stmt->bind_param("i", $_GET['id']);
14	14	$stmt->execute();
15	15	$result = $stmt->get_result();
16		- if($result->num_rows === 0) echo('There are no users.');
17		- while($row = $result->fetch_assoc()) {
	16	+ if ($result->num_rows === 0) echo('There are no users.');
	17	+ while ($row = $result->fetch_assoc()) {
18	18	$author = $row['author'];
19	19	$id = $row['id'];
20	20	$date = $row['date'];
		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	$status = $row['status'];
25	25	$filename = $row['filename'];
26	26
27		- if($status != "y") {
	27	+ if ($status != "y") {
28	28	die("Item is not approved yet.");
29	29	}
30	30	}
		@@ -38,13 +38,13 @@ discard block
		block discarded – undo
38	38
39	39	<div class="container">
40	40	<?php
41		- if($_SERVER['REQUEST_METHOD'] == 'POST')
	41	+ if ($_SERVER['REQUEST_METHOD'] == 'POST')
42	42	{
43		- if(!isset($_SESSION['user'])){ $error = "you are not logged in"; goto skipcomment; }
44		- if(!$_POST['comment']){ $error = "your comment cannot be blank"; goto skipcomment; }
45		- if(strlen($_POST['comment']) > 500){ $error = "your comment must be shorter than 500 characters"; goto skipcomment; }
46		- if(!isset($_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skipcomment; }
47		- if($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skipcomment; }
	43	+ if (!isset($_SESSION['user'])) { $error = "you are not logged in"; goto skipcomment; }
	44	+ if (!$_POST['comment']) { $error = "your comment cannot be blank"; goto skipcomment; }
	45	+ if (strlen($_POST['comment']) > 500) { $error = "your comment must be shorter than 500 characters"; goto skipcomment; }
	46	+ if (!isset($_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skipcomment; }
	47	+ if ($config['use_recaptcha'] && !validateCaptcha($config['recaptcha_secret'], $_POST['g-recaptcha-response'])) { $error = "captcha validation failed"; goto skipcomment; }
48	48
49	49	$stmt = $conn->prepare("INSERT INTO `gamecomments` (toid, author, text, date) VALUES (?, ?, ?, now())");
50	50	$stmt->bind_param("sss", $_GET['id'], $_SESSION['user'], $text);
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	$stmt->close();
54	54	}
55	55	skipcomment:
56		- if(isset($error)) {
	56	+ if (isset($error)) {
57	57	echo "<span style='color: red;'><small>" . $error . "</small></span><br>";
58	58	}
59	59
		@@ -65,7 +65,7 @@ discard block
		block discarded – undo
65	65	<br><br>" . $extrainfo . "</small><hr>";
66	66	?>
67	67	<?php
68		- switch($type) {
	68	+ switch ($type) {
69	69	case "song":
70	70	echo '<audio controls> <source src="/dynamic/song/' . $filename . '"> </audio>';
71	71	break;
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	$result = $stmt->get_result();
108	108	?>
109	109	<div class="commentsList">
110		- <?php while($row = $result->fetch_assoc()) { ?>
	110	+ <?php while ($row = $result->fetch_assoc()) { ?>
111	111	<div class='commentRight' style='display: grid; grid-template-columns: auto 85%; padding:5px;'>
112	112	<div>
113	113	<a style='float: left;' href='/view/profile?id=<?php echo getID($row['author'], $conn); ?>'><?php echo $row['author']; ?></a>
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	</div>
117	117	<div style="word-wrap: break-word;">
118	118	<small><?php echo $row['date']; ?></small><br>
119		- <?php echo validateMarkdown($row['text']);?>
	119	+ <?php echo validateMarkdown($row['text']); ?>
120	120	</div>
121	121	</div>
122	122	<?php } ?>

		@@ -50,7 +50,9 @@ discard block
		block discarded – undo
50	50	$stmt->bind_param("i", $_GET['id']);
51	51	$stmt->execute();
52	52	$result = $stmt->get_result();
53		- if($result->num_rows === 0) echo('Group doesnt exist.');
	53	+ if($result->num_rows === 0) {
	54	+ echo('Group doesnt exist.');
	55	+ }
54	56	while($row = $result->fetch_assoc()) {
55	57	$id = $row['id'];
56	58	?>
		@@ -80,7 +82,9 @@ discard block
		block discarded – undo
80	82	$stmt->bind_param("i", $id);
81	83	$stmt->execute();
82	84	$result = $stmt->get_result();
83		- if($result->num_rows === 0) echo('There are no users.');
	85	+ if($result->num_rows === 0) {
	86	+ echo('There are no users.');
	87	+ }
84	88	$members = 0;
85	89	while($row = $result->fetch_assoc()) {
86	90	$members++;

		@@ -21,16 +21,16 @@ discard block
		block discarded – undo
21	21
22	22	<div class="container">
23	23	<?php
24		- if($_SERVER['REQUEST_METHOD'] == 'POST') {
25		- if(!isset($_SESSION['user'])) {
	24	+ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
	25	+ if (!isset($_SESSION['user'])) {
26	26	$error = "you are not logged in";
27	27	goto skipcomment;
28	28	}
29		- if(!$_POST['comment']) {
	29	+ if (!$_POST['comment']) {
30	30	$error = "your comment cannot be blank";
31	31	goto skipcomment;
32	32	}
33		- if(strlen($_POST['comment']) > 500) {
	33	+ if (strlen($_POST['comment']) > 500) {
34	34	$error = "your comment must be shorter than 500 characters";
35	35	goto skipcomment;
36	36	}
		@@ -43,26 +43,26 @@ discard block
		block discarded – undo
43	43	}
44	44	skipcomment:
45	45
46		- if(isset($_GET['id'])) {
	46	+ if (isset($_GET['id'])) {
47	47	$stmt = $conn->prepare("SELECT * FROM `groups` WHERE id = ?");
48	48	$stmt->bind_param("i", $_GET['id']);
49	49	$stmt->execute();
50	50	$result = $stmt->get_result();
51		- if($result->num_rows === 0) echo('Group doesnt exist.');
52		- while($row = $result->fetch_assoc()) {
	51	+ if ($result->num_rows === 0) echo('Group doesnt exist.');
	52	+ while ($row = $result->fetch_assoc()) {
53	53	$id = $row['id'];
54	54	?>
55	55	<img style='border: 1px solid white; width: 5em;'
56		- src='/dynamic/pfp/<?php echo getPFP($row["author"], $conn);?>'>
	56	+ src='/dynamic/pfp/<?php echo getPFP($row["author"], $conn); ?>'>
57	57	<span style='float: right;text-align: right;'>
58		- <a href='/view/group?id=<?php echo $row["id"];?>' style='color: gold;font-size:1.5em'>
59		- <?php echo $row['title'];?>
	58	+ <a href='/view/group?id=<?php echo $row["id"]; ?>' style='color: gold;font-size:1.5em'>
	59	+ <?php echo $row['title']; ?>
60	60	</a><br>
61	61	<small>
62	62	<i>
63	63	Created by
64		- <a href='/view/profile?id=<?php echo getID($row["author"], $conn);?>'>
65		- <?php echo $row['author'];?>
	64	+ <a href='/view/profile?id=<?php echo getID($row["author"], $conn); ?>'>
	65	+ <?php echo $row['author']; ?>
66	66	</a>
67	67	</i><br>
68	68	<?php echo $row['date']?>
		@@ -78,12 +78,12 @@ discard block
		block discarded – undo
78	78	$stmt->bind_param("i", $id);
79	79	$stmt->execute();
80	80	$result = $stmt->get_result();
81		- if($result->num_rows === 0) echo('There are no users.');
	81	+ if ($result->num_rows === 0) echo('There are no users.');
82	82	$members = 0;
83		- while($row = $result->fetch_assoc()) {
	83	+ while ($row = $result->fetch_assoc()) {
84	84	$members++;
85	85	}
86		- echo "<span style='float:right;'><a href='/joingroup?id=" . $id. "'><button>Join</button></a></span>";
	86	+ echo "<span style='float:right;'><a href='/joingroup?id=" . $id . "'><button>Join</button></a></span>";
87	87	} else {
88	88	header("Location: view/groups.php");
89	89	}
		@@ -92,7 +92,7 @@ discard block
		block discarded – undo
92	92	<hr>
93	93	<div>
94	94	<div class="left">
95		- <?php if(isset($error)) {echo "<small style='color:red'>" . $error . "</small>";}?>
	95	+ <?php if (isset($error)) {echo "<small style='color:red'>" . $error . "</small>"; }?>
96	96	<h2>Comments</h2>
97	97	<?php if (isset($_SESSION['user'])) { ?>
98	98	<form method="post" enctype="multipart/form-data">
		@@ -109,11 +109,11 @@ discard block
		block discarded – undo
109	109	$stmt->execute();
110	110	$result = $stmt->get_result();
111	111
112		- while($row = $result->fetch_assoc()) { ?>
	112	+ while ($row = $result->fetch_assoc()) { ?>
113	113	<div class='commentRight' style='display: grid; grid-template-columns: 75% auto; padding:5px;'>
114	114	<div class="commentText" style="word-wrap: break-word;">
115	115	<small><?php echo $row['date']; ?></small>
116		- <?php echo validateMarkdown($row['text']);?>
	116	+ <?php echo validateMarkdown($row['text']); ?>
117	117	</div>
118	118	<div>
119	119	<a style='float: right;' href='/view/profile?id=<?php echo getID($row['author'], $conn); ?>'><?php echo $row['author']; ?></a>
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	</div>
126	126	</div>
127	127	<div class="right">
128		- <h2>Members (<?php echo $members;?>)</h2>
	128	+ <h2>Members (<?php echo $members; ?>)</h2>
129	129	<?php
130	130	$stmt = $conn->prepare("SELECT `username`, `id` FROM `users` WHERE `currentgroup` = ?");
131	131	$stmt->bind_param("i", $id);
		@@ -134,7 +134,7 @@ discard block
		block discarded – undo
134	134
135	135	echo "<ul>";
136	136	while ($row = $result->fetch_assoc()) {
137		- echo "<li><a href='/view/profile?id=" . $row['id'] . "'>". $row['username'] . "</a></li>";
	137	+ echo "<li><a href='/view/profile?id=" . $row['id'] . "'>" . $row['username'] . "</a></li>";
138	138	}
139	139	echo "</ul>";
140	140	?>

		@@ -12,7 +12,7 @@
		block discarded – undo
12	12	<body>
13	13	<?php require(__DIR__ . "/../important/header.php");
14	14
15		- if(@$_POST['submit']) {
	15	+ if (@$_POST['submit']) {
16	16	$register = require(__DIR__ . "/../func/upload.php");
17	17	$register("game", ["swf"], $conn);
18	18	}

typicalname0 / 4grounds

Push — master ( f3e91e...f82432 )

Status

Category

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

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

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

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

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

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

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

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

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

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

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