OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

readded and fixed #4781: new cache size nano (commit b300630 got lost)

Browse Source 
compatibility:
- is supported by new OKAPI rev. 495
- Ocprop compatibility is being checked
- is returned as "other" size in XML interface size field, and as "nano" in new size2 field
- is returned as Micro in GPX files
This commit is contained in:
following
2012-11-10 16:48:21 +01:00
parent 4818246331
commit b75afd18e2
9 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/doc/sql/static-data/data.sql
View File

@ -132,13 +132,14 @@ INSERT INTO `cache_report_status` (`id`, `name`, `trans_id`) VALUES ('3', 'Done'
-- Table cache_size
SET NAMES 'utf8';
TRUNCATE TABLE `cache_size`;
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('8', 'nano', '1803', '1', 'nano', 'nano');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('1', 'other size', '524', '7', 'andere Größe', 'other size');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('2', 'micro', '525', '1', 'mikro', 'micro');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('3', 'small', '526', '2', 'klein', 'small');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('4', 'normal', '527', '3', 'normal', 'normal');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('5', 'large', '528', '4', 'groß', 'large');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('6', 'very large', '529', '5', 'extrem groß', 'very large');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('7', 'no container', '530', '6', 'kein Behälter', 'no container');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('2', 'micro', '525', '2', 'mikro', 'micro');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('3', 'small', '526', '3', 'klein', 'small');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('4', 'normal', '527', '4', 'normal', 'normal');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('5', 'large', '528', '5', 'groß', 'large');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('6', 'very large', '529', '6', 'extrem groß', 'very large');
INSERT INTO `cache_size` (`id`, `name`, `trans_id`, `ordinal`, `de`, `en`) VALUES ('7', 'no container', '530', '8', 'kein Behälter', 'no container');
-- Table cache_status
SET NAMES 'utf8';
@ -2238,6 +2239,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1799', 'Only av
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1800', 'This cache can be done at certain seasons only - see the cache description for more details. For example, the cache may be placed in a corn labyrinth, which only exists from bloom to harvest season.', '2012-10-29 14:28:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1801', 'Help', '2012-11-09 19:28:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1802', 'Warning: This report is already assigned to another admin. Consult him first before you assume the report!', '2013-01-30 16:26:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1803', 'nano', '2012-11-10 15:51:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1804', 'Datalicense', '2013-02-09 18:28:52');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1805', 'The www.opencaching.de content is licensed under <br /><a rel=\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/de/\">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.', '2013-02-09 18:28:52');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1806', 'Please select only one of the delete/disable options!', '2013-02-09 17:34:01');
@ -4357,6 +4359,8 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1799'
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1800', 'table:cache_attrib;field=html_desc', '0');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1801', './lang/de/ocstyle/lib/menu.php', '199');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1802', './lang/de/ocstyle/adminreports.tpl', '83');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1803', './lang/de/ocstyle/search.tpl.php', '326');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1803', 'table:cache_size;field=name', '0');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1804', './lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1805', './lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1806', './adminuser.php', '72');
@ -5636,7 +5640,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1656', 'DE', 'Länderknoten', '2010-09-13 00:16:22');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1657', 'DE', 'bis', '2010-09-14 01:26:52');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1658', 'DE', 'Der Weg', '2010-09-15 15:06:51');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'DE', 'Cachegröße', '2010-09-27 00:34:11');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'DE', 'Cachegröße:', '2010-09-27 00:34:11');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1660', 'DE', 'Link', '2010-09-27 00:34:02');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1661', 'DE', 'Öffnen', '2010-09-27 00:33:57');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1662', 'DE', 'Zu den Favoriten hinzufügen...', '2010-09-27 00:33:50');
@ -5766,6 +5770,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1800', 'DE', 'Dieser Cache l\&auml;sst sich nur zu bestimmten Zeite im Jahr absolvieren. N\&auml;here Angaben sind in der Beschreibung des Caches zu finden. Der Cache kann beispielsweise in einem Maislabyrinth versteckt sein, das nur zwischen Bl\&uuml;te- und Erntezeit existiert.', '2012-10-29 14:28:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1801', 'DE', 'Hilfe', '2012-11-09 19:32:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1802', 'DE', 'Warnung: Diese Cachemeldung wird bereits von einem anderen Admin bearbeitet. Bitte sprich dich mit ihm ab, bevor du sie \&uuml;bernimmst!', '2013-01-30 16:28:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1803', 'DE', 'nano', '2012-11-10 15:56:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1804', 'DE', 'Datenlizenz', '2013-02-09 18:29:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1805', 'DE', 'Der Inhalt von www.opencaching.de steht unter einer <br /><a rel=\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/de/\">Creative Commons Namensnennung-NichtKommerziell-KeineBearbeitung-3.0-Deutschland</a>-Lizenz</a>.', '2013-02-09 18:30:58');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1806', 'DE', 'Bitte waehle nur eine der Lösch-/Sperroptionen aus!', '2013-02-09 17:34:01');
@ -6766,7 +6771,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1364', 'EN', 'JavaScript is disabled in your browser, you can enter text only. To use HTML, or the editor, please enable JavaScript.', '2010-09-10 23:57:54');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1365', 'EN', 'New cache', '2010-09-10 23:57:04');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1366', 'EN', 'Owner:', '2010-09-10 23:56:45');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1367', 'EN', 'Cachetype:', '2010-09-10 23:55:47');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1367', 'EN', 'Cache type:', '2010-09-10 23:55:47');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1368', 'EN', 'Size:', '2010-09-10 23:55:33');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1369', 'EN', 'Coordinates:', '2010-09-10 23:55:24');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1370', 'EN', 'Rating:', '2010-09-10 23:55:16');
@ -7039,7 +7044,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1656', 'EN', 'Countries', '2010-09-13 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1657', 'EN', 'to', '2010-09-14 01:27:02');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1658', 'EN', 'Route', '2010-09-27 00:21:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'EN', 'Cachesize', '2010-09-27 00:23:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'EN', 'Cache size:', '2010-09-27 00:23:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1660', 'EN', 'Link', '2010-09-27 00:23:50');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1661', 'EN', 'Open', '2010-09-27 00:23:44');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1662', 'EN', 'Add to favorites...', '2010-09-27 00:23:38');
@ -7171,6 +7176,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1800', 'EN', 'This cache can be done at certain seasons only - see the cache description for more details. For example, the cache may be placed in a corn labyrinth, which only exists from bloom to harvest season.', '2012-10-29 14:28:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1801', 'EN', 'Help', '2012-11-09 19:32:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1802', 'EN', 'Warning: This report is already assigned to another admin. Consult him first before you assume the report!', '2013-02-09 18:29:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1803', 'EN', 'nano', '2012-11-10 15:56:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1804', 'EN', 'Data licsense', '2013-02-09 18:30:12');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1805', 'EN', 'The www.opencaching.de content is licensed under <br /><a rel=\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/de/\">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.', '2013-02-09 18:31:27');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1806', 'EN', 'Please select only one of the delete/disable options!', '2013-02-09 17:34:01');
@ -8443,7 +8449,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1656', 'ES', 'Países', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1657', 'ES', 'a', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1658', 'ES', 'Ruta', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'ES', 'Tamaño del cache', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'ES', 'Tamaño del cache:', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1660', 'ES', 'Link', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1661', 'ES', 'Abierto', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1662', 'ES', 'Añadir a favoritos...', '2010-12-09 00:18:00');
@ -9912,7 +9918,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1656', 'IT', 'Paesi', '2010-09-13 22:10:04');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1657', 'IT', 'a', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1658', 'IT', 'Percorso', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'IT', 'Dimensioni cache', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'IT', 'Dimensioni cache:', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1660', 'IT', 'Link', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1661', 'IT', 'Aperto', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1662', 'IT', 'Aggiungi ai favoriti...', '2010-10-27 18:49:19');
@ -10949,7 +10955,7 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1656', 'NL', 'Landen (nodes)', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1657', 'NL', 'tot', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1658', 'NL', 'Route', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'NL', 'Cachegrootte', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1659', 'NL', 'Cachegrootte:', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1660', 'NL', 'Link', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1661', 'NL', 'Openen', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1662', 'NL', 'Aan favorieten toevoegen', '2011-02-04 19:50:08');

