adaptions for national OC sites

- made header logo configurable
- made main country and language configurable
- move German content to bottom of start page for other languages
- made toprating statistics interval configurable and country-dependend
- made "more new caches" link country-dependend
- fixed welcome messages
This commit is contained in:
following 2013-08-05 13:44:52 +02:00
parent fe78d752c8
commit 7aca9812a3
15 changed files with 114 additions and 35 deletions

View File

@ -112,6 +112,8 @@
// other settings
$opt['page']['showdonations'] = true;
$opt['page']['headoverlay'] = 'oc_head_alpha3';
$opt['logic']['pictures']['dummy']['replacepic'] = $dev_basepath . $dev_codepath . 'htdocs/images/no_image_license.png';
$opt['logic']['license']['disclaimer'] = true;

View File

@ -179,6 +179,12 @@
*/
$opt['debug'] = DEBUG_DEVELOPER;
/* Main locale and style: The country and language with most content on this site.
*
*/
$opt['page']['main_country'] = 'DE';
$opt['page']['main_locale'] = 'DE';
/* Default locale and style
*
*/
@ -202,7 +208,6 @@
$opt['page']['develsystem'] = false;
$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // reference productive installation for this OC code fork
/* maximum number of failed logins per hour before that IP address is blocked
* (used to prevent brute-force-attacks)
*/
@ -221,6 +226,7 @@
// directory of rotator pictures and script, relative to head images dir
$opt['page']['headimagepath'] = '';
$opt['page']['headoverlay'] = 'oc_head_alpha3_generic';
/* disable or enable https access to the main site
* if false and connection is https, redirect to $opt['page']['absolute_url']
@ -284,6 +290,8 @@
*
*/
$opt['logic']['rating']['percentageOfFounds'] = 10;
$opt['logic']['rating']['topdays_mainCountry'] = 30;
$opt['logic']['rating']['topdays_otherCountry'] = 180;
/*
* count of identical logs (date and text) that shows a warning message on

View File

@ -973,7 +973,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('78', 'Italian',
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('79', 'Icelandic', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('80', 'Start', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('81', 'What do i find on this website?', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('82', '<p>You can find everything you need to go Geocaching ...</p>', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('82', 'You can find everything you need to go Geocaching ...', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('83', 'The file was not uploaded correctly.', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('84', 'The file was too big. The maximum file size is 250 KB.', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('85', 'No picture file given.', '2010-08-28 11:48:03');
@ -2180,7 +2180,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1705', '<br /><
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1706', 'This OC node', '2010-10-18 21:30:30');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1707', 'Other OC nodes', '2010-10-18 21:30:30');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1708', 'The next events in %1', '2010-10-21 22:54:23');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1709', 'Geocaches with most ratings in the last 30 days in %1.', '2010-10-21 22:54:23');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1709', 'Geocaches with most ratings in the last %2 days in %1.', '2010-10-21 22:54:23');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1710', 'Newest caches in %1', '2010-10-21 22:54:23');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1711', 'You need additional %1 finds, to make another recommendation.', '2010-11-29 21:04:17');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1713', 'You have recommended this cache.', '2010-11-29 21:04:55');
@ -6208,7 +6208,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 ('1706', 'DE', 'Diese OC-Seite', '2010-10-18 21:33:47');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1707', 'DE', 'Andere OC-Seiten', '2010-10-18 21:33:29');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1708', 'DE', 'Die nächsten Events in %1', '2010-10-21 22:57:12');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'DE', 'Geocaches mit den meisten Empfehlungen innerhalb der letzten 30 Tage in %1.', '2010-10-21 22:57:47');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'DE', 'Geocaches mit den meisten Empfehlungen innerhalb der letzten %2 Tage in %1.', '2010-10-21 22:57:47');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1710', 'DE', 'Neueste Caches in %1', '2010-10-21 22:56:53');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1711', 'DE', 'Du benötigst noch %1 Funde, um eine weitere Empfehlung vorzunehmen.', '2010-11-29 21:06:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1713', 'DE', 'Du hast diesen Cache empfohlen.', '2010-12-18 23:17:58');
@ -6668,7 +6668,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 ('79', 'EN', 'Icelandic', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('80', 'EN', 'Home', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('81', 'EN', 'Welcome to opencaching.de', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'EN', '<p>On this page you will find Geocaches from all over the world, with focus on Germany, Austria, Switzerland, Italy and Spain. We also offer information on miscellaneous geocaching topics, and a forum (message board) and chat for communicating with other cachers.</p><p>If you would like to propagate geocaching in your own country, you may run your own Opencaching site in your own language, using our <a href=\"https://github.com/OpencachingDeutschland/oc-server3\" target=\"_blank\">software</a> and known-how. The long-term plan is to form a global geocaching network out of all Opencaching sites. Please contact us in our <a href=\"http://forum.opencaching-network.org/index.php?board=24.0\" target=\"_blank\">international forum</a> for more information.</p>', '2013-02-11 14:25:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'EN', 'On this page you will find Geocaches from all over the world, with focus on Germany, Austria, Switzerland, Italy and Spain. We also offer information on miscellaneous geocaching topics, and a forum (message board) and chat for communicating with other cachers.</p><p class=\"startmessage\">If you would like to propagate geocaching in your own country, you may run your own Opencaching site in your own language, using our <a href=\"https://github.com/OpencachingDeutschland/oc-server3\" target=\"_blank\">software</a> and known-how. The long-term plan is to form a global geocaching network out of all Opencaching sites. Please contact us in our <a href=\"http://forum.opencaching-network.org/index.php?board=24.0\" target=\"_blank\">international forum</a> for more information.', '2013-02-11 14:25:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('83', 'EN', 'The file was not uploaded correctly.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('84', 'EN', 'The file was too big. The maximum file size is 250 KB.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('85', 'EN', 'No picture file given.', '2010-08-28 11:48:07');
@ -7875,7 +7875,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 ('1706', 'EN', 'This OC node', '2010-10-21 22:55:51');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1707', 'EN', 'Other OC nodes', '2010-10-21 22:55:43');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1708', 'EN', 'The next events in %1', '2010-10-21 22:55:16');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'EN', 'Geocaches with most ratings in the last 30 days in %1.', '2010-10-21 22:54:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'EN', 'Geocaches with most recommendations in the last %2 days in %1.', '2010-10-21 22:54:59');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1710', 'EN', 'Newest caches in %1', '2010-10-21 22:54:47');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1711', 'EN', 'You need %1 more found log(s) to make another recommendation.', '2012-08-24 17:35:49');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1713', 'EN', 'You have recommended this cache.', '2012-08-24 17:35:49');
@ -8323,7 +8323,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 ('79', 'ES', 'Islandes', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('80', 'ES', 'Inicio', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('81', 'ES', '¿Que me parece en este sitio?', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'ES', '<p>En esta página podrás encontrar geocaches en todo el mundo, con especial atención a Alemania, Austria, Suiza, Italia y España. También ofrecemos información sobre temas diversos geocaching, y un foro (tablón de anuncios) y chat para comunicarse con otros cachers.</p><p>Si desea propagar geocaching en su propio país, puede ejecutar su propio Opencaching sitio en su propio idioma, utilizando la <a href=\"https://github.com/OpencachingDeutschland/oc-server3\" target=\"_blank\">software</a> y sabe cómo. Por favor, póngase en contacto con nosotros en nuestro foro internacional para más información.</p>', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'ES', 'En esta página podrás encontrar geocaches en todo el mundo, con especial atención a Alemania, Austria, Suiza, Italia y España. También ofrecemos información sobre temas diversos geocaching, y un foro (tablón de anuncios) y chat para comunicarse con otros cachers.', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('83', 'ES', 'El archivo no se ha subido correctamente.', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('84', 'ES', 'El archivo era demasiado grande. Se permite un máximo de 250 KB.', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('85', 'ES', 'No hay imagen de archivo determinado.', '2010-12-09 00:17:56');
@ -9526,7 +9526,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 ('1706', 'ES', 'Esto es un nodo OC', '2010-12-09 00:18:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1707', 'ES', 'Otros nodos OC', '2010-12-09 00:18:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1708', 'ES', 'El próximo evento en %1', '2010-12-09 00:18:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'ES', 'Geocaches con mayor valoración en los últimos 30 días en %1', '2010-12-09 00:18:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'ES', 'Geocaches con mayor valoración en los últimos %2 días en %1', '2010-12-09 00:18:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1710', 'ES', 'Últimos caches en %1', '2010-12-09 00:18:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1711', 'ES', 'Necesitas %1 encuentros adicionales, para realizar otra recomendación.', '2012-08-24 17:43:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1713', 'ES', 'Has recomendado este cache.', '2012-08-24 17:43:19');
@ -9882,7 +9882,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 ('79', 'IT', 'Islandese', '2010-08-28 21:27:05');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('80', 'IT', 'Inizio', '2010-08-28 21:19:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('81', 'IT', 'Che cosa trovo in questo sito?', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'IT', '<p>In questa pagina trovi le Geocache di tutto il mondo, con particolare riguardo a Germania, Austria, Italia e Spagna. Offriamo anche informazioni su svariati argomenti, e un forum (scambio messaggi) con chat per comunicare con altrio cachers.</p><p>Se vuoi propagare il geocaching nella tua nazione, puoi creare un sito Opencaching nella tua lingua, usando il nostro <a href=\"https://github.com/OpencachingDeutschland/oc-server3\" target=\"_blank\">software</a> e le nostre conoscenze. Per favore contattaci sul forum internazionale per maggiori informazioni.</p>', '2010-12-19 00:27:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'IT', 'In questa pagina trovi le Geocache di tutto il mondo, con particolare riguardo a Germania, Austria, Italia e Spagna. Offriamo anche informazioni su svariati argomenti, e un forum (scambio messaggi) con chat per comunicare con altrio cachers.', '2010-12-19 00:27:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('83', 'IT', 'Il file non è stato caricato correttamente.', '2010-08-28 21:20:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('84', 'IT', 'Il file è troppo grande. La dimensione massima è 250 KB.', '2010-08-28 21:21:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('85', 'IT', 'File per l\'immagine non definito.', '2010-08-28 21:22:12');
@ -11089,7 +11089,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 ('1706', 'IT', 'Questo nodo OC', '2010-10-27 18:49:20');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1707', 'IT', 'Altri nodi OC', '2010-10-27 18:49:20');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1708', 'IT', 'I prossimi eventi in %1', '2010-10-27 18:49:20');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'IT', 'Geocache con più valutazioni negli ultimi 30 giorni in %1', '2010-10-27 18:49:20');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'IT', 'Geocache con più valutazioni negli ultimi %2 giorni in %1', '2010-10-27 18:49:20');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1710', 'IT', 'Ultime cache in %1', '2010-10-27 18:49:20');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1711', 'IT', 'Devi trovare ancora %1 cache per fare un\' altra raccomandazione', '2010-12-05 00:03:28');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1713', 'IT', 'Hai raccomandato questa cache.', '2012-08-26 02:39:48');
@ -11536,7 +11536,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 ('79', 'NL', 'Ijslands', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('80', 'NL', 'Startpagina', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('81', 'NL', 'Welkom op opencaching.nl', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'NL', '<p>Hier kan alles gevonden worden wat met Geocaching te maken heeft, als beginner of iemand die veel ervaring heeft. van een eenvoudige wiki tot forum waar met andere cachers gediscussieerd kan worden.</p>', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'NL', 'Hier kan alles gevonden worden wat met Geocaching te maken heeft, als beginner of iemand die veel ervaring heeft. van een eenvoudige wiki tot forum waar met andere cachers gediscussieerd kan worden.', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('83', 'NL', 'Bij de dataoverdracht is een fout opgetreden.', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('84', 'NL', 'Het bestand is te groot, de maximale grootte is 250 KB.', '2011-02-04 19:49:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('85', 'NL', 'Geen afbeelding opgegeven.', '2011-02-04 19:49:56');
@ -12399,7 +12399,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 ('1706', 'NL', 'Deze OC-site', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1707', 'NL', 'Andere OC-sites', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1708', 'NL', 'De volgende evenementen in %1', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'NL', 'Caches met de meeste aanbevelingen van de laatste 30 dagen in %1.', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1709', 'NL', 'Caches met de meeste aanbevelingen van de laatste %2 dagen in %1.', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1710', 'NL', 'Nieuwste caches in %1', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1711', 'NL', 'U dient nog %1 cache(s) te vinden om een aanbeveling te geven.', '2011-02-04 19:50:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1713', 'NL', 'U heeft deze Cache aanbevolen.', '2011-02-04 19:50:08');
@ -12449,7 +12449,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 ('73', 'PL', 'Najnowsze logi', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('74', 'PL', 'Polski', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('81', 'PL', 'Co znajdziesz na tej stronie?', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'PL', '<p>Na tej stronie znajdziesz wszystko co dotyczy Geocachingu w Niemczech.</p>', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'PL', 'Na tej stronie znajdziesz wszystko co dotyczy Geocachingu w Niemczech.', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('87', 'PL', 'Opencaching.de', '2010-10-04 00:22:41');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('90', 'PL', 'Liczba aktywnych skrzynek: %1 | Liczba odkryć skrzynek: %2 | Liczba aktywnych użytkowników: %3', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('94', 'PL', 'Tak', '2010-08-28 11:48:08');
@ -12540,7 +12540,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 ('78', 'RU', 'Итальянский', '2010-10-06 22:23:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('79', 'RU', 'Исландский', '2010-10-06 22:23:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('80', 'RU', 'Начало', '2010-12-06 22:17:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'RU', '<p>Всё, что нужно для геокешинга…</p>', '2010-12-06 22:17:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('82', 'RU', 'Всё, что нужно для геокешинга…', '2010-12-06 22:17:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('86', 'RU', 'того же типа', '2010-12-06 22:17:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('92', 'RU', 'Хорватский', '2010-10-06 22:23:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('93', 'RU', 'Финский', '2010-10-06 22:23:06');

View File

@ -27,7 +27,7 @@
if (isset ($opt['page']['message']))
$tpl->assign('message',$opt['page']['message']);
else
$tpl->assign('message',$translate->t('<p>You can find everything you need to go Geocaching ...</p>', '', '', 0));
$tpl->assign('message',$translate->t('You can find everything you need to go Geocaching ...', '', '', 0));
// pictures
$tpl->assign('pictures', get_logpics(LOGPICS_FOR_STARTPAGE_GALLERY));
@ -124,13 +124,20 @@
// last 30 days' top ratings
$tpl->assign_rs('topratings', $getNew->rsForSmarty('rating'));
$tpl->assign('toprating_days', $getNew->ratingDays());
// country and language parameters
$sUserCountryName = sql_value("SELECT IFNULL(`sys_trans_text`.`text`, `countries`.`name`)
FROM `countries`
LEFT JOIN `sys_trans` ON `countries`.`trans_id`=`sys_trans`.`id`
LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND `sys_trans_text`.`lang`='&2'
WHERE `countries`.`short`='&1'", '', $sUserCountry, $opt['template']['locale']);
$tpl->assign('usercountry', $sUserCountryName);
$tpl->assign('usercountryCode', $sUserCountry);
if ($opt['template']['locale'] == $opt['page']['main_locale'])
$tpl->assign('sections', array('news', 'events', 'logpics', 'recommendations', 'forum', 'newcaches'));
else
$tpl->assign('sections', array('events', 'recommendations', 'newcaches', 'logpics', 'forum', 'news'));
}
$tpl->display();

View File

@ -55,7 +55,7 @@
<head>
<title><?php echo $tpl_subtitle; ?>{title}</title>
<meta name="keywords" content="Geocaching, Geocache, Cache, Geocashing, Schnitzeljagd, Schatzsuche, GPS, Openstreetmap, kostenlos, GPX, GPX download, Koordinaten, Hobby, Natur" />
<meta name="description" content="Geocaching ist ein GPS-Schatzsuche-Spiel: Es werden kleine Behälter versteckt, die anhand der GPS-Koordinaten zu finden sind. Opencaching.de ist das freie Portal, um diese Verstecke mit anderen zu teilen." />
<meta name="description" content="Opencaching.de ist das freie Portal für Geocaching, ein GPS-Schatzsuche-Spiel: Es werden kleine Behälter versteckt, die anhand von GPS-Koordinaten zu finden sind." />
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
@ -186,7 +186,7 @@
<img src="resource2/{style}/images/head/rotator.php?path=<?php echo $opt['page']['headimagepath']; ?>" class="headerimagecontent" />
</div>
<div class="headerlogo">
<img src="resource2/{style}/images/oclogo/oc_head_alpha3.png" class="headerimagecontent" />
<img src="resource2/{style}/images/oclogo/<?php echo $opt['page']['headoverlay']; ?>.png" class="headerimagecontent" />
</div>
</div>

View File

@ -36,6 +36,7 @@
$opt['page']['subtitle1'] = 'Geocaching with Opencaching';
$opt['page']['subtitle2'] = '';
$opt['page']['headimagepath'] = '';
$opt['page']['headoverlay'] = 'oc_head_alpha3';
//id of the node
$oc_nodeid = 4;

View File

@ -72,6 +72,7 @@
$news_approver_email = 'news-approver@devel.opencaching.de';
$opt['page']['showdonations'] = false;
$opt['page']['headoverlay'] = 'oc_head_alpha3_generic';
//local database settings
$dbusername = 'username';

View File

@ -163,6 +163,7 @@ class OcSmarty extends Smarty
$optn['page']['subtitle1'] = isset($opt['locale'][$locale]['page']['subtitle1']) ? $opt['locale'][$locale]['page']['subtitle1'] : $opt['page']['subtitle1'];
$optn['page']['subtitle2'] = isset($opt['locale'][$locale]['page']['subtitle2']) ? $opt['locale'][$locale]['page']['subtitle2'] : $opt['page']['subtitle2'];
$optn['page']['headimagepath'] = $opt['page']['headimagepath'];
$optn['page']['headoverlay'] = $opt['page']['headoverlay'];
$optn['page']['max_logins_per_hour'] = $opt['page']['max_logins_per_hour'];
$optn['page']['absolute_url'] = $opt['page']['absolute_url'];
$optn['page']['absolute_urlpath'] = parse_url($opt['page']['absolute_url'], PHP_URL_PATH);

View File

@ -139,7 +139,7 @@ class getNew
// check $args and set defaults
if (is_null($args) || !is_array($args))
{
$args = array($this->get_userCountry(), $opt['template']['locale'],10);
$args = array($this->get_userCountry(), $opt['page']['main_country'], 10);
}
// execute sql
@ -170,6 +170,26 @@ class getNew
}
/**
* ratingDays returns the number of days used for top rating calculation
*
* @return days
*/
public function ratingDays()
{
// global
global $opt;
// Calculate days dependend on country selection.
// Todo: make default country configurable and use this also for
// "except of [Germany]" new caches and logs lists
if ($this->get_userCountry() == 'DE')
return $opt['logic']['rating']['topdays_mainCountry'];
else
return $opt['logic']['rating']['topdays_otherCountry'];
}
/**
* ratingRs executes the database statements for type "rating"
*
@ -184,7 +204,12 @@ class getNew
// check $args and set defaults
if (is_null($args) || !is_array($args))
{
$args = array($this->get_userCountry(), $opt['template']['locale'],10);
$args = array(
$this->get_userCountry(),
$opt['template']['locale'],
10,
$this->ratingDays()
);
}
// execute sql
@ -211,7 +236,7 @@ class getNew
LEFT JOIN `sys_trans_text` ON `sys_trans_text`.`trans_id`=`countries`.`trans_id` AND `sys_trans_text`.`lang`='&2'
LEFT JOIN `caches_attributes` `ca` ON `ca`.`cache_id`=`caches`.`cache_id` AND `ca`.`attrib_id`=6
WHERE `caches`.`country`='&1' AND
`cache_rating`.`rating_date`>DATE_SUB(NOW(), INTERVAL 30 DAY) AND
`cache_rating`.`rating_date`>DATE_SUB(NOW(), INTERVAL &4 DAY) AND
`caches`.`type`!=6 AND
`caches`.`status`=1
GROUP BY `cache_rating`.`cache_id`

View File

@ -10,12 +10,14 @@
$tpl->menuitem = MNU_START_NEWCACHES;
$startat = isset($_REQUEST['startat']) ? $_REQUEST['startat']+0 : 0;
$country = isset($_REQUEST['country']) ? $_REQUEST['country'] : '';
$perpage = 100;
$startat -= $startat % $perpage;
if ($startat < 0) $startat = 0;
$tpl->caching = true;
$tpl->cache_id = $startat;
$tpl->cache_id = $startat . $country;
if ($startat > 10 * $perpage)
$tpl->cache_lifetime = 3600;
else
@ -40,7 +42,7 @@
LEFT JOIN `sys_trans_text` ON `sys_trans_text`.`trans_id` = `countries`.`trans_id`
AND `sys_trans_text`.`lang` = '" . sql_escape($opt['template']['locale']) . "'
LEFT JOIN `caches_attributes` `ca` ON `ca`.`cache_id`=`caches`.`cache_id` AND `ca`.`attrib_id`=6
WHERE `caches`.`status` = 1
WHERE `caches`.`status` = 1" . ($country ? " AND `caches`.`country`='" . sql_escape($country) . "'" : "") . "
ORDER BY `caches`.`date_created` DESC
LIMIT " . ($startat+0) . ', ' . ($perpage+0));
// see also write_newcaches_urls() in sitemap.class.php
@ -50,12 +52,31 @@
$tpl->assign('newCaches', $newCaches);
$startat = isset($_REQUEST['startat']) ? $_REQUEST['startat']+0 : 0;
$count = sql_value_slave('SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1', 0);
$pager = new pager("newcaches.php?startat={offset}");
if ($country == '')
{
$count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1", 0);
$pager = new pager("newcaches.php?startat={offset}");
}
else
{
$count = sql_value_slave("SELECT COUNT(*) FROM `caches` WHERE `caches`.`status`=1 AND `caches`.`country`='&1'", 0, $country);
$pager = new pager("newcaches.php?country=".$country."&startat={offset}");
}
$pager->make_from_offset($startat, $count, 100);
$tpl->assign('defaultcountry', $opt['template']['default']['country']);
$tpl->assign('countryCode', $country);
if ($country != '')
{
$tpl->assign(
'countryName',
sql_value("SELECT IFNULL(`sys_trans_text`.`text`, `countries`.`name`)
FROM `countries`
LEFT JOIN `sys_trans` ON `countries`.`trans_id`=`sys_trans`.`id`
LEFT JOIN `sys_trans_text` ON `sys_trans`.`id`=`sys_trans_text`.`trans_id` AND `sys_trans_text`.`lang`='&2'
WHERE `countries`.`short`='&1'", '', $country, $opt['template']['locale'])
);
}
}
$tpl->display();

View File

@ -304,6 +304,7 @@ div.cachedesc p {font-size: 100%;}
div.welcome p {line-height: 1.6em;}
p.inheader {margin:4px; font-size:125%;}
p.spacer_before {margin-top:12px;}
p.startmessage { line-height: 1.4em; }
/* Quote */
p.quote {clear: left; margin: 0em 30px 0.6em 30px; line-height: 120%; font-size: 110%;}
@ -1489,4 +1490,6 @@ p.editlog { font-weight: 400; display:inline; }
label.disabled { color:grey; }
.formlabel { color:#555; font-weight:bold; line-height:1.5em !important}
.smalltext { font-size:88% !important }
.smalltext { font-size:88% !important }
p.startmessage { line-height: 1.4em; }

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -5,8 +5,8 @@
***************************************************************************}
{* OCSTYLE *}
<div class="content2-pagetitle">
<img src="resource2/{$opt.template.style}/images/cacheicon/traditional.gif" style="align: left; margin-right: 10px;" width="32" height="32" alt="{t}Latest caches{/t}" />
{t}Latest caches{/t}
<img src="resource2/{$opt.template.style}/images/cacheicon/traditional.gif" style="align: left; margin-right: 10px;" width="32" height="32" alt="" />
{if $countryCode == ''}{t}Latest caches{/t}{else}{t 1=$countryName|escape}Newest caches in %1{/t}{/if}
</div>
<table width="100%" class="table">
@ -20,7 +20,7 @@
{foreach name=newCaches from=$newCaches item=newCache}
<tr>
<td style="width:1%; vertical-align:center">{$newCache.date_created|date_format:$opt.format.date}</td>
<td class="listicon"><img src="resource2/{$opt.template.style}/images/cacheicon/16x16-{$newCache.type}.gif" width="16" height="16" border="0" /></td><td style="vertical-align:center"> <a href="viewcache.php?wp={$newCache.wpoc}">{$newCache.cachename|escape}</a> {include file="res_oconly.tpl" oconly=$newCache.oconly} {t}by{/t} <a href="viewprofile.php?userid={$newCache.userid}">{$newCache.username|escape}</a> {if $newCache.country != $defaultcountry}&nbsp;&nbsp;<img src="images/flags/{$newCache.country|lower}.gif" alt="({$newCache.country_name})" title="{$newCache.country_name}" />{/if} </td>
<td class="listicon"><img src="resource2/{$opt.template.style}/images/cacheicon/16x16-{$newCache.type}.gif" width="16" height="16" border="0" /></td><td style="vertical-align:center"> <a href="viewcache.php?wp={$newCache.wpoc}">{$newCache.cachename|escape}</a> {include file="res_oconly.tpl" oconly=$newCache.oconly} {t}by{/t} <a href="viewprofile.php?userid={$newCache.userid}">{$newCache.username|escape}</a> {if $countryCode == '' && $newCache.country != $defaultcountry}&nbsp;&nbsp;<img src="images/flags/{$newCache.country|lower}.gif" alt="({$newCache.country_name})" title="{$newCache.country_name}" />{/if} </td>
</tr>
{/foreach}

