Merge pull request #8 from startersclan/fix/fix-mysql-group-by-in-som…

…e-pages Fix: Fix MySQL Group By in some pages
startersclan · Oct 29, 2023 · 7eaef1a · 7eaef1a
2 parents 586ca46 + e6c1d41
commit 7eaef1a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/web/pages/actioninfo.php b/web/pages/actioninfo.php
@@ -132,7 +132,8 @@
 				hlstats_Events_PlayerActions.actionId = hlstats_Actions.id AND
 				hlstats_Players.hideranking = '0'
 			GROUP BY
-				hlstats_Events_PlayerActions.playerId
+				hlstats_Events_PlayerActions.playerId,
+				hlstats_Actions.reward_player
 			ORDER BY
 				$table->sort $table->sortorder,
 				$table->sort2 $table->sortorder

diff --git a/web/pages/awards_ranks.php b/web/pages/awards_ranks.php
@@ -59,7 +59,8 @@
 			AND hlstats_Ranks.game='$game'
 		GROUP BY
 			rankName,
-			minKills
+			minKills,
+			rankId
 	");
 
 	while ($r = $db->fetch_array())

diff --git a/web/pages/awards_ribbons.php b/web/pages/awards_ribbons.php
@@ -66,7 +66,8 @@
 			hlstats_Ribbons.game='$game'
 			AND hlstats_Ribbons.special=0
 		GROUP BY
-			hlstats_Ribbons.ribbonId
+			hlstats_Ribbons.ribbonId,
+			awardName
 		ORDER BY
 			awardCount,
 			ribbonName,

diff --git a/web/pages/playerinfo_general.php b/web/pages/playerinfo_general.php
@@ -327,7 +327,8 @@
 								WHERE
 									hlstats_Events_Frags.killerId=$player
 								GROUP BY
-									hlstats_Events_Frags.weapon
+									hlstats_Events_Frags.weapon,
+									hlstats_Weapons.name
 								ORDER BY
 									kills desc, headshots desc
 								LIMIT
@@ -822,7 +823,8 @@ function setForumText(val)
 				OR hlstats_Ribbons.special = 2
 			)
 		GROUP BY
-			hlstats_Ribbons.awardCode
+			hlstats_Ribbons.awardCode,
+			hlstats_Ribbons.image
 	");
 	$res = $db->query
 	("

diff --git a/web/pages/playerinfo_teams.php b/web/pages/playerinfo_teams.php
@@ -331,7 +331,9 @@
 			)
 			AND hlstats_Roles.game = '$game'
 		GROUP BY
-			hlstats_Events_ChangeRole.role
+			hlstats_Events_ChangeRole.role,
+			hlstats_Frags_as_res.killsTotal,
+			hlstats_Frags_as_res.deathsTotal
 		ORDER BY
 			$tblRoles->sort $tblRoles->sortorder,
 			$tblRoles->sort2 $tblRoles->sortorder

diff --git a/web/pages/playerinfo_weapons.php b/web/pages/playerinfo_weapons.php
@@ -153,7 +153,8 @@
 				OR hlstats_Weapons.weaponId IS NULL
 			)
 		GROUP BY
-			hlstats_Events_Frags.weapon
+			hlstats_Events_Frags.weapon,
+			hlstats_Weapons.modifier
 		ORDER BY
 			$tblWeapons->sort $tblWeapons->sortorder,
 			$tblWeapons->sort2 $tblWeapons->sortorder

diff --git a/web/pages/ribboninfo.php b/web/pages/ribboninfo.php
@@ -137,7 +137,8 @@
 		GROUP BY
 			flag,
 			lastName,
-			hlstats_Players.playerId
+			hlstats_Players.playerId,
+			hlstats_Awards.name
 		HAVING
 			COUNT(hlstats_Awards.name) >= $awardmin  	
 		ORDER BY
@@ -174,7 +175,8 @@
 		GROUP BY
 			flag,
 			lastName,
-			hlstats_Players.playerId
+			hlstats_Players.playerId,
+			hlstats_Awards.name
 		HAVING
 			COUNT(hlstats_Awards.name) >= $awardmin  	
 	");