6
htdocs/doc/xml/xml11.htm
View File

@ -106,6 +106,7 @@
verfügbar]]&gt;&lt;/status&gt;<br>
&nbsp; &lt;country id="DE"&gt;&lt;![CDATA[Deutschland]]&gt;&lt;/country&gt;<br>
&nbsp; &lt;size id="2"&gt;&lt;![CDATA[mikro]]&gt;&lt;/size&gt;<br>
&nbsp; &lt;size2 id="2"&gt;&lt;![CDATA[mikro]]&gt;&lt;/size&gt;<br>
&nbsp; &lt;desclanguages&gt;DE&lt;/desclanguages&gt;<br>
&nbsp; &lt;difficulty&gt;4&lt;/difficulty&gt;<br>
&nbsp; &lt;terrain&gt;2&lt;/terrain&gt;<BR>
@ -118,8 +119,9 @@
&nbsp;&nbsp;&nbsp;&nbsp;&lt;attribute id="6"&gt;&lt;![CDATA[ Nur bei Opencaching]]&gt;&lt;/attribute&gt;<br>
&nbsp; &lt;/attributes&gt;<br>
&lt;/cache&gt;</P>
<p>datecreated will show date of listing creation for caches created with OC software versions 1 to 2
and date of publication &ndash; indicated by ispublishdate="1" &ndash; from OC version 3.</p>
<p><em>datecreated</em> will show date of listing creation for caches created with OC software versions 1 to 2
and date of publication &ndash; indicated by <em>ispublishdate="1"</em> &ndash; from OC version 3.</p>
<p><em>size</em> field will return nano cache size as 'other size', while <em>size2</em> supports the new 'nano' cache size.</p>
<h3>cachedesc (Cachebeschreibungen)</h3>
<p>
&lt;cachedesc&gt;<br>