View File

@ -6,12 +6,15 @@
<div class="content-txtbox-noshade">
<div class="content-txtbox-noshade">
<p style="line-height: 1.5em;">{$message}</p>
<p class="startmessage">{$message}</p>
<div class="buffer" style="width: 500px;">&nbsp;</div>
</div>
</div>
{foreach from=$sections item=section}
{* news or blog *}
{if $section == 'news'}
<div>
<div class="content2-container bg-blue02">
<table class="none" cellspacing="0" cellpadding="0" width="100%">
@ -60,6 +63,7 @@
{/if}
{* next events *}
{elseif $section == 'events'}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size3">
<img src="resource2/{$opt.template.style}/images/cacheicon/event.gif" style="align: left; margin-right: 10px;" width="24" height="24" alt="" />
@ -71,6 +75,7 @@
</div>
{* new logpix *}
{elseif $section == 'logpics'}
<div class="content2-container bg-blue02" style="margin-bottom:6px">
<p class="content-title-noshade-size3">
<img src="resource2/{$opt.template.style}/images/misc/32x32-pictures.gif" style="align: left; margin-right: 10px;" width="24" height="24" />
@ -81,19 +86,21 @@
{include file="res_logpictures.tpl" logdate=true loguser=true}
{* recommendations *}
{elseif $section == 'recommendations'}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size3">
<img src="resource2/{$opt.template.style}/images/misc/32x32-winner.png" style="align: left; margin-right: 10px;" width="24" height="24" alt="" />
<a href="tops.php" style="color:rgb(88,144,168); text-decoration: none;">{t}Current top ratings{/t}</a>
</p>
</div>
<p style="line-height: 1.6em;">{t 1=$usercountry|escape}Geocaches with most ratings in the last 30 days in %1.{/t}</p>
<p style="line-height: 1.6em;">{t 1=$usercountry|escape 2=$toprating_days}Geocaches with most ratings in the last %2 days in %1.{/t}</p>
<div style="margin-bottom:16px">
{include file="res_newratings.tpl" topratings=$topratings}
</div>
{* forum news *}
{elseif $section == 'forum'}
{if $phpbb_enabled==true}
<div class="buffer" style="width: 500px;height: 2px;">&nbsp;</div>
<div class="content2-container bg-blue02">
@ -131,14 +138,17 @@
{/if}
{* new caches *}
{elseif $section == 'newcaches'}
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size3">
<img src="resource2/{$opt.template.style}/images/cacheicon/traditional.gif" style="align: left; margin-right: 10px;" width="24" height="24" alt="" />
<a href="newcaches.php" style="color:rgb(88,144,168); text-decoration: none;">{t 1=$usercountry|escape}Newest caches in %1{/t}</a>
&nbsp; <span style="color:black; font-size:0.8em; font-weight:normal">[<a href="newcaches.php">{t}more{/t}...</a>]</span>
&nbsp; <span style="color:black; font-size:0.8em; font-weight:normal">[<a href="newcaches.php?country={$usercountryCode}">{t}more{/t}...</a>]</span>
</p>
</div>
<p style="line-height: 1.6em;">({t 1=$count_hiddens 2=$count_founds 3=$count_users}Total of %1 active Caches and %2 founds by %3 users{/t})</p>
{include file="res_newcaches.tpl" newcaches=$newcaches}
{/if}
{/foreach}

