This commit is contained in:
ocoliver
2012-11-17 22:53:58 +01:00
28 changed files with 384 additions and 144 deletions

View File

@@ -509,8 +509,8 @@
*/
// explanation of common login errors
$opt['cms']['login'] = 'http://blog.opencaching.de/?page_id=268';
$opt['cms']['login'] = 'http://wiki.opencaching.de/index.php/Login_auf_Opencaching.de';
// explanation of nature protection areas
$opt['cms']['npa'] = 'http://blog.opencaching.de/?page_id=274';
$opt['cms']['npa'] = 'http://wiki.opencaching.de/index.php/Schutzgebiete';
?>

View File

@@ -1759,7 +1759,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1279', '\<ht
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1292', 'Setting smilies is not supported', '2010-08-28 11:48:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1296', 'Only the following picture formats are allowed: BMP, GIF, PNG and JPEG.', '2010-08-28 11:48:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1297', 'at (time)', '2010-08-28 11:48:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1298', 'The following list is generated automatically by the given recommendations of the users. You can find more informations on regional classification in the <a href=\"http://blog.opencaching.de/?page_id=271\">help</a>.<br /> <br /> The numbers in the list below means:<br /> <img src=\"images/rating-star.gif\" border=\"0\" alt=\"Recommendations\"> Number of users that recommend this cache<br /> <img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Found\"> Checks = Number of time the cache was found<br /> Index tries to take the number of recommendations and founds in an order to show \'the best\' geocache first.<br /> <img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formula\">', '2010-08-28 12:03:52');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1298', 'The following list is generated automatically by the given recommendations of the users. You can find more informations on regional classification in the <a href=\"http://wiki.opencaching.de/index.php/Empfehlungen\">Wiki</a>.<br /> <br /> The numbers in the list below means:<br /> <img src=\"images/rating-star.gif\" border=\"0\" alt=\"Recommendations\"> Number of users that recommend this cache<br /> <img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Found\"> Checks = Number of time the cache was found<br /> Index tries to take the number of recommendations and founds in an order to show \'the best\' geocache first.<br /> <img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formula\">', '2010-08-28 12:03:52');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1299', 'File upload failed!', '2010-08-29 17:44:48');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1300', 'XML file could not be loaded!', '2010-08-29 17:44:53');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1301', 'SQL Export', '2010-08-29 17:45:41');
@@ -2226,6 +2226,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1797', 'Changel
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1798', 'Operator Association', '2012-08-08 14:16:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1799', 'Only available during specified seasons', '2012-10-29 14:28:00');
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');
-- Table sys_trans_ref
SET NAMES 'utf8';
@@ -4325,6 +4326,7 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1798'
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1798', 'table:sys_menu;field=title', '0');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1799', 'table:cache_attrib;field=html_desc', '0');
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');
-- Table sys_trans_text
SET NAMES 'utf8';
@@ -4540,7 +4542,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 ('216', 'DE', 'Noch nicht registriert?', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('217', 'DE', 'Passwort vergessen?', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('218', 'DE', 'E-Mail-Adresse vergessen?', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('219', 'DE', 'Weitere Ursachen findest du unter', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('219', 'DE', 'Weitere Hilfestellungen findest du im', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('220', 'DE', 'Druck ohne Logs', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('221', 'DE', 'Neues Passwort eingeben', '2010-08-28 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('222', 'DE', 'Erinnerung schicken', '2010-08-28 11:48:06');
@@ -5222,7 +5224,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 ('954', 'DE', 'Standard', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('957', 'DE', 'Chat/IRC', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1059', 'DE', 'Es ist bereits ein Account mit diesem Benutzername vorhanden.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'DE', 'Probleme beim Login', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'DE', 'Opencaching-Wiki', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1061', 'DE', 'Impressum', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1062', 'DE', 'Seitenberechnung', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1063', 'DE', 'Seitenerstellung', '2010-08-28 11:48:07');
@@ -5248,7 +5250,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 ('1292', 'DE', 'Smilies werden nicht unterstützt', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1296', 'DE', 'Nur die folgenden Dateiformate sind für Bilder erlaubt: BMP, GIF, PNG and JPEG.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1297', 'DE', 'am', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'DE', 'Die Liste wird automatisch anhand der Empfehlungen unserer Benutzer aktualisiert. Mehr Informationen zur regionalen Einteilung kannst du in der <a href=\"http://blog.opencaching.de/?page_id=271\">Hilfe</a> finden.<br />\r\n<br />\r\nDie Zahlen bedeuten Folgendes:<br />\r\n<img src=\"images/rating-star.gif\" border=\"0\" alt=\"Empfehlungen\"> Anzahl der Benutzer die diesen Geocache empfohlen haben<br />\r\n<img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Gefunden\"> Anzahl der Funde des Geocache<br />\r\nDer Index setzt die beiden Zahlen in Relation, um den besten Geocache zu ermitteln<br />\r\n<img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formel\">', '2010-08-28 12:10:29');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'DE', 'Die Liste wird automatisch anhand der Empfehlungen unserer Benutzer aktualisiert. Mehr Informationen zur regionalen Einteilung kannst du in der <a href=\"http://wiki.opencaching.de/index.php/Empfehlungen\" target=\"_blank\">Wiki</a> finden.<br />\r\n<br />\r\nDie Zahlen bedeuten Folgendes:<br />\r\n<img src=\"images/rating-star.gif\" border=\"0\" alt=\"Empfehlungen\"> Anzahl der Benutzer die diesen Geocache empfohlen haben<br />\r\n<img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Gefunden\"> Anzahl der Funde des Geocache<br />\r\nDer Index setzt die beiden Zahlen in Relation, um den besten Geocache zu ermitteln<br />\r\n<img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formel\">', '2010-08-28 12:10:29');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1299', 'DE', 'Datei upload fehlerhaft!', '2010-08-29 17:46:28');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1300', 'DE', 'XML Datei konnte nicht geladen werden!', '2010-08-29 17:50:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1301', 'DE', 'SQL Export', '2010-08-29 17:50:10');
@@ -5665,8 +5667,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1740', 'DE', '<Benutzer unbekannt>', '2011-04-04 21:27:10');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1741', 'DE', 'Der Account ist bereits aktiviert. Versuche dich bitte <a href=\"login.php\">einzuloggen</a>.<br />\r\nSollte der Login nicht möglich sein, lese bitte unter <a href=\"{$opt.cms.login}\">Loginprobleme</a> nach, wie du das Problem beheben kannst.\r\n', '2011-04-04 21:35:47');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1742', 'DE', 'Dein Browser hat das Cookie von Opencaching.de nicht gespeichert.<br />\r\nMehr Informationen findest du in der <a href=\"{$opt.cms.login}\">Opencaching.de-Hilfe</a>.', '2011-04-04 21:31:28');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'DE', 'Dieser Geocache liegt vermutlich in einem Naturschutzgebiet. Bitte verhalte dich entsprechend umsichtig! <font size=\"1\">(<a href=\"{$opt.cms.npa}\">Info</a>)</font>', '2011-04-04 21:26:14');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'DE', 'Dieser Geocache liegt vermutlich in den folgenden Schutzgebieten (<a href=\"{$opt.cms.npa}\">Info</a>):', '2011-04-04 21:23:13');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'DE', 'Dieser Geocache liegt vermutlich in einem Naturschutzgebiet. Bitte verhalte dich entsprechend umsichtig! <font size=\"1\">(<a href=\"{$opt.cms.npa}\" target=\"_blank\">Info</a>)</font>', '2011-04-04 21:26:14');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'DE', 'Dieser Geocache liegt vermutlich in den folgenden Schutzgebieten (<a href=\"{$opt.cms.npa}\" target=\"_blank\">Info</a>):', '2011-04-04 21:23:13');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1745', 'DE', 'Standardlogo', '2011-04-24 22:21:24');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1747', 'DE', 'Alternative by nybbler', '2011-04-24 22:21:14');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1752', 'DE', 'Alternativlogo', '2011-04-24 22:20:33');
@@ -5681,8 +5683,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1761', 'DE', 'Diese Notiz ist für andere Benutzer nicht sichtbar. Die Notiz und die Koordinaten sind in der GPX-Datei enthalten.', '2011-05-21 00:00:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1763', 'DE', 'Dein Browser hat das Cookie von Opencaching.de nicht gespeichert.<br /> Mehr Informationen findest du in der <a href=\"%1\">Opencaching.de-Hilfe</a>.', '2011-05-23 22:25:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1764', 'DE', 'Persönliche Notiz', '2011-05-21 00:02:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'DE', 'Dieser Geocache liegt vermutlich in einem Naturschutzgebiet. Bitte verhalte dich entsprechend umsichtig! <font size=\"1\">(<a href=\"{$opt.cms.npa}\">Info</a>)</font>', '2011-05-23 22:24:10');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'DE', 'Dieser Geocache liegt vermutlich in den folgenden Schutzgebieten (<a href=\"%1\">Info</a>):', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'DE', 'Dieser Geocache liegt vermutlich in einem Naturschutzgebiet. Bitte verhalte dich entsprechend umsichtig! <font size=\"1\">(<a href=\"{$opt.cms.npa}\" target=\"_blank\">Info</a>)</font>', '2011-05-23 22:24:10');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'DE', 'Dieser Geocache liegt vermutlich in den folgenden Schutzgebieten (<a href=\"%1\" target=\"_blank\">Info</a>):', '2011-05-23 22:18:40');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1767', 'DE', 'Schnellübersetzung', '2011-07-10 18:09:51');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1768', 'DE', 'Deaktivieren', '2011-07-10 18:10:02');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1769', 'DE', 'Aktivieren - neu', '2011-07-10 18:10:27');
@@ -5713,6 +5715,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 ('1798', 'DE', 'Verein', '2012-07-08 14:50:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1799', 'DE', 'Nur zu bestimmten Zeiten im Jahr', '2012-10-29 14:28:00');
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 ('1', 'EN', 'Reorder IDs \r', '2010-09-02 00:15:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'EN', 'The database could not be reconnected.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'EN', 'Testing please do not login', '2010-08-28 11:48:07');
@@ -6605,7 +6608,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 ('954', 'EN', 'Default', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('957', 'EN', 'Chat/IRC', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1059', 'EN', 'An account with that username already exists.', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'EN', 'Problems with login', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'EN', 'Opencaching-Wiki', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1061', 'EN', 'Terms of use and legal information', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1062', 'EN', 'Page performance', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1063', 'EN', 'Page creation', '2010-08-28 11:48:08');
@@ -6631,7 +6634,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 ('1292', 'EN', 'Setting smilies is not supported', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1296', 'EN', 'Only the following picture formats are allowed: BMP, GIF, PNG and JPEG.', '2010-08-28 11:50:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1297', 'EN', 'am', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'EN', 'The following list is generated automatically by the given recommendations of the users. You can find more informations on regional classification in the <a href=\"http://blog.opencaching.de/?page_id=271\">help</a>.<br /> <br /> The numbers in the list below means:<br /> <img src=\"images/rating-star.gif\" border=\"0\" alt=\"Recommendations\"> Number of users that recommend this cache<br /> <img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Found\"> Checks = Number of time the cache was found<br /> Index tries to take the number of recommendations and founds in an order to show \'the best\' geocache first.<br /> <img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formula\">', '2010-08-29 22:49:51');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'EN', 'The following list is generated automatically by the given recommendations of the users. You can find more informations on regional classification in the <a href=\"http://wiki.opencaching.de/index.php/Empfehlungen\" target=\"_blank\">Wiki</a>.<br /> <br /> The numbers in the list below means:<br /> <img src=\"images/rating-star.gif\" border=\"0\" alt=\"Recommendations\"> Number of users that recommend this cache<br /> <img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Found\"> Checks = Number of time the cache was found<br /> Index tries to take the number of recommendations and founds in an order to show \'the best\' geocache first.<br /> <img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formula\">', '2010-08-29 22:49:51');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1299', 'EN', 'File upload failed!', '2010-08-29 22:50:32');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1300', 'EN', 'XML file could not be loaded!', '2010-08-29 22:50:38');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1301', 'EN', 'SQL Export', '2010-08-29 23:28:25');
@@ -7049,8 +7052,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1740', 'EN', '<Unknown user>', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1741', 'EN', 'The account is already activated. Please try to <a href=\"login.php\">login</a>.<br /> If you cannot login, please read the following page: <a href=\"{$opt.cms.login}\">Login problems</a>', '2011-04-04 21:35:32');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1742', 'EN', 'Your browser has rejected our cookie.<br /> For more information on this topic, see <a href=\"{$opt.cms.login}\">Opencaching.de-help</a>.', '2011-04-04 21:31:45');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'EN', 'This geocache is probably placed within a nature reserve! Pleas read <a href=\"{$opt.cms.npa}\">this</a> for further information.', '2011-04-04 21:25:53');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'EN', 'This geocache is probably placed within the following nature reserves (<a href=\"{$opt.cms.npa}\">Info</a>):', '2011-04-04 21:23:58');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'EN', 'This geocache is probably placed within a nature reserve! Pleas read <a href=\"{$opt.cms.npa}\" target=\"_blank\">this</a> for further information.', '2011-04-04 21:25:53');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'EN', 'This geocache is probably placed within the following nature reserves (<a href=\"{$opt.cms.npa}\" target=\"_blank\">Info</a>):', '2011-04-04 21:23:58');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1745', 'EN', 'Default logo', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1747', 'EN', 'Alternative logo by nybbler', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1752', 'EN', 'Alternative logo', '2012-08-24 17:35:49');
@@ -7066,8 +7069,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1762', 'EN', 'Subscribe to feeds from opencaching', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1763', 'EN', 'Your browser has rejected our cookie.<br /> For more information on this topic, see <a href=\"%1\">Opencaching.de-help</a>.', '2011-05-23 22:25:18');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1764', 'EN', 'Personal cache note', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'EN', 'This geocache is probably placed within a nature protection area! Please see <a href=\"%1\">here</a> for further information.', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'EN', 'This geocache is probably placed within the following nature reserves (<a href=\"%1\">Info</a>):', '2011-05-23 22:19:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'EN', 'This geocache is probably placed within a nature protection area! Please see <a href=\"%1\" target=\"_blank\">here</a> for further information.', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'EN', 'This geocache is probably placed within the following nature reserves (<a href=\"%1\" target=\"_blank\">Info</a>):', '2011-05-23 22:19:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1767', 'EN', 'Quick translation', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1768', 'EN', 'Disable', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1769', 'EN', 'Enable - new', '2012-08-24 17:35:49');
@@ -7098,6 +7101,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 ('1798', 'EN', 'Verein', '2012-07-08 14:50:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1799', 'EN', 'Only available during specified seasons', '2012-10-29 14:28:00');
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 ('1', 'ES', 'Reordenar ID', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'ES', 'La base de datos no se pudo conectar.', '2010-12-09 00:17:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('3', 'ES', 'En pruebas - por favor, no entre.', '2010-12-09 00:17:55');
@@ -7990,7 +7994,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 ('954', 'ES', 'Standard', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('957', 'ES', 'Chat/IRC', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1059', 'ES', 'Ya existe una cuenta con este nombre de usuario existe.', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'ES', 'Problemas con la autentificación', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'ES', 'Opencaching-Wiki', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1061', 'ES', 'Condiciones de uso e información legal', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1062', 'ES', 'Página de presentación', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1063', 'ES', 'Creación de página', '2010-12-09 00:17:59');
@@ -8016,7 +8020,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 ('1292', 'ES', 'Smilies no son compatibles', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1296', 'ES', 'Sólo los siguientes formatos de archivo se permite para las imágenes: BMP, GIF, PNG y JPEG.', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1297', 'ES', 'a la (hora)', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'ES', 'La lista se actualizará automáticamente basado en las recomendaciones de nuestros usuarios. Más información sobre la división regional se puede en el <a href=\"http://blog.opencaching.de/?page_id=271\">Hilfe</a> finden.<br />\r\n<br />\r\nLos números indican lo siguiente:<br />\r\n<img src=\"images/rating-star.gif\" border=\"0\" alt=\"Empfehlungen\">Número de hallazgos del Geocache<br />\r\n<img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Que se encuentranquot;>Número de hallazgos del Geocache<br />\r\nEl índice es el número dos en relación a determinar el mejor Geocache<br />\r\n<img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formel\">', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'ES', 'La lista se actualizará automáticamente basado en las recomendaciones de nuestros usuarios. Más información sobre la división regional se puede en el <a href=\"http://wiki.opencaching.de/index.php/Empfehlungen\" target=\"_blank\">Wiki</a>.<br />\r\n<br />\r\nLos números indican lo siguiente:<br />\r\n<img src=\"images/rating-star.gif\" border=\"0\" alt=\"Empfehlungen\">Número de hallazgos del Geocache<br />\r\n<img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Que se encuentranquot;>Número de hallazgos del Geocache<br />\r\nEl índice es el número dos en relación a determinar el mejor Geocache<br />\r\n<img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formel\">', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1299', 'ES', '¡Archivo de errores de carga!', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1300', 'ES', '¡El fichero XML no se pudo cargar!', '2010-12-09 00:17:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1301', 'ES', 'Exportar SQL', '2010-12-09 00:17:59');
@@ -8433,8 +8437,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1740', 'ES', '<Usuario no conocido>', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1741', 'ES', 'La cuenta ya está activada. Por favor trate de <a href=\"login.php\">login</a>.<br /> Si no puede acceder, por favor lea la página siguiente: <a href=\"{$opt.cms.login}\">Login problems</a>', '2011-04-04 21:34:03');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1742', 'ES', 'Su navegador ha rechazado nuestra cookie.<br /> Para obtener más información sobre este tema, véase <a href=\"{$opt.cms.login}\">Opencaching.de-help</a>.', '2011-04-04 21:32:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'ES', 'Este geocache está probablemente en una reserva natural. ¡Por favor, en consecuencia compórtate con cuidado!<font size=\"1\">(<a href=\"{$opt.cms.npa}\">Info</a>)</font>', '2011-04-04 21:24:52');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'ES', 'Este geocache está probablemente en las siguientes áreas protegidas (<a href=\"{$opt.cms.npa}\">Info</a>):', '2011-04-04 21:24:38');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'ES', 'Este geocache está probablemente en una reserva natural. ¡Por favor, en consecuencia compórtate con cuidado!<font size=\"1\">(<a href=\"{$opt.cms.npa}\" target=\"_blank\">Info</a>)</font>', '2011-04-04 21:24:52');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'ES', 'Este geocache está probablemente en las siguientes áreas protegidas (<a href=\"{$opt.cms.npa}\" target=\"_blank\">Info</a>):', '2011-04-04 21:24:38');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1745', 'ES', 'Logo standard', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1747', 'ES', 'Alternativa para nybbler', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1752', 'ES', 'Alternativa de logo', '2012-08-24 17:43:19');
@@ -8450,8 +8454,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1762', 'ES', 'Suscribirse a los feeds de opencaching', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1763', 'ES', 'Su navegador ha rechazado nuestra cookie.<br /> Para obtener más información sobre este tema, véase <a href=\"%1\">Opencaching.de-help</a>.', '2011-05-23 22:26:26');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1764', 'ES', 'Nota persona del cache', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'ES', '¡Este geocache está probablemente situado dentro de una zona de protección de la naturaleza! Mira <a href=\"%1\">aqui</a> para obtener más información, por favor.', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'ES', 'Este geocache está probablemente en las siguientes áreas protegidas (<a href=\"%1\">Info</a>):', '2011-05-23 22:20:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'ES', '¡Este geocache está probablemente situado dentro de una zona de protección de la naturaleza! Mira <a href=\"%1\" target=\"_blank\">aqui</a> para obtener más información, por favor.', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'ES', 'Este geocache está probablemente en las siguientes áreas protegidas (<a href=\"%1\" target=\"_blank\">Info</a>):', '2011-05-23 22:20:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1767', 'ES', 'Traducción rápida', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1768', 'ES', 'Inhabilitar', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1769', 'ES', 'Habilitar - nuevo', '2012-08-24 17:43:19');
@@ -8480,6 +8484,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 ('1796', 'ES', 'Publicado en', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1797', 'ES', 'Cambios', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1798', 'ES', 'Verein', '2012-07-08 14:50:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1801', 'ES', 'Ayuda', '2012-11-09 19:32:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('6', 'FR', 'Pseudo', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('7', 'FR', 'Quite', '2010-10-04 00:17:39');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('24', 'FR', 'Prénom', '2010-10-04 00:17:39');
@@ -9458,7 +9463,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 ('954', 'IT', 'Standard', '2010-09-10 23:15:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('957', 'IT', 'Chat/IRC', '2010-09-10 23:15:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1059', 'IT', 'Esiste già un utente con questo nome.', '2010-09-10 23:15:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'IT', 'Problemi nella autenticazione', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'IT', 'Opencaching-Wiki', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1061', 'IT', 'Condizioni d\'uso e informazioni legali', '2010-09-10 23:15:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1062', 'IT', 'Pagina sulle prestazioni', '2010-09-10 23:15:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1063', 'IT', 'Creazione della pagina', '2010-10-27 18:49:19');
@@ -9484,7 +9489,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 ('1292', 'IT', 'L\'utilizzo degli smilies non è supportato', '2010-09-10 23:15:37');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1296', 'IT', 'Sono ammesse solo le immagini nei seguenti formati: BMP, GIF, PNG e JPEG.', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1297', 'IT', 'alle (ora)', '2010-08-28 22:26:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'IT', 'Questa lista è generata automaticamente sulla base delle raccomandazioni degli utenti. Puoi trovare maggiori informazioni sulla classificazione regionale nell\'<a href=\"http://blog.opencaching.de/?page_id=271\">help</a>.<br /> <br /> I numeri nella lista qui sotto significano:<br /> <img src=\"images/rating-star.gif\" border=\"0\" alt=\"Recommendations\"> Numbero di utenti che raccomandano questa cache<br /> <img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Found\"> Checks = Numero di volte in cui la cache è stata trovata<br /> L\' indice cerca di ordinare il numero di raccomandazioni e i ritrovamenti in modo da visualizzare per prime \'le migliori\' geocache.<br /> <img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formula\"> \r\n', '2010-08-28 22:26:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1298', 'IT', 'Questa lista è generata automaticamente sulla base delle raccomandazioni degli utenti. Puoi trovare maggiori informazioni sulla classificazione regionale nell <a href=\"http://wiki.opencaching.de/index.php/Empfehlungen\" target=\"_blank\">Wiki</a>.<br /> <br /> I numeri nella lista qui sotto significano:<br /> <img src=\"images/rating-star.gif\" border=\"0\" alt=\"Recommendations\"> Numbero di utenti che raccomandano questa cache<br /> <img src=\"resource2/%1/images/log/16x16-found.png\" width=\"16\" height=\"16\" border=\"0\" alt=\"Found\"> Checks = Numero di volte in cui la cache è stata trovata<br /> L\' indice cerca di ordinare il numero di raccomandazioni e i ritrovamenti in modo da visualizzare per prime \'le migliori\' geocache.<br /> <img src=\"images/tops-formula.png\" border=\"0\" alt=\"Formula\"> \r\n', '2010-08-28 22:26:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1299', 'IT', 'Errore caricamento file!', '2010-09-10 23:15:37');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1300', 'IT', 'Il file XML non può essere caricato!', '2010-09-10 23:15:37');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1301', 'IT', 'Esportazione SQL', '2010-09-10 23:15:37');
@@ -9901,8 +9906,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1740', 'IT', '<Utente sconosciuto>', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1741', 'IT', 'Questo utente è già stato attivato. Per favore prova a <a href=\"login.php\">connetterti</a>.<br />Se non è possibile connetterti, per favore leggi la pagina sui <a href=\"{$opt.cms.login}\">problemi con la connessione</a>', '2011-04-04 21:34:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1742', 'IT', 'Il tuo browser ha rifiutato il nostro cookie.<br/> Puoi trovare ulteriori informazioni su questo argomento in <a href=\"{$opt.cms.login}\">Opencaching.de-help</a>.', '2011-04-04 21:32:29');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'IT', 'Questa geocache probabilmente è situata in una riserva naturale! Per favore leggi <a href=\"{$opt.cms.npa}\">questo</a> per ulteriori informazioni.', '2011-04-04 21:25:24');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'IT', 'Questa geocache probabilmente è situata in una riserva naturale (<a href=\"{$opt.cms.npa}\">Info</a>):', '2011-04-04 21:24:22');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1743', 'IT', 'Questa geocache probabilmente è situata in una riserva naturale! Per favore leggi <a href=\"{$opt.cms.npa}\ target=\"_blank\"">questo</a> per ulteriori informazioni.', '2011-04-04 21:25:24');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1744', 'IT', 'Questa geocache probabilmente è situata in una riserva naturale (<a href=\"{$opt.cms.npa}\" target=\"_blank\">Info</a>):', '2011-04-04 21:24:22');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1745', 'IT', 'logo standard', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1747', 'IT', 'Alternativa per nybbler', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1752', 'IT', 'Logo alternativo', '2012-08-26 02:39:48');
@@ -9918,8 +9923,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1762', 'IT', 'Sottoscrivi i feeds di opencaching', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1763', 'IT', 'Il tuo browser ha rifiutato il nostro cookie.<br/> Puoi trovare ulteriori informazioni su questo argomento in <a href=\"%1\">Opencaching.de-help</a>.', '2011-05-23 22:26:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1764', 'IT', 'Nota personale per la cache', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'IT', 'Questa geocache è probabilmente situata all\'interno di un\'area naturale protetta! Per favore, vedi <a href=\"%1\">qui</a> per ulteriori informazioni.', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'IT', 'Questa geocache probabilmente è situata in una riserva naturale (<a href=\"%1\">Info</a>):', '2011-05-23 22:19:58');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1765', 'IT', 'Questa geocache è probabilmente situata all\'interno di un\'area naturale protetta! Per favore, vedi <a href=\"%1\" target=\"_blank\">qui</a> per ulteriori informazioni.', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'IT', 'Questa geocache probabilmente è situata in una riserva naturale (<a href=\"%1\" target=\"_blank\">Info</a>):', '2011-05-23 22:19:58');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1767', 'IT', 'Traduzione rapida', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1768', 'IT', 'Disabilita', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1769', 'IT', 'Abilita - nuova', '2012-08-26 02:39:48');
@@ -9948,6 +9953,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 ('1796', 'IT', 'Pubblicata il', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1797', 'IT', 'Elenco modifiche', '2012-08-26 02:39:48');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1798', 'IT', 'Verein', '2012-07-08 14:50:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1801', 'IT', 'Assistenza', '2012-11-09 19:32:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('922', 'JA', 'JA', '2011-05-15 16:04:51');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'NL', 'ID\'s opnieuw sorteren', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2', 'NL', 'De verbinding met de database kon niet hersteld worden.', '2011-02-04 19:49:56');

View File

@@ -54,7 +54,7 @@
{t}Not registered?{/t} <a href="register.php">{t}Register{/t}</a><br />
{t}Forgotten your password?{/t} <a href="newpw.php">{t}Create a new password{/t}</a><br />
{t}Forgotten your E-Mail-Address?{/t} <a href="remindemail.php">{t}Remind me{/t}</a><br />
{t}Here you can find more troubleshooting:{/t} <a href="http://blog.opencaching.de/?page_id=268">{t}Problems with login{/t}</a>.
{t}Here you can find more troubleshooting:{/t} <a href="http://wiki.opencaching.de/index.php/Login_auf_Opencaching.de" target="_blank">{t}Problems with login{/t}</a>.
</p>
<div class="buffer" style="width: 500px;">&nbsp;</div>
</div>

View File

@@ -759,7 +759,7 @@ class Okapi
{
public static $data_store;
public static $server;
public static $revision = 483; # This gets replaced in automatically deployed packages
public static $revision = 500; # This gets replaced in automatically deployed packages
private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */
@@ -1449,10 +1449,6 @@ class Okapi
)
);
private static $cache_statuses = array(
'Available' => 1, 'Temporarily unavailable' => 2, 'Archived' => 3
);
/** E.g. 'Traditional' => 2. For unknown names throw an Exception. */
public static function cache_type_name2id($name)
{
@@ -1479,6 +1475,10 @@ class Okapi
return "Other";
}
private static $cache_statuses = array(
'Available' => 1, 'Temporarily unavailable' => 2, 'Archived' => 3
);
/** E.g. 'Available' => 1. For unknown names throws an Exception. */
public static function cache_status_name2id($name)
{
@@ -1501,6 +1501,64 @@ class Okapi
return $reversed[$id];
return 'Archived';
}
private static $cache_sizes = array(
'none' => 7,
'nano' => 8,
'micro' => 2,
'small' => 3,
'regular' => 4,
'large' => 5,
'xlarge' => 6,
'other' => 1,
);
/** E.g. 'micro' => 2. For unknown names throw an Exception. */
public static function cache_size2_to_sizeid($size2)
{
if (isset(self::$cache_sizes[$size2]))
return self::$cache_sizes[$size2];
throw new Exception("Method cache_size2_to_sizeid called with invalid size2 '$size2'.");
}
/** E.g. 2 => 'micro'. For unknown ids returns "other". */
public static function cache_sizeid_to_size2($id)
{
static $reversed = null;
if ($reversed == null)
{
$reversed = array();
foreach (self::$cache_sizes as $key => $value)
$reversed[$value] = $key;
}
if (isset($reversed[$id]))
return $reversed[$id];
return "other";
}
/** Maps OKAPI's 'size2' values to opencaching.com (OX) size codes. */
private static $cache_OX_sizes = array(
'none' => null,
'nano' => 1.3,
'micro' => 2.0,
'small' => 3.0,
'regular' => 3.8,
'large' => 4.6,
'xlarge' => 4.9,
'other' => null,
);
/**
* E.g. 'micro' => 2.0, 'other' => null. For unknown names throw an
* Exception. Note, that this is not a bijection ('none' are 'other' are
* both null).
*/
public static function cache_size2_to_oxsize($size2)
{
if (array_key_exists($size2, self::$cache_OX_sizes))
return self::$cache_OX_sizes[$size2];
throw new Exception("Method cache_size2_to_oxsize called with invalid size2 '$size2'.");
}
/**
* E.g. 'Found it' => 1. For unsupported names throws Exception.
@@ -1578,9 +1636,18 @@ class Cache
* Save object $value under the key $key. Store this object for
* $timeout seconds. $key must be a string of max 64 characters in length.
* $value might be any serializable PHP object.
*
* If $timeout is null, then the object will be treated as persistent
* (the Cache will do its best to NEVER remove it).
*/
public static function set($key, $value, $timeout)
{
if ($timeout == null)
{
# The current cache implementation is ALWAYS persistent, so we will
# just replace it with a big value.
$timeout = 100*365*86400;
}
Db::execute("
replace into okapi_cache (`key`, value, expires)
values (
@@ -1613,6 +1680,12 @@ class Cache
{
if (count($dict) == 0)
return;
if ($timeout == null)
{
# The current cache implementation is ALWAYS persistent, so we will
# just replace it with a big value.
$timeout = 100*365*86400;
}
$entries = array();
foreach ($dict as $key => $value)
{

View File

@@ -16,6 +16,7 @@ namespace okapi\cronjobs;
use Exception;
use okapi\Okapi;
use okapi\BadRequest;
use okapi\Settings;
use okapi\OkapiLock;
use okapi\OkapiExceptionHandler;
@@ -43,6 +44,7 @@ class CronJobController
new CheckCronTab2(),
new ChangeLogWriterJob(),
new ChangeLogCleanerJob(),
new ChangeLogCheckerJob(),
new AdminStatsSender(),
new LocaleChecker(),
new FulldumpGeneratorJob(),
@@ -93,13 +95,27 @@ class CronJobController
$next_run = $cronjob->get_next_scheduled_run(isset($schedule[$name]) ? $schedule[$name] : time());
}
$schedule[$name] = $next_run;
Cache::set("cron_schedule", $schedule, 30*86400);
}
}
# Remove "stale" schedule keys (those which are no longer declared).
$fixed_schedule = array();
foreach (self::get_enabled_cronjobs() as $cronjob)
{
$name = $cronjob->get_name();
$fixed_schedule[$name] = $schedule[$name];
}
unset($schedule);
# Return the nearest scheduled event time.
$nearest = time() + 3600;
foreach ($schedule as $name => $time)
foreach ($fixed_schedule as $name => $time)
if ($time < $nearest)
$nearest = $time;
Cache::set("cron_schedule", $schedule, 30*86400);
Cache::set("cron_schedule", $fixed_schedule, 30*86400);
$lock->release();
return $nearest;
}
@@ -446,6 +462,22 @@ class ChangeLogWriterJob extends Cron5Job
}
}
/**
* Once per day, compares alle caches to the cached versions
* kept by the 'replicate' module. If it finds any inconsistencies, it
* emails the developers (such inconsistencies shouldn't happen) and it changes
* the okapi_syncbase column accordingly. See issue 157.
*/
class ChangeLogCheckerJob extends Cron5Job
{
public function get_period() { return 86400; }
public function execute()
{
require_once($GLOBALS['rootpath']."okapi/services/replicate/replicate_common.inc.php");
ReplicateCommon::verify_clog_consistency();
}
}
/**
* Once per week, generates the fulldump archive.
*/
@@ -473,17 +505,26 @@ class TileTreeUpdater extends Cron5Job
# No update necessary.
} elseif ($tiletree_revision < $current_clog_revision) {
require_once($GLOBALS['rootpath']."okapi/services/caches/map/replicate_listener.inc.php");
if ($current_clog_revision - $tiletree_revision < 100000) # In the middle of 2012, OCPL generated 30000 entries per week
if ($current_clog_revision - $tiletree_revision < 30000) # In the middle of 2012, OCPL generated 30000 entries per week
{
for ($i=0; $i<100; $i++) # This gives us no more than 20000 (?) at a time.
for ($timeout = time() + 240; time() < $timeout; ) # Try to stop after 4 minutes.
{
$response = OkapiServiceRunner::call('services/replicate/changelog', new OkapiInternalRequest(
new OkapiInternalConsumer(), null, array('since' => $tiletree_revision)));
\okapi\services\caches\map\ReplicateListener::receive($response['changelog']);
$tiletree_revision = $response['revision'];
Okapi::set_var('clog_followup_revision', $tiletree_revision);
if (!$response['more'])
break;
try {
$response = OkapiServiceRunner::call('services/replicate/changelog', new OkapiInternalRequest(
new OkapiInternalConsumer(), null, array('since' => $tiletree_revision)));
\okapi\services\caches\map\ReplicateListener::receive($response['changelog']);
$tiletree_revision = $response['revision'];
Okapi::set_var('clog_followup_revision', $tiletree_revision);
if (!$response['more'])
break;
} catch (BadRequest $e) {
# Invalid 'since' parameter? May happen whne crontab was
# not working for more than 10 days. Or, just after OKAPI
# is installed (and this is the first time this cronjob
# if being run).
\okapi\services\caches\map\ReplicateListener::reset();
Okapi::set_var('clog_followup_revision', $current_clog_revision);
}
}
} else {
# Some kind of bigger update. Resetting TileTree might be a better option.

View File

@@ -27,6 +27,7 @@ class WebService
return array(
'name' => (string)$attrs['name'],
'is_required' => $arg_node->getName() == 'req',
'is_deprecated' => (isset($attrs['class']) && (strpos($attrs['class'], 'deprecated') !== false)),
'class' => 'public',
'description' =>
(isset($attrs['default']) ? ("<p>Default value: <b>".$attrs['default']."</b></p>") : "").
@@ -120,16 +121,21 @@ class WebService
$result['arguments'][] = array(
'name' => 'format',
'is_required' => false,
'is_deprecated' => false,
'class' => 'common-formatting',
'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
);
$result['arguments'][] = array(
'name' => 'callback',
'is_required' => false,
'is_deprecated' => false,
'class' => 'common-formatting',
'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
);
}
foreach ($result['arguments'] as &$arg_ref)
if ($arg_ref['is_deprecated'])
$arg_ref['class'] .= " deprecated";
if (!$docs->returns)
throw new Exception("Missing <returns> element in the $methodname.xml file. ".
"If your method does not return anything, you should document in nonetheless.");

View File

@@ -38,11 +38,12 @@
<ul>
<li><b>name</b> - name of an argument,</li>
<li><b>is_required</b> - boolean, true if the argument is required,</li>
<li><b>is_deprecated</b> - boolean, true if the argument is deprecated,</li>
<li><b>description</b> - HTML-formatted description of an argument.</li>
<li>
<p><b>class</b> - one of the following values: <i>public</i>,
<i>inherited</i> or <i>common-formatting</i> (other values might be
introduced in future).</p>
<p><b>class</b> - space separated list of the following values: <i>public</i>,
<i>inherited</i>, <i>common-formatting</i> and <i>deprecated</i>
(other values might be introduced in future).</p>
<p>Currently these values do not mean anything specific. They are
used for different coloring/styling in the documentation pages.</p>
</li>

View File

@@ -36,23 +36,16 @@ class WebService
'Other' => 'Unknown Cache'
);
/** Maps OpenCaching cache sizes Geocaching.com size codes. */
/** Maps OKAPI's 'size2' values to geocaching.com size codes. */
public static $cache_GPX_sizes = array(
1 => 'Micro',
2 => 'Small',
3 => 'Regular',
4 => 'Large',
5 => 'Large',
null => 'Virtual'
);
/** Maps OpenCaching cache sizes opencaching.com (OX) size codes. */
public static $cache_OX_sizes = array(
1 => 2,
2 => 3,
3 => 4,
4 => 5,
5 => 5,
null => null
'none' => 'Virtual',
'nano' => 'Micro',
'micro' => 'Micro',
'small' => 'Small',
'regular' => 'Regular',
'large' => 'Large',
'xlarge' => 'Large',
'other' => 'Other',
);
public static function call(OkapiRequest $request)
@@ -121,7 +114,7 @@ class WebService
# We can get all the data we need from the services/caches/geocaches method.
# We don't need to do any additional queries here.
$fields = 'code|name|location|date_created|url|type|status|size'.
$fields = 'code|name|location|date_created|url|type|status|size|size2|oxsize'.
'|difficulty|terrain|description|hint|rating|owner|url|internal_id';
if ($vars['images'] != 'none')
$fields .= "|images";
@@ -149,7 +142,6 @@ class WebService
new OkapiInternalConsumer(), null, array()));
$vars['cache_GPX_types'] = self::$cache_GPX_types;
$vars['cache_GPX_sizes'] = self::$cache_GPX_sizes;
$vars['cache_OX_sizes'] = self::$cache_OX_sizes;
$response = new OkapiHttpResponse();
$response->content_type = "text/xml; charset=utf-8";

