diff --git a/doc/changes.txt b/doc/changes.txt index 5c98f9b0..f4c9a0a2 100644 --- a/doc/changes.txt +++ b/doc/changes.txt @@ -1,4 +1,10 @@ +for Version 3.0 changelog, see htdocs/templates2/ocstyle/articles/EN/changelog.tpl +for Database changelog, see htdocs/doc/sql/db-changes.txt + + + + Opencaching Network Implementation Version 2.0 Changes File diff --git a/htdocs/articles.php b/htdocs/articles.php index 3efaea0a..667ec45c 100644 --- a/htdocs/articles.php +++ b/htdocs/articles.php @@ -70,7 +70,7 @@ if (!$tpl->is_cached()) { $tpl->menuitem = sql_value("SELECT `id` FROM `sys_menu` WHERE `href`='&1' LIMIT 1", 0, 'articles.php?page=' . urlencode($article)); - if ($tpl->menuitem == 0 && $article != 'verein') // workaround for 4_Vs + if ($tpl->menuitem == 0) $tpl->redirect('index.php'); $tpl->assign('article', $article); diff --git a/htdocs/doc/sql/db-changes.txt b/htdocs/doc/sql/db-changes.txt new file mode 100644 index 00000000..4cc7dc19 --- /dev/null +++ b/htdocs/doc/sql/db-changes.txt @@ -0,0 +1,9 @@ +Database changes since Version 3.0 + +master branch + + +date commit ID change +---- --------- -------- +2012-08-06 1ba2be52 changed triggers sysTransBeforeInsert and sysTransTextBeforeInsert +2012-08-07 eda58c51 new field caches.is_publishdate; changed trigger cachesBeforeUpdate diff --git a/htdocs/doc/sql/static-data/data.sql b/htdocs/doc/sql/static-data/data.sql index ffbf17c1..6d1eb429 100644 --- a/htdocs/doc/sql/static-data/data.sql +++ b/htdocs/doc/sql/static-data/data.sql @@ -813,7 +813,7 @@ INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustrin INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('48', 'MNU_LOGIN_NEWPW', 'Change password', '491', 'Change password', '491', '0', 'newpw.php', '0', '32', '1', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('49', 'MNU_LOGIN_REMINDEMAIL', 'Remind E-Mail', '659', 'Remind E-Mail', '659', '0', 'remindemail.php', '0', '32', '3', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('50', 'MNU_CACHES_SEARCH_RECOMMENDATIONS', 'Recommendations', '55', 'Recommendations', '55', '0', 'recommendations.php', '0', '20', '1', '', '0', NULL); -INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('51', 'MNU_SITEMAP', 'Sitemap', '17', 'Sitemap', '17', '0', 'sitemap.php', '0', '0', '10', '#D5D9FF', '1', NULL); +INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('51', 'MNU_SITEMAP', 'Sitemap', '17', 'Sitemap', '17', '0', 'sitemap.php', '0', '0', '11', '#D5D9FF', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('52', 'MNU_ADMIN_DBMAINTAIN', 'Database maintainance', '672', 'DB Maintainance', '673', '1', 'dbmaintain.php', '1', '12', '2', '', '0', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('53', 'MNU_USER', 'User', '4', 'User', '4', '0', '', '0', '0', '5', '#FFFFC5', '0', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('54', 'MNU_USER_MAILTO', 'Send E-Mail', '148', 'Send E-Mail', '148', '0', 'mailto.php', '0', '53', '1', '', '0', NULL); @@ -833,6 +833,8 @@ INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustrin INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('69', 'MNU_START_TEAM', 'Our Team', '907', 'Our Team', '907', '0', 'articles.php?page=team', '1', '1', '7', '', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('70', 'MNU_MAP', 'Map', '1269', 'Map', '1269', '0', 'map2.php', '1', '0', '4', '#FFFFC5', '1', NULL); INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('85', 'MNU_CACHES_LOG', 'Create a logentry', '1687', 'Create a logentry', '1687', '0', 'log2.php', '0', '10', '10', '', '0', NULL); +INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('86', 'MNU_START_CHANGELOG', 'Changelog', '1797', 'Changelog', '1797', '0', 'articles.php?page=changelog', '0', '0', '10', '', '1', NULL); +INSERT INTO `sys_menu` (`id`, `id_string`, `title`, `title_trans_id`, `menustring`, `menustring_trans_id`, `access`, `href`, `visible`, `parent`, `position`, `color`, `sitemap`, `only_if_parent`) VALUES ('87', 'MNU_START_OPERATOR', 'Operator Association', '1798', 'Operator Association', '1798', '0', 'articles.php?page=verein', '0', '1', '12', '', '0', NULL); -- Table sys_trans SET NAMES 'utf8'; @@ -2218,6 +2220,8 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1793', 'No wayp INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1794', 'Additional waypoints can make searching easier, for example by pointing to a suitable parkering or start of a path. The waypoints are downloaded in the GPX-file.', '2011-07-15 22:34:44'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1795', 'Maps:', '2012-07-23 22:26:31'); INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1796', 'Published on', '2012-07-24 19:16:00'); +INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1797', 'Changelog', '2012-08-08 14:16:00'); +INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1798', 'Operator Association', '2012-08-08 14:16:00'); -- Table sys_trans_ref SET NAMES 'utf8'; @@ -4309,6 +4313,12 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1793' INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1794', './templates2/ocstyle/viewcache.tpl', '323'); INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1795', './templates2/ocstyle/viewcache.tpl', '235'); INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1796', './templates2/ocstyle/viewcache.tpl', '173'); +INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1797', './lang/de/ocstyle/main.tpl.php', '282'); +INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1797', './templates2/ocstyle/sys_main.tpl', '271'); +INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1797', 'table:sys_menu;field=menustring', '0'); +INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1797', 'table:sys_menu;field=title', '0'); +INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1798', 'table:sys_menu;field=menustring', '0'); +INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1798', 'table:sys_menu;field=title', '0'); -- Table sys_trans_text SET NAMES 'utf8'; @@ -5693,6 +5703,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 ('1794', 'DE', 'Zusätzliche Wegpunkte können die Suche vereinfachen, indem sie z.B. auf einem Parkplatz oder den Anfang der Strecke zeigen. Die Wegpunkte werden auch in der GPX-Datei gespeichert.', '2011-07-17 20:52:52'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1795', 'DE', 'Karten:', '2012-07-23 22:26:38'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1796', 'DE', 'Veröffentlicht am', '2012-07-23 22:26:38'); +INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1797', 'DE', 'Versionsgeschichte', '2012-07-08 14:50:00'); +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 ('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'); @@ -7006,6 +7018,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 ('1758', 'EN', 'The account is already activated. Please try to login.
If you cannot login, please read the following page: Login problems', '2011-05-23 22:29:04'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1763', 'EN', 'Your browser has rejected our cookie.
For more information on this topic, see Opencaching.de-help.', '2011-05-23 22:25:18'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'EN', 'This geocache is probably placed within the following nature reserves (Info):', '2011-05-23 22:19:23'); +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 ('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'); @@ -8320,6 +8333,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 ('1758', 'ES', 'La cuenta ya está activada. Por favor trate de login.
Si no puede acceder, por favor lea la página siguiente: Login problems', '2011-05-23 22:30:36'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1763', 'ES', 'Su navegador ha rechazado nuestra cookie.
Para obtener más información sobre este tema, véase Opencaching.de-help.', '2011-05-23 22:26:26'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'ES', 'Este geocache está probablemente en las siguientes áreas protegidas (Info):', '2011-05-23 22:20:30'); +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 ('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'); @@ -9726,6 +9740,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 ('1758', 'IT', 'Questo utente è già stato attivato. Per favore prova a connetterti.
Se non è possibile connetterti, per favore leggi la pagina sui problemi con la connessione', '2011-05-23 22:30:04'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1763', 'IT', 'Il tuo browser ha rifiutato il nostro cookie.
Puoi trovare ulteriori informazioni su questo argomento in Opencaching.de-help.', '2011-05-23 22:26:00'); INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1766', 'IT', 'Questa geocache probabilmente è situata in una riserva naturale (Info):', '2011-05-23 22:19:58'); +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 ('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'); diff --git a/htdocs/lang/de/ocstyle/lib/menu.php b/htdocs/lang/de/ocstyle/lib/menu.php index a2042498..3ebe97ff 100644 --- a/htdocs/lang/de/ocstyle/lib/menu.php +++ b/htdocs/lang/de/ocstyle/lib/menu.php @@ -233,12 +233,26 @@ $menu = array( 'menustring' => t('Message'), 'siteid' => 'message' ), + array( + 'title' => t('Changelog'), + 'visible' => false, + 'filename' => 'index.php', + 'menustring' => t('Changelog'), + 'siteid' => 'changelog' + ), array( 'title' => t('Sitemap'), 'visible' => false, 'filename' => 'index.php', 'menustring' => t('Sitemap'), 'siteid' => 'sitemap' + ), +array( + 'title' => t('Verein'), + 'visible' => false, + 'filename' => 'index.php', + 'menustring' => t('Verein'), + 'siteid' => 'verein' ) ); diff --git a/htdocs/lang/de/ocstyle/main.tpl.php b/htdocs/lang/de/ocstyle/main.tpl.php index 600a149a..7fbef5a0 100644 --- a/htdocs/lang/de/ocstyle/main.tpl.php +++ b/htdocs/lang/de/ocstyle/main.tpl.php @@ -279,7 +279,7 @@
-

