changeset 817:eaba088b5424

Show alternative location names on location page.
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 18 Sep 2009 17:25:56 +0000
parents 6341de08bd52
children 8b0c0dba7350
files www/loc.php
diffstat 1 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/www/loc.php	Fri Sep 18 16:59:10 2009 +0000
+++ b/www/loc.php	Fri Sep 18 17:25:56 2009 +0000
@@ -203,19 +203,22 @@
   $locationTips = array();
   $totalLoc = 0;
   $maxRow = 6;
-  while (list($key, $value) = each($alphaTable)) {
-    if (count($value) > 0) {
-      asort($value);
+  foreach ($alphaTable as $key => $value) {
+    if (count($value) <= 0) continue;
+
+    asort($value);
       
-      echo "<h3><a name=\"".strtolower($key)."\"></a>".$key."</h3>\n".
-      "<table class=\"loc\" width=\"95%\">\n";
-      $n = 0;
-      while (list($ik, $iv) = each($value)) {
-        if ($n == 0)
-          echo " <tr>\n";
+    echo "<h3><a name=\"".strtolower($key)."\"></a>".$key."</h3>\n".
+    "<table class=\"loc\" width=\"95%\">\n";
+ 
+    $n = 0;
+    foreach ($value as $ik => $iv) {
+      if ($n == 0)
+        echo " <tr>\n";
         
         $totalLoc++;
 
+        // Print location entry
         printf("  <td width=\"%d%%\" class=\"%s\">",
           (100 / $maxRow), $iv["continent"]);
         
@@ -252,6 +255,13 @@
           );
         }        
         
+        // Alternative names
+        if (count($iv["names"]) > 1) {
+          unset($iv["names"][0]);
+          echo "<br />".implode(" | ", $iv["names"]);
+        }
+        
+        // Coder / society names
         if (count($iv["coders"]) > 0 && $showCoders) {
           $isSG = preg_match("/[SG]/", $iv["flags"]);
           if ((!isset($coderName) && !$isSG) || isset($coderName)) {
@@ -282,7 +292,6 @@
         echo " </tr>\n";
       }
       echo "</table>\n";
-    }
   }
   
   echo "<p><b>".$totalLoc."</b> locations.</p>\n";