7
htdocs/lang/de/ocstyle/search.tpl.php
View File

@ -20,6 +20,7 @@
<!--
var mnAttributesShowCat2 = 1;
var maAttributes = new Array({attributes_jsarray});
var cachesizes = {cachesizes};
function _sbn_click()
{
@ -163,7 +164,7 @@ function sync_options(element)
if (tmpcachetype == "") tmpcachetype = "none";
var tmpcachesize = "";
for (i = 1; i <= 7; i++)
for (i = 1; i <= cachesizes; i++)
{
if (document.getElementById('cachesize' + i).checked == true)
{
@ -343,16 +344,16 @@ function switchAttributeCat2()
<td>
<table class="table">
<tr>
<td><input type="checkbox" id="cachesize8" name="cachesize8" value="8" onclick="javascript:sync_options(this)" class="checkbox" {cachesize2checked} /> <label for="cachesize2">{t}nano{/t}</label>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td><input type="checkbox" id="cachesize2" name="cachesize2" value="2" onclick="javascript:sync_options(this)" class="checkbox" {cachesize2checked} /> <label for="cachesize2">{t}micro{/t}</label></td>
<td><input type="checkbox" id="cachesize3" name="cachesize3" value="3" onclick="javascript:sync_options(this)" class="checkbox" {cachesize3checked} /> <label for="cachesize3">{t}small{/t}</label></td>
<td><input type="checkbox" id="cachesize4" name="cachesize4" value="4" onclick="javascript:sync_options(this)" class="checkbox" {cachesize4checked} /> <label for="cachesize4">{t}normal{/t}</label></td>
<td><input type="checkbox" id="cachesize5" name="cachesize5" value="5" onclick="javascript:sync_options(this)" class="checkbox" {cachesize5checked} /> <label for="cachesize5">{t}large{/t}</label></td>
</tr>
<tr>
<td><input type="checkbox" id="cachesize5" name="cachesize5" value="5" onclick="javascript:sync_options(this)" class="checkbox" {cachesize5checked} /> <label for="cachesize5">{t}large{/t}</label></td>
<td><input type="checkbox" id="cachesize6" name="cachesize6" value="6" onclick="javascript:sync_options(this)" class="checkbox" {cachesize6checked} /> <label for="cachesize6">{t}very large{/t}</label></td>
<td><input type="checkbox" id="cachesize7" name="cachesize7" value="7" onclick="javascript:sync_options(this)" class="checkbox" {cachesize7checked} /> <label for="cachesize7">{t}no container{/t}</label></td>
<td><input type="checkbox" id="cachesize1" name="cachesize1" value="1" onclick="javascript:sync_options(this)" class="checkbox" {cachesize1checked} /> <label for="cachesize1">{t}other size{/t}</label></td>
<td>&nbsp;</td>
</tr>
</table>
</td>

1
htdocs/lib/search.gpx.inc.php
View File

@ -86,6 +86,7 @@
$gpxContainer[5] = 'Large';
$gpxContainer[6] = 'Large';
$gpxContainer[7] = 'Virtual';
$gpxContainer[8] = 'Micro';
// known by gpx
$gpxType[0] = 'Unknown Cache';

1
htdocs/lib/search.gpx1.inc.php
View File

@ -90,6 +90,7 @@
$gpxContainer[5] = 'Large';
$gpxContainer[6] = 'Large';
$gpxContainer[7] = 'Virtual';
$gpxContainer[8] = 'Micro';
// known by gpx
$gpxType[0] = 'Other';

1
htdocs/lib/search.gpx2.inc.php
View File

@ -92,6 +92,7 @@
$gpxContainer[5] = 'Large';
$gpxContainer[6] = 'Large';
$gpxContainer[7] = 'Virtual';
$gpxContainer[8] = 'Micro';
// known by gpx
$gpxType[0] = 'Unknown Cache';

1
htdocs/search.php
View File

@ -1261,6 +1261,7 @@ function outputSearchForm($options)
tpl_set_var('cachetype' . $n . 'checked', ((strpos(';' . $options['cachetype'] . ';', ';' . $n . ';') !== false) || ($options['cachetype']=='')) ? ' checked="checked"' : '');
$nCount = sqlValue("SELECT COUNT(*) FROM `cache_size`", 0);
tpl_set_var('cachesizes', $nCount);
for ($n = 1; $n <= $nCount; $n++)
tpl_set_var('cachesize' . $n . 'checked', ((strpos(';' . $options['cachesize'] . ';', ';' . $n . ';') !== false) || ($options['cachesize']=='')) ? ' checked="checked"' : '');

5
htdocs/xml/ocxml11.dtd
View File

@ -7,7 +7,7 @@
<!ELEMENT attrlist (attr*)>
<!ELEMENT user (id, username, pmr, datecreated, lastmodified)>
<!ELEMENT cache (id, userid, name, longitude, latitude, type, status, country, size, desclanguages, difficulty, terrain, rating, waypoints, datehidden, datecreated, lastmodified)>
<!ELEMENT cache (id, userid, name, longitude, latitude, type, status, country, size, size2, desclanguages, difficulty, terrain, rating, waypoints, datehidden, datecreated, lastmodified)>
<!ELEMENT cachedesc (id, cacheid, language, shortdesc, desc, hint, lastmodified)>
<!ELEMENT cachelog (id, cacheid, userid, logtype, date, text, datecreated, lastmodified)>
<!ELEMENT picture (id, url, title, object, attributes, datecreated, lastmodified)>
@ -20,6 +20,9 @@
node CDATA #IMPLIED
>
<!ELEMENT datecreated (#PCDATA)>
<!ATTLIST datecreated
ispublishdate CDATA #IMPLIED
>
<!ELEMENT lastmodified (#PCDATA)>
<!-- attrlist -->

10
htdocs/xml/ocxml11.php
View File

@ -439,6 +439,13 @@ function outputXmlFile($sessionid, $filenr, $bXmlDecl, $bOcXmlTag, $bDocType, $z
while ($r = sql_fetch_array($rs))
{
$bAllowView = ($r['allow_user_view'] == 1);
// To avoid breaking existing XML clients, the new nano size is returned as other in "size" field
// and as nano in new "size2" field.
if ($r['size'] > 7)
$size1_id = 1;
else
$size1_id = $r['size'];
fwrite($f, $t1 . '<cache>' . "\n");
@ -450,7 +457,8 @@ function outputXmlFile($sessionid, $filenr, $bXmlDecl, $bOcXmlTag, $bDocType, $z
fwrite($f, $t2 . '<type id="' . $r['type'] . '" short="' . xmlentities($cachetypes[$r['type']]['short']) . '">' . xmlcdata($cachetypes[$r['type']]['de']) . '</type>' . "\n");
fwrite($f, $t2 . '<status id="' . $r['status'] . '">' . xmlcdata($cachestatus[$r['status']]['de']) . '</status>' . "\n");
fwrite($f, $t2 . '<country id="' . $r['country'] . '">' . xmlcdata($counties[$r['country']]['de']) . '</country>' . "\n");
fwrite($f, $t2 . '<size id="' . $r['size'] . '">' . xmlcdata($cachesizes[$r['size']]['de']) . '</size>' . "\n");
fwrite($f, $t2 . '<size id="' . $size1_id . '">' . xmlcdata($cachesizes[$size1_id]['de']) . '</size>' . "\n");
fwrite($f, $t2 . '<size2 id="' . $r['size'] . '">' . xmlcdata($cachesizes[$r['size']]['de']) . '</size2>' . "\n");
fwrite($f, $t2 . '<desclanguages>' . $r['desclanguages'] . '</desclanguages>' . "\n");
fwrite($f, $t2 . '<difficulty>' . sprintf('%01.1f', $r['difficulty'] / 2) . '</difficulty>' . "\n");
fwrite($f, $t2 . '<terrain>' . sprintf('%01.1f', $r['terrain'] / 2) . '</terrain>' . "\n");