{t}Privacy statement{/t} | {t}Terms of use and legal information{/t} | {t}Contact{/t} | {t}Sitemap{/t}

+

{t}Privacy statement{/t} | {t}Terms of use and legal information{/t} | {t}Contact{/t} | {t}Changelog{/t} | {t}Sitemap{/t}

{sponsorbottom}

diff --git a/htdocs/templates2/ocstyle/articles/DE/changelog.tpl b/htdocs/templates2/ocstyle/articles/DE/changelog.tpl new file mode 100644 index 00000000..a95af715 --- /dev/null +++ b/htdocs/templates2/ocstyle/articles/DE/changelog.tpl @@ -0,0 +1,46 @@ +{*************************************************************************** +* You can find the license in the docs directory +* +* Unicode Reminder メモ +***************************************************************************} +
+ Versionsgeschichte +
+
+ +

Opencaching Version 1.0 ging im Jahr 2006 online. In den nachfolgen Jahren wurde die Website stetig verbessert und zur Version 2 weiterentwickelt. Anfang 2011 wurde die Entwicklung vorübergehend eingestellt, bis der neue Verein Opencaching Deutschland sie Mitte 2012 unter der Versionsnummer 3.0 wieder aufnahm. Das neue Entwicklerteam arbeitet sich zunächst mit einfachen Aufgaben ein.