View File

@ -18,7 +18,7 @@
</title>
<meta name="keywords" content="Geocaching, Geocache, Cache, Geocashing, Schnitzeljagd, Schatzsuche, GPS, Openstreetmap, kostenlos, GPX, GPX download, Koordinaten, Hobby, Natur" />
{* siehe http://forum.opencaching-network.org/index.php?topic=3065.0 *}
<meta name="description" content="Geocaching ist ein GPS-Schatzsuche-Spiel: Es werden kleine Behälter versteckt, die anhand der GPS-Koordinaten zu finden sind. Opencaching.de ist das freie Portal, um diese Verstecke mit anderen zu teilen." />
<meta name="description" content="Opencaching.de ist das freie Portal für Geocaching, ein GPS-Schatzsuche-Spiel: Es werden kleine Behälter versteckt, die anhand von GPS-Koordinaten zu finden sind." />
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
@ -183,7 +183,7 @@
<img src="resource2/{$opt.template.style}/images/head/rotator.php?path={$opt.page.headimagepath}" class="headerimagecontent" />
</div>
<div class="headerlogo">
<img src="resource2/{$opt.template.style}/images/oclogo/oc_head_alpha3.png" class="headerimagecontent" />
<img src="resource2/{$opt.template.style}/images/oclogo/{$opt.page.headoverlay}.png" class="headerimagecontent" />
</div>
</div> <!-- header -->