View File

@@ -35,7 +35,7 @@ http://www.gsak.net/xmlv1/5 http://www.gsak.net/xmlv1/5/gsak.xsd
<groundspeak:placed_by><?= htmlspecialchars($c['owner']['username'], ENT_COMPAT, 'UTF-8') ?></groundspeak:placed_by>
<groundspeak:owner id="<?= $c['owner']['uuid'] ?>"><?= htmlspecialchars($c['owner']['username'], ENT_COMPAT, 'UTF-8') ?></groundspeak:owner>
<groundspeak:type><?= $vars['cache_GPX_types'][$c['type']] ?></groundspeak:type>
<groundspeak:container><?= $vars['cache_GPX_sizes'][$c['size']] ?></groundspeak:container>
<groundspeak:container><?= $vars['cache_GPX_sizes'][$c['size2']] ?></groundspeak:container>
<groundspeak:difficulty><?= $c['difficulty'] ?></groundspeak:difficulty>
<groundspeak:terrain><?= $c['terrain'] ?></groundspeak:terrain>
<groundspeak:long_description html="True">
@@ -121,7 +121,7 @@ http://www.gsak.net/xmlv1/5 http://www.gsak.net/xmlv1/5/gsak.xsd
<ox:ratings>
<? if ($c['rating'] !== null) { ?><ox:awesomeness><?= $c['rating'] ?></ox:awesomeness><? } ?>
<ox:difficulty><?= $c['difficulty'] ?></ox:difficulty>
<? if ($c['size'] !== null) { ?><ox:size><?= $vars['cache_OX_sizes'][$c['size']] ?></ox:size><? } ?>
<? if ($c['oxsize'] !== null) { ?><ox:size><?= $c['oxsize'] ?></ox:size><? } ?>
<ox:terrain><?= $c['terrain'] ?></ox:terrain>
</ox:ratings>
<? if ($vars['attrs'] == 'ox:tags' && count($c['attrnames']) > 0) { /* Does user want us to include ox:tags? */ ?>

View File

@@ -89,8 +89,25 @@
</li>
<li><b>founds</b> - number of times the geocache was successfully found,</li>
<li><b>notfounds</b> - number of times the geocache was not found,</li>
<li><b>size</b> - float (between 1 and 5), size rating of the container, or
<b>null</b> if geocache does not have a container,</li>
<li class='deprecated'>
<b>size</b> - deprecated
(<a href='http://code.google.com/p/opencaching-api/issues/detail?id=155'>why?</a>),
use <b>size2</b> instead. Float (between 1 and 5), size rating of the container, or
<b>null</b> if geocache does not have a container,
</li>
<li>
<p><b>size2</b> - string indicating the size od the container, so called
"size2 code". One of the following values:
'none', 'nano', 'micro', 'small', 'regular', 'large', 'xlarge', 'other'.</p>
</li>
<li>
<p><b>oxsize</b> - float (between 1 and 5) or null, this is a size rating
variant, compatible with the one used by opencaching.com (and lately,
Garmin GPS devices).</p>
<p><b>Note:</b> The mapping is undocumented and may change without notice.</p>
<p><b>Note:</b> Some of OC's size values cannot be properly mapped to <b>oxcode</b>,
i.e. the 'other' size.</p>
</li>
<li><b>difficulty</b> - float (between 1 and 5), difficulty rating of the cache,</li>
<li><b>terrain</b> - float (between 1 and 5), terrain rating of the cache,</li>
<li>

View File

@@ -26,7 +26,7 @@ class WebService
private static $valid_field_names = array('code', 'name', 'names', 'location', 'type',
'status', 'url', 'owner', 'distance', 'bearing', 'bearing2', 'bearing3', 'is_found',
'is_not_found', 'founds', 'notfounds', 'size', 'difficulty', 'terrain',
'is_not_found', 'founds', 'notfounds', 'size', 'size2', 'oxsize', 'difficulty', 'terrain',
'rating', 'rating_votes', 'recommendations', 'req_passwd', 'description',
'descriptions', 'hint', 'hints', 'images', 'attrnames', 'latest_logs',
'my_notes', 'trackables_count', 'trackables', 'alt_wpts', 'last_found',
@@ -204,7 +204,23 @@ class WebService
case 'is_not_found': /* handled separately */ break;
case 'founds': $entry['founds'] = $row['founds'] + 0; break;
case 'notfounds': $entry['notfounds'] = $row['notfounds'] + 0; break;
case 'size': $entry['size'] = ($row['size'] < 7) ? (float)($row['size'] - 1) : null; break;
case 'size':
# Deprecated. Leave it for backward-compatibility. See issue 155.
switch (Okapi::cache_sizeid_to_size2($row['size']))
{
case 'none': $entry['size'] = null; break;
case 'nano': $entry['size'] = 1.0; break; # same as micro
case 'micro': $entry['size'] = 1.0; break;
case 'small': $entry['size'] = 2.0; break;
case 'regular': $entry['size'] = 3.0; break;
case 'large': $entry['size'] = 4.0; break;
case 'xlarge': $entry['size'] = 5.0; break;
case 'other': $entry['size'] = null; break; # same as none
default: throw new Exception();
}
break;
case 'size2': $entry['size2'] = Okapi::cache_sizeid_to_size2($row['size']); break;
case 'oxsize': $entry['oxsize'] = Okapi::cache_size2_to_oxsize(Okapi::cache_sizeid_to_size2($row['size'])); break;
case 'difficulty': $entry['difficulty'] = round($row['difficulty'] / 2.0, 1); break;
case 'terrain': $entry['terrain'] = round($row['terrain'] / 2.0, 1); break;
case 'rating':

View File

@@ -57,7 +57,10 @@
<p>A string "X-Y", where X and Y are integers between 1 and 5, and X &lt;= Y.
Only caches with difficulty rating between these numbers (inclusive) will be returned.</p>
</opt>
<opt name='size'>
<opt name='size' class='deprecated'>
<p>Deprecated. Please use <b>size2</b> instead - this will allow you to
differentiate "nano" vs. "micro" and "none" vs. "other" sizes
(<a href='http://code.google.com/p/opencaching-api/issues/detail?id=155'>details</a>).</p>
<p>A string "X-Y", where X and Y are integers between 1 and 5, and X &lt;= Y.
Only caches with size attribute between these numbers (inclusive) will be returned
(1 - micro, 5 - very big).</p>
@@ -66,6 +69,13 @@
with no container included, append "|X" suffix to the value of this parameter
(e.g. "3-5|X").</p>
</opt>
<opt name='size2'>
<p>Pipe-separated list of "size2 codes". Only matching caches will be
included. The codes are: 'none', 'nano', 'micro', 'small', 'regular',
'large', 'xlarge', 'other'.</p>
<p><b>Note:</b> Not all OC servers use all of these. I.e. OCPL does not
have 'nano' nor 'other' caches (but it might have them in the future).</p>
</opt>
<opt name='rating'>
<p>A string "X-Y", where X and Y are integers between 1 and 5, and X &lt;= Y.
Only caches with an overall rating between these numbers (inclusive) will be returned

View File

@@ -97,6 +97,34 @@ class SearchAssistant
$where_conds[] = "caches.type $operator ('".implode("','", array_map('mysql_real_escape_string', $types))."')";
}
#
# size2
#
if ($tmp = $request->get_parameter('size2'))
{
$operator = "in";
if ($tmp[0] == '-')
{
$tmp = substr($tmp, 1);
$operator = "not in";
}
$types = array();
foreach (explode("|", $tmp) as $name)
{
try
{
$id = Okapi::cache_size2_to_sizeid($name);
$types[] = $id;
}
catch (Exception $e)
{
throw new InvalidParam('size2', "'$name' is not a valid cache size.");
}
}
$where_conds[] = "caches.size $operator ('".implode("','", array_map('mysql_real_escape_string', $types))."')";
}
#
# status - filter by status codes
#
@@ -185,11 +213,17 @@ class SearchAssistant
}
break;
case 'size':
# Deprecated. Leave it for backward-compatibility. See issue 155.
if (($min == 1) && ($max == 5) && $allow_null) {
/* no extra condition necessary */
# No extra condition necessary ('other' caches will be
# included).
} else {
# 'other' size caches will NOT be included (user must use the
# 'size2' parameter to search these). 'nano' caches will be
# included whenever 'micro' caches are included ($min=1).
$where_conds[] = "(caches.size between $min+1 and $max+1)".
($allow_null ? " or caches.size=7" : "");
($allow_null ? " or caches.size=7" : "").
(($min == 1) ? " or caches.size=8" : "");
}
break;
case 'rating':

