From 17745cbb0a28dc6c9e1e5f183e07a72ff9f25405 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Wed, 27 Feb 2008 15:59:03 +0000
Subject: [PATCH] Always show the city in the school access login page, and
 sort it first by city then school name (previously it only showed the city
 for duplicate school names)

---
 schoolaccess.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/schoolaccess.php b/schoolaccess.php
index 8f8ee99..1e5b4c3 100644
--- a/schoolaccess.php
+++ b/schoolaccess.php
@@ -234,15 +234,9 @@ else
 	<select name="schoolid">
 	<option value=""><?=i18n("Choose your school")?></option>
 	<?
-	$q=mysql_query("SELECT id,school,city FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER BY school");
-	$prev="somethingthatdoesnotexist";
-	while($r=mysql_fetch_object($q))
-	{
-		if($r->school==$prev)
-			echo "<option value=\"$r->id\">$r->school ($r->city)</option>\n";
-		else
-			echo "<option value=\"$r->id\">$r->school</option>\n";
-		$prev=$r->school;
+	$q=mysql_query("SELECT id,school,city FROM schools WHERE year='".$config['FAIRYEAR']."' ORDER BY city,school");
+	while($r=mysql_fetch_object($q)) {
+			echo "<option $sel value=\"$r->id\">".htmlspecialchars($r->city).' - '.htmlspecialchars($r->school)."</option>\n";
 	}
 	?>
 	</select>