changeset 2284:03979a8e1f2e

Sync.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 13 Apr 2020 07:49:10 +0300
parents 30d5f56ed373
children aabfbbbf35bb
files www/faq.xml www/level.php www/search.php
diffstat 3 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/www/faq.xml	Fri Apr 10 23:54:10 2020 +0300
+++ b/www/faq.xml	Mon Apr 13 07:49:10 2020 +0300
@@ -298,6 +298,11 @@
  <news group="general" id="58750">[1]</news>
  <news group="general" id="58752">[2]</news>
  </li>
+
+ <li><b>02 Apr 2020</b> - IPv6 support enabled in map search WebSockets server, so
+ now IPv6 users can connect directly to it. (Previously this was not possible due to
+ old/broken libwebsockets version.)
+ </li>
 </ul>
 
 More to come...
--- a/www/level.php	Fri Apr 10 23:54:10 2020 +0300
+++ b/www/level.php	Mon Apr 13 07:49:10 2020 +0300
@@ -58,11 +58,11 @@
     $loc = &$data["data"];
     echo
       "  <tr>\n".
-      "   <td>".
-      mpGetMapLink($loc, !isset($continentList[$loc["continent"]]) || $continentList[$loc["continent"]][CTI_HAS_MAP], TRUE, FALSE).
-      "</td>\n".
+      "   <td>".mpGetMapLink($loc,
+        !isset($continentList[$loc["continent"]]) || $continentList[$loc["continent"]][CTI_HAS_MAP], TRUE, FALSE).
+        "</td>\n".
       "   <td>".($data["limit"] > 0 ? $data["limit"] : "?")."</td>\n".
-      ($hcbat ? "" : "   <td class=\"".$loc["continent"]."\">".$continentList[$loc["continent"]][CTI_NAME]."</td>").
+      ($hcbat ? "" : "   <td class=\"".$loc["continent"]."\">".$continentList[$loc["continent"]][CTI_NAME]."</td>\n").
       "   <td>".chentities($loc["freeform"])."</td>\n".
       "  </tr>\n";
   }
--- a/www/search.php	Fri Apr 10 23:54:10 2020 +0300
+++ b/www/search.php	Mon Apr 13 07:49:10 2020 +0300
@@ -18,7 +18,6 @@
 <div id="locSearchBox">
   <h2>Location name search</h2>
   <input type="text" id="locPattern" autocomplete="off" maxlength="30" size="30" placeholder="location name or part of it">
-  Quick location search by name.
   <button type="button" title="Show or hide help" onclick="mapToggleView('help1')">Help!</button>
 </div>
 <div id="help1" class="help">
@@ -26,9 +25,10 @@
   <ul>
     <li>By default any text typed will be partial-matched to location name(s), including the alternative names known to Pupunen Maps database.
     </li>
-    <li>You can use <b>*</b> glob matching token to match any character (0 or more), and <b>?</b> to match exactly one (any) character.</li>
-    <li>You can also use <b>^</b> to anchor the match to name string start, e.g. <b>^a</b> will match only location names that start with letter 'A' (case-insensitive).
-    Same goes for <b>'$'</b> to match string end. However, the matching style is otherwise "glob", not regular expression.</li>
+    <li>You can use <b>*</b> wildcard token to match any character (0 or more), and <b>?</b> to match exactly one (any) character.
+    For example 'for*t' would match 'fort', 'forest', etc. Note that * and ? will match any character, including space.</li>
+    <li>You can also use <b>^</b> to anchor the match to name string start, e.g. <b>^ab</b> will match only location names that start with 'ab' (case-insensitive).
+    Same goes for <b>$</b> to match string end. However, the matching style is otherwise "glob", not regular expression.</li>
   </ul>
 </div>