View File

@@ -65,7 +65,6 @@
set on him by the OC site. If criteria are not met, the request will
end with user error (HTTP 200, success=false).</p>
</opt>
<!--
<opt name='needs_maintenance' default='false'>
<p>Set to <b>true</b> if the user thinks that the cache needs some special attension
of its owner. Users should describe the reason for maintenance in their comments.</p>
@@ -75,7 +74,6 @@
only one of those entries). Moreover, on some OC servers this flag might be
<b>completely ignored</b> (not all OC servers support this feature).</p>
</opt>
-->
<common-format-params/>
<returns>
<p>A dictionary of the following structure:</p>

View File

@@ -19,7 +19,7 @@ use okapi\Settings;
class ReplicateCommon
{
private static $chunk_size = 200;
private static $logged_cache_fields = 'code|names|location|type|status|url|owner|founds|notfounds|size|difficulty|terrain|rating|rating_votes|recommendations|req_passwd|descriptions|hints|images|trackables_count|trackables|alt_wpts|last_found|last_modified|date_created|date_hidden';
private static $logged_cache_fields = 'code|names|location|type|status|url|owner|founds|notfounds|size|size2|oxsize|difficulty|terrain|rating|rating_votes|recommendations|req_passwd|descriptions|hints|images|trackables_count|trackables|alt_wpts|last_found|last_modified|date_created|date_hidden';
private static $logged_log_entry_fields = 'uuid|cache_code|date|user|type|comment';
@@ -69,7 +69,7 @@ class ReplicateCommon
/** Check for modifications in the database and update the changelog table accordingly. */
public static function update_clog_table()
{
$now = Db::select_value("select now()");
$now = Db::select_value("select date_add(now(), interval -1 minute)"); # See issue 157.
$last_update = Okapi::get_var('last_clog_update');
if ($last_update === null)
$last_update = Db::select_value("select date_add(now(), interval -1 day)");
@@ -99,7 +99,7 @@ class ReplicateCommon
foreach ($cache_code_groups as $cache_codes)
{
self::generate_changelog_entries('services/caches/geocaches', 'geocache', 'cache_codes',
'code', $cache_codes, self::$logged_cache_fields, false, true, 30*86400);
'code', $cache_codes, self::$logged_cache_fields, false, true, null);
}
# Same as above, for log entries.
@@ -147,13 +147,78 @@ class ReplicateCommon
Okapi::set_var("clog_revision", $revision);
}
/**
* Scan the database and compare the current values of old entries to
* the cached values of the same entries. If differences found, update
* okapi_syncbase accordingly, and email the admins.
*
* Currently, only caches are checked (log entries are not).
*/
public static function verify_clog_consistency()
{
set_time_limit(0);
ignore_user_abort(true);
# We will SKIP the entries which have been modified SINCE one day ago.
# Such entries might have not been seen by the update_clog_table() yet
# (e.g. other long-running cronjob is preventing update_clog_table from
# running).
$cache_codes = Db::select_column("
select wp_oc
from caches
where okapi_syncbase < date_add(now(), interval -1 day);
");
$cache_code_groups = Okapi::make_groups($cache_codes, 50);
unset($cache_codes);
# For each group, get the changelog entries, but don't store them
# (the "fulldump" mode). Instead, just update the okapi_syncbase column.
$sum = 0;
foreach ($cache_code_groups as $cache_codes)
{
$entries = self::generate_changelog_entries(
'services/caches/geocaches', 'geocache', 'cache_codes',
'code', $cache_codes, self::$logged_cache_fields, true, true, null
);
foreach ($entries as $entry)
{
if ($entry['object_type'] != 'geocache')
continue;
$cache_code = $entry['object_key']['code'];
Db::execute("
update caches
set okapi_syncbase = now()
where wp_oc = '".mysql_real_escape_string($cache_code)."'
");
$sum += 1;
}
}
if ($sum > 0)
{
Okapi::mail_from_okapi(
"rygielski@mimuw.edu.pl",
"verify_clog_consistency",
"Number of invalid entries fixed: $sum\n\n".
print_r(Db::select_all("select * from okapi_vars"), true)
);
}
}
/**
* Generate OKAPI changelog entries. This method will call $feeder_method OKAPI
* service with the following parameters: array($feeder_keys_param => implode('|', $key_values),
* 'fields' => $fields). Then it will generate the changelog, based on the result.
* This looks pretty much the same for various object types, that's why it's here.
*
* If $use_cache is true, then all the dictionaries from $feeder_method will be also
* kept in OKAPI cache, for future comparison.
* kept in OKAPI cache, for future comparison.
*
* In normal mode, update the changelog and don't return anything.
* In fulldump mode, return the generated changelog entries *instead* of
* updating it.
*/
private static function generate_changelog_entries($feeder_method, $object_type, $feeder_keys_param,
$key_name, $key_values, $fields, $fulldump_mode, $use_cache, $cache_timeout = 86400)
@@ -162,12 +227,21 @@ class ReplicateCommon
if ($use_cache)
{
$cache_keys = array();
$cache_keys1 = array();
$cache_keys2 = array();
foreach ($key_values as $key)
$cache_keys[] = 'clog#'.$object_type.'#'.$key;
$cached_values = Cache::get_many($cache_keys);
Cache::delete_many($cache_keys);
unset($cache_keys);
$cache_keys1[] = 'clog#'.$object_type.'#'.$key;
foreach ($key_values as $key)
$cache_keys2[] = 'clogmd5#'.$object_type.'#'.$key;
$cached_values1 = Cache::get_many($cache_keys1);
$cached_values2 = Cache::get_many($cache_keys2);
if (!$fulldump_mode)
{
Cache::delete_many($cache_keys1);
Cache::delete_many($cache_keys2);
}
unset($cache_keys1);
unset($cache_keys2);
}
# Get the current values for objects. Compare them with their previous versions
@@ -185,10 +259,21 @@ class ReplicateCommon
# Currently, the object exists.
if ($use_cache)
{
$diff = self::get_diff($cached_values['clog#'.$object_type.'#'.$key], $object);
# First, compare the cached hash. The hash has much longer lifetime
# than the actual cached object.
$cached_md5 = $cached_values2['clogmd5#'.$object_type.'#'.$key];
$current_md5 = md5(serialize($object));
if ($cached_md5 == $current_md5)
{
# The object was not changed since it was last replaced.
continue;
}
$diff = self::get_diff($cached_values1['clog#'.$object_type.'#'.$key], $object);
if (count($diff) == 0)
{
# No field has changed since the object was last replaced.
# Md5 differs, but diff does not. Weird, but it can happen
# (e.g. just after the md5 extension was introduced, or if
# md5 somehow expired before the actual object did).
continue;
}
}
@@ -201,13 +286,14 @@ class ReplicateCommon
if ($use_cache)
{
# Save the last-published state of the object, for future comparison.
$cached_values['clog#'.$object_type.'#'.$key] = $object;
$cached_values2['clogmd5#'.$object_type.'#'.$key] = $current_md5;
$cached_values1['clog#'.$object_type.'#'.$key] = $object;
}
}
else
{
# Currently, the object does not exist.
if ($use_cache && ($cached_values['clog#'.$object_type.'#'.$key] === false))
if ($use_cache && ($cached_values1['clog#'.$object_type.'#'.$key] === false))
{
# No need to delete, we have already published its deletion.
continue;
@@ -220,7 +306,8 @@ class ReplicateCommon
if ($use_cache)
{
# Cache the fact, that the object was deleted.
$cached_values['clog#'.$object_type.'#'.$key] = false;
$cached_values2['clogmd5#'.$object_type.'#'.$key] = false;
$cached_values1['clog#'.$object_type.'#'.$key] = false;
}
}
}
@@ -247,7 +334,10 @@ class ReplicateCommon
# Update the values kept in OKAPI cache.
if ($use_cache)
Cache::set_many($cached_values, $cache_timeout);
{
Cache::set_many($cached_values1, $cache_timeout);
Cache::set_many($cached_values2, null); # make it persistent
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -1,45 +0,0 @@
<?php
namespace okapi\views\attrlist;
use Exception;
use okapi\Okapi;
use okapi\Cache;
use okapi\Db;
use okapi\OkapiRequest;
use okapi\OkapiRedirectResponse;
use okapi\OkapiHttpResponse;
use okapi\ParamMissing;
use okapi\InvalidParam;
use okapi\OkapiServiceRunner;
use okapi\OkapiInternalRequest;
class View
{
public static function call()
{
# This is a hidden page for OKAPI developers. It will list all
# attributes defined in this OC installation.
$rs = Db::query("select id, language, text_long from cache_attrib order by id");
$dict = array();
while ($row = mysql_fetch_assoc($rs))
$dict[$row['id']][strtolower($row['language'])] = $row['text_long'];
$chunks = array();
foreach ($dict as $internal_id => $langs)
{
$chunks[] = "<attr code='...' internal_id='$internal_id'";
$langkeys = array_keys($langs);
sort($langkeys);
foreach ($langkeys as $langkey)
$chunks[] = " $langkey='".$langs[$langkey]."'";
$chunks[] = " />\n";
}
$response = new OkapiHttpResponse();
$response->content_type = "text/plain; charset=utf-8";
$response->body = implode("", $chunks);
return $response;
}
}

View File

@@ -35,7 +35,7 @@ $m = $vars['method'];
<td class='precaption' colspan='3'>
<table><tr>
<td>Minimum Authentication: <span class='level level<?= $m['auth_options']['min_auth_level'] ?>'>Level <?= $m['auth_options']['min_auth_level'] ?></span></td>
<td>(see <a href='<?= $vars['okapi_base_url'] ?>introduction#auth_level'>Authentication Levels</a>)</td>
<td>(see <a href='<?= $vars['okapi_base_url'] ?>introduction.html#auth_levels'>Authentication Levels</a>)</td>
</tr></table>
</td>
</tr>

View File

@@ -621,4 +621,5 @@ class View
private static function ver73() { Db::execute("update okapi_cache set score=1, expires=date_add(now(), interval 360 day) where `key` like 'tile/%'"); }
private static function ver74() { Db::execute("update okapi_cache set score=1, expires=date_add(now(), interval 360 day) where `key` like 'tilecaption/%'"); }
private static function ver75() { Db::execute("alter table okapi_cache modify column score float default null"); }
private static function ver76() { Db::execute("update okapi_cache set expires=date_add(now(), interval 100 year) where `key` like 'clog#geocache#%'"); }
}

View File

@@ -11,12 +11,12 @@
<table class="table">
<tr>
<td class="header-small"><b>Allgemeine Fragen zum Thema Geocaching</b></td>
<td class="header-small"><b>Allgemeine Fragen zu Opencaching.de und zum Thema Geocaching</b></td>
</tr>
<tr><td class="spacer"></td></tr>
<tr>
<td>
Für allgemeine Fragen zum Thema Geocaching ist <a href="http://www.geocaching.de">www.geocaching.de</a> eine gute Anlaufstelle.
Für Fragen rund um Opencaching und zum Thema Geocaching ist das <a href="http://wiki.opencaching.de">Opencaching-Wiki</a> eine gute Anlaufstelle. Weitere Informationen zum Geocaching gibt es auf <a href="http://www.geocaching.de">www.geocaching.de</a>.
<br />
<br />
Wenn du ein spezielles Problem hast und darauf keine Antwort findest,

View File

@@ -11,12 +11,12 @@
<table class="table">
<tr>
<td class="header-small"><b>General questions regarding Geocaching</b></td>
<td class="header-small"><b>General questions regarding Opencaching and Geocaching</b></td>
</tr>
<tr><td class="spacer"></td></tr>
<tr>
<td>
For general questions, there is a good German website named <a href="http://www.geocaching.de">www.geocaching.de</a>.
For general questions, you will find lots of information at the German websites <a href="http://wiki.opencaching.de">wiki.opencaching.de</a> and <a href="http://www.geocaching.de">www.geocaching.de</a>.
<br />
<br />
If you encounter a special problem, you may ask your questions in one of the German or international discussion boards at <a href="http://forum.geocaching-network.com/">forum.geocaching-network.com</a>.<br />

View File

@@ -66,7 +66,7 @@
{t}Not registered?{/t} <a href="register.php">{t}Register{/t}</a><br />
{t}Forgotten your password?{/t} <a href="newpw.php">{t}Create a new password{/t}</a><br />
{t}Forgotten your E-Mail-Address?{/t} <a href="remindemail.php">{t}Remind me{/t}</a><br />
{t}Here you can find more troubleshooting:{/t} <a href="http://blog.opencaching.de/?page_id=268">{t}Problems with login{/t}</a>.
{t}Here you can find more troubleshooting:{/t} <a href="http://wiki.opencaching.de/index.php/Login_auf_Opencaching.de" target="_blank">{t}Problems with login{/t}</a>.
</p>
<div class="buffer" style="width: 500px;">&nbsp;</div>
</div>

View File

@@ -13,7 +13,7 @@
<tr>
<td style="padding-left:32px; padding-bottom:32px;">
{t 1=$opt.template.style}The following list is generated automatically by the given recommendations of the users. You can find more informations on
regional classification in the <a href="http://blog.opencaching.de/?page_id=271">help</a>.<br />
regional classification in the <a href="http://wiki.opencaching.de/index.php/Empfehlungen">Wiki</a>.<br />
<br />
The numbers in the list below means:<br />
<img src="images/rating-star.gif" border="0" alt="Recommendations"> Number of users that recommend this cache<br />