added some missing Unicode reminders / changed file encodings; todo: libse

htdocs/api/ping.php

@@ -1,4 +1,9 @@
 <?php
+/***************************************************************************
+ *  For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************/
 
 	$opt['rootpath'] = '../';
 	require($opt['rootpath'] . 'lib2/web.inc.php');

htdocs/lib/search1/search.xml.inc.php

@@ -2,6 +2,8 @@
 
 	/***************************************************************************
 		For license information see doc/license.txt
+
+		Unicode Reminder メモ
 		                                         				                                
 		XML search output
 	****************************************************************************/

htdocs/lib/sqldebugger.inc.php

@@ -5,6 +5,8 @@
 		begin                : Mon June 27 2006
 
 		For license information see doc/license.txt
+
+		Unicode Reminder メモ
  ****************************************************************************/
 
 require_once($opt['rootpath'] . 'lib/bench.inc.php');

htdocs/lib2/RSSParser.class.php

@@ -1,5 +1,10 @@
 <?php
 
+/***************************************************************************
+ *  For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************/
 
 
 class RSSParser {

htdocs/lib2/html2text.class.php

@@ -1,5 +1,8 @@
 <?php
 
+// This file is ISO-88591-encoded! Beware of the '<27>' and of
+// not multibyte-aware functions if you intend to change this!
+
 /*************************************************************************
  *                                                                       *
  * class.html2text.inc                                                   *

htdocs/lib2/imagebmp.inc.php

@@ -4,6 +4,10 @@
 *                   BMP Image functions
 *------------------------------------------------------------
 *                      By JPEXS
+*
+* This file is ISO-8859-1 encoded. If you intend to change it
+* to UTF-8, take care that any string functions used are
+* multibyte-aware.
 */
 
 

htdocs/lib2/rss.class.php

@@ -1,6 +1,8 @@
 <?php
 /* ***
  *  For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
  
 * RSS Class for Opencaching.de
 * *************************************
@@ -155,9 +157,9 @@
 		}
 	
 		function rss_clear($input) {
-			$umlaute = Array("/<EFBFBD>/","/<EFBFBD>/","/<EFBFBD>/","/<EFBFBD>/","/<EFBFBD>/","/<EFBFBD>/","/<EFBFBD>/");
+			$umlaute = Array("/ä/","/ö/","/ü/","/Ä/","/Ö/","/Ü/","/ß/");
 			$replace = Array("ae","oe","ue","Ae","Oe","Ue","ss");
-			$output = preg_replace($umlaute, $replace, $input);
+			$output = mb_ereg_replace($umlaute, $replace, $input);
 			return $output;		
 }	
 

htdocs/lib2/search/search.kml.inc.php

@@ -41,7 +41,7 @@ function search_output()
 
 	$kmlTimeFormat = 'Y-m-d\TH:i:s\Z';
 	$style = $opt['template']['style'];
-	$kmlDetailHead = file_get_contents("templates2/$style/search.result.caches.kml.head.tpl");
+	$kmlDetailHead = file_get_contents("resource2/misc/google-earth/search.result.caches.kml.head.xml");
 
 	$rsMinMax = sql_slave('
 		SELECT

htdocs/lib2/search/search.xml.inc.php

@@ -3,6 +3,9 @@
 	/***************************************************************************
 		For license information see doc/license.txt
 
+		Unicode Reminder メモ
+
+
 		XML search output
 
 		This is a very old and primitive API for downloading cache data.

htdocs/lib2/ss_zip.class.php

@@ -2,7 +2,10 @@
 /** SS_ZIP class is designed to work with ZIP archives
 @author Yuriy Horobey, smiledsoft.com
 @email info@smiledsoft.com
+
+Unicode Reminder メモ
 */
+
 class ss_zip{
 	/** contains whole zipfile
 	@see ss_zip::archive()

htdocs/okapi_settings.php

@@ -1,4 +1,9 @@
 <?
+/***************************************************************************
+ *  For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************/
 
 namespace okapi;
 

htdocs/templates2/mail/newstopic.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+ *  You can find the license in the docs directory
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************}
 Es wurde ein neuer Newseintrag erstellt.
 
 E-Mail-Adresse des Benutzer: {$email}

htdocs/templates2/ocstyle/articles/ES/cacheinfo.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+***************************************************************************}
 <div><img src="http://www.opencaching.de/resource2/ocstyle/images/misc/32x32-tools.png" width="32" height="32" alt="" />CREAR UN NUEVO CACHE </div>
 <div>
   <p><strong>Nombre:</strong> Ha cada cache se le da un nombre. Múltiples caches pueden tener el mismo nombre, pero se debe evitar esto. Buscando un nombre que tenga que ver con el cache -y evitar significativa denominaciones tales como &quot;A81 # 589&quot;. La única restricción en el nombre de la longitud, con un máximo de 60 caracteres están permitidos.</p>

htdocs/templates2/ocstyle/articles/ES/geocaching.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+***************************************************************************}
 <div class="content2-pagetitle"><img style="MARGIN-RIGHT: 10px; align: left" height="32" alt="" src="resource2/{$opt.template.style}/images/cacheicon/traditional.gif" width="32" />Acerca de Geocaching </div>
 <div class="content-txtbox-noshade" style="PADDING-RIGHT: 25px">
   <p><img style="MARGIN-LEFT: 5px" alt="Über Geocaching" src="images/ueber.jpg" align="right" /></p>