+

Im Folgenden sind alle Veränderungen ab OC Version 3.0 aufgelistet.

+

fix = Bugfix, chg = Funktion geändert/verbessert, new = neues Feature

+
+ +

Version 3.0.1 – 8. August 2012

+ + + +
\ No newline at end of file diff --git a/htdocs/templates2/ocstyle/articles/EN/changelog.tpl b/htdocs/templates2/ocstyle/articles/EN/changelog.tpl new file mode 100644 index 00000000..d163ab7c --- /dev/null +++ b/htdocs/templates2/ocstyle/articles/EN/changelog.tpl @@ -0,0 +1,42 @@ +{*************************************************************************** +* You can find the license in the docs directory +* +* Unicode Reminder メモ +***************************************************************************} +
+ Changelog +
+
+ +

Opencaching.de Version 1.0 went online in 2006 und was steadily enhanced in the following years, switching to Version 2. In the beginning of 2011, development was halted, until the new Opencaching Deutschland association restarted it in July 2012 at Version 3.0. The new developement team starts with simple tasks for learning the ropes.

+ +

This page lists all changes of version 3.0.

+ +

fix = bug fix, chg = changed/improved feature, new = new feature

+
+ +

Release 3.0.1 – August 8, 2012

+ + +
\ No newline at end of file diff --git a/htdocs/templates2/ocstyle/sys_main.tpl b/htdocs/templates2/ocstyle/sys_main.tpl index f99232ff..c9b88bcb 100644 --- a/htdocs/templates2/ocstyle/sys_main.tpl +++ b/htdocs/templates2/ocstyle/sys_main.tpl @@ -268,7 +268,7 @@ {* *}
-

{t}Privacy statement{/t} | {t}Terms of use and legal information{/t} | {t}Contact{/t} | {t}Sitemap{/t}

+

{t}Privacy statement{/t} | {t}Terms of use and legal information{/t} | {t}Contact{/t} | {t}Changelog{/t} | {t}Sitemap{/t}

{$opt.page.sponsor.bottom}