remove supress warnings

greenelfx · Apr 27, 2019 · b5a962c · b5a962c
1 parent 7f7d45c
commit b5a962c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/sources/public/rankings.php b/sources/public/rankings.php
@@ -6,11 +6,9 @@
 <h2 class="text-left">Rankings</h2>
 <hr/>
 <?php
-error_reporting(-1);
-if(isset($_GET['job'])) {
-	$egetjob = $mysqli->real_escape_string(@$_GET['job']);
-	$getjob = preg_replace("/[^A-Za-z0-9 ]/", '', $egetjob); # Escape and Strip
-}
+$job_param = isset($_GET['job']) ? $_GET['job'] : '';
+$getjob = preg_replace("/[^A-Za-z0-9 ]/", '', $job_param); # Escape and Strip
+
 $dir = "/";
 if(isset($getjob) && $getjob != NULL) {
 	if($getjob == "beginner") {
@@ -44,17 +42,15 @@
 	$show = "";
 	$getjob = "all";
 }
-$estart = $mysqli->real_escape_string(@$_GET['start']);
-$start = intval(+preg_replace("/[^A-Za-z0-9 ]/", '', $estart)); # Escape and Strip and ensure it's a number
-$esearch = $mysqli->real_escape_string(@$_GET['search']);
-$search = preg_replace("/[^A-Za-z0-9 ]/", '', $esearch); # Escape and Strip
-if(isset($search)) {
-	$esearch = $mysqli->real_escape_string(@$_POST['search']);
-	$search = preg_replace("/[^A-Za-z0-9 ]/", '', $esearch); # Escape and Strip
-	$csearch = " AND c.name LIKE '".$search."%'";
-} else {
-	$csearch = "";
-}
+
+$start_param = isset($_GET['start']) ? $_GET['start'] : 0;
+$start = intval(+preg_replace("/[^A-Za-z0-9 ]/", '', $start_param)); # Escape and Strip and ensure it's a number
+
+$search_param = isset($_POST['search']) ? $_POST['search'] : '';
+$search = preg_replace("/[^A-Za-z0-9 ]/", '', $search_param); # Escape and Strip
+
+$csearch = isset($search) ? " AND c.name LIKE '".$search."%'" : '';
+
 if(isset($search)) {
 	if($servertype == 1) {
 		$result2 = $mysqli->query("SELECT c.name , c.gm, c.job , c.level, c.reborns, g.guildid, g.name AS gname, g.logo AS logo, g.logoColor AS logoColor, g.logoBGColor AS logoBGColor, g.logoBG AS logoBG FROM characters c LEFT JOIN guilds g ON c.guildid = g.guildid WHERE c.gm < $gmlevel ".$show."".$csearch." GROUP BY c.id DESC ORDER BY reborns DESC, level DESC LIMIT $start, 15") or die("IT IS LINE ". __LINE__ . "<br />" . $mysqli->error);
@@ -78,6 +74,14 @@
 } else {
 	$result = $mysqli->query("SELECT c.name , c.gm, c.job, c.level, c.exp, g.guildid, g.name AS gname, g.logo AS logo, g.logoColor AS logoColor, g.logoBGColor AS logoBGColor, g.logoBG AS logoBG FROM characters c LEFT JOIN guilds g ON c.guildid = g.guildid WHERE (c.gm < '$gmlevel') ".$show."".$csearch." GROUP BY c.id DESC ORDER BY level DESC, exp DESC LIMIT 15 OFFSET $start") or die("IT IS LINE ". __LINE__ . "<br />" . $mysqli->error);
 }
+if ($result->num_rows == 0) {
+	echo '
+		<div class="alert alert-danger">No results found</div>
+		<hr/>
+		<a href="?base=main&page=rankings" class="btn btn-outline-primary">&laquo; Go back</a>
+	';
+	return;
+}
 echo "
 <div class=\"row\">
 	<div class=\"col-md-6\">
@@ -290,7 +294,7 @@
 	<ul class=\"pagination justify-content-center\">
 		";
 
-		if($start == 0 || $start<15) {
+		if($start == 0 || $start < 15) {
 			echo "  <li class=\"page-item disabled\"><a class=\"page-link\" href=\"?base=main&page=rankings&job=".$getjob."/\"><i class=\"icon-arrow-left\"></i> Previous</a></li>";
 		}
 		else{

diff --git a/sources/public/register.php b/sources/public/register.php
@@ -6,7 +6,7 @@
 require "assets/libs/gump.class.php";
 
 if($recaptcha_public == null || $recaptcha_private == null) {
-	echo '<div class="alert alert-danger">Your administrator has not setup ReCATPCHA yet!</div>';
+	echo '<div class="alert alert-danger">Your administrator has not setup reCATPCHA yet!</div>';
 	return;
 }
 GUMP::add_validator("recaptcha", function($field, $input, $param = NULL) use ($recaptcha_private) {