htdocs/templates2/ocstyle/cache_note.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+***************************************************************************}
   <input type="hidden" name="cacheid" value="{$cacheid|escape}" />
 
   <table class="table">

htdocs/templates2/ocstyle/childwp.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+***************************************************************************}
 <form action="childwp.php" method="post" name="fchildwp">
   <input type="hidden" name="cacheid" value="{$cacheid|escape}" />
   <input type="hidden" name="childid" value="{$childid|escape}" />

htdocs/templates2/ocstyle/coordinate_input.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+***************************************************************************}
 <table class="table">
   <tr>
     <td>

htdocs/templates2/ocstyle/res_passworderror.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+***************************************************************************}
 <span class="errormsg">
 	{t}Your password did not pass our security check.{/t}<br />
 	{t}Verify that your password matches the following criteria:{/t}<br />

htdocs/templates2/ocstyle/res_rssparser.tpl

@@ -1,3 +1,8 @@
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+***************************************************************************}
 <div class="buffer" style="width: 500px;height: 2px;">&nbsp;</div>
 	<div class="newsblock">
 {if !$includetext}

htdocs/templates2/ocstyle/search.result.caches.row.tpl

@@ -1,5 +1,11 @@
-{* include file for search.result.caches.tpl
+{***************************************************************************
-   outputs one cache line of the search result *}
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+*
+*  include file for search.result.caches.tpl
+*  outputs one cache line of the search result 
+***************************************************************************}
 <!--m-->
 <tr>
   <td width="18" class="{$listcolor}">&nbsp;{$position}&nbsp;&nbsp;</td>

htdocs/templates2/ocstyle/sys_main.tpl

@@ -1,4 +1,10 @@
-{* Template für opencaching.de *}
+{***************************************************************************
+*  You can find the license in the docs directory
+*
+*  Unicode Reminder メモ
+*
+*  Main template for "navigation frame" of all pages
+***************************************************************************}
 {* OCSTYLE *}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">

htdocs/util/google-earth/caches.php

@@ -1,4 +1,9 @@
 <?php
+/***************************************************************************
+ *	For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************/
 
 	require '../../util2/google-earth/caches.php';
 

htdocs/util2/gns/gns_import.php

@@ -3,6 +3,8 @@
  /***************************************************************************
 		For license information see doc/license.txt
 
+		Unicode Reminder メモ
+
 	Dieses Script liest Dateien von GEOnet Names Server (GNS) ein und importiert 
 	diese in die Table gns_locations.
 	Homepage:		http://earth-info.nga.mil/gns/html/
@@ -70,7 +72,7 @@
 
 		echo "$cnt Records imported\n";
 		
-		// ein paar Querschl<EFBFBD>ger gleich korrigieren ...
+		// ein paar Querschläger gleich korrigieren ...
 		sql("UPDATE gns_locations SET full_name='Zeluce' WHERE uni=100528 LIMIT 1");
 		sql("UPDATE gns_locations SET full_name='Zitaraves' WHERE uni=-2780984 LIMIT 1");
 		sql("UPDATE gns_locations SET full_name='Zvabek' WHERE uni=105075 LIMIT 1");

htdocs/util2/info/headers.php

@@ -1,5 +1,12 @@
 <?php
+/***************************************************************************
+ *	For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************/
+
 	header('Content-type: text/html; charset=utf-8');
   print_r(getallheaders());
   print_r($_REQUEST);
+
 ?>

htdocs/util2/stats/owner.php

@@ -1,4 +1,10 @@
 <?php
+/***************************************************************************
+ *	For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************/
+
   $opt['rootpath'] = '../../';
   require($opt['rootpath'] . 'lib2/web.inc.php');
 

htdocs/util2/stats/rank.php

@@ -1,4 +1,10 @@
 <?php
+/***************************************************************************
+ *	For license information see doc/license.txt
+ *
+ *  Unicode Reminder メモ
+ ***************************************************************************/
+
   $opt['rootpath'] = '../../';
   header('Content-type: text/html; charset=utf-8');
   require($opt['rootpath'] . 'lib2/web.inc.php');
@@ -15,4 +21,5 @@
     $n++;
   }
   sql_free_result($rs);
+
 ?>

local/tools/find_bad_encodings.php

@@ -44,11 +44,33 @@ function scan($dir, $subdirs)
 
 function test_encoding($path)
 {
+	static $ur_exclude = array(  // no unicode reminder needed
+		'lang/de/ocstyle/search1/search.result.caches',
+		'lib2/b2evo-captcha',
+		'lib2/HTMLPurifier',
+		'lib2/html2text.class.php',
+		'lib2/imagebmp.inc.php',
+		'lib2/smarty',
+	);
+
 	$contents = file_get_contents($path, false, null, 0, 2048);
 	$ur = stripos($contents, "Unicode Reminder");
 	if ($ur)
+	{
 		if (mb_trim(mb_substr($contents, $ur+17,2)) != "メモ")
 			echo "Bad Unicode Reminder found in $path: ".mb_trim(mb_substr($contents, $ur+17,2))."\n";
+	}
+	else
+	{
+		$ok = false;
+		foreach ($ur_exclude as $exclude)
+		{
+			if (strpos($path,$exclude) === 0)
+				$ok = true;
+		}
+		if (!$ok)
+			echo "No Unicode Reminder found in $path\n";
+	}
 }