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

data license texts, translations, source style and some minor improvements

Browse Source
This commit is contained in:
following 2013-02-09 18:50:26 +01:00
parent a2e7c89b23
commit 48801e6841
9 changed files with 184 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/adminuser.php
View File

@ -17,6 +17,9 @@
if (($login->admin & ADMIN_USER) != ADMIN_USER)
$tpl->error(ERROR_NO_ACCESS);
if (isset($_REQUEST['success']) && $_REQUEST['success'])
$tpl->assign('success','1');
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'display';
@ -55,7 +58,7 @@ function sendCode()
function formAction()
{
global $tpl, $login;
global $tpl, $login, $translate;
$commit = isset($_REQUEST['chkcommit']) ? $_REQUEST['chkcommit']+0 : 0;
$delete = isset($_REQUEST['chkdelete']) ? $_REQUEST['chkdelete']+0 : 0;
@ -69,10 +72,10 @@ function formAction()
$username = $user->getUsername();
if ($delete + $disable + $disduelicense > 1)
$tpl->error('Please select only one of the delete/disable options!');
$tpl->error($translate->t('Please select only one of the delete/disable options!','','',0));
if ($commit == 0)
$tpl->error('You have to check that you are sure!');
$tpl->error($translate->t('You have to check that you are sure!','','',0));
if ($disduelicense == 1) {
$errmesg = $user->disduelicense();
@ -89,7 +92,8 @@ function formAction()
$tpl->error(ERROR_UNKNOWN);
}
$tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username));
$tpl->redirect('adminuser.php?action=searchuser&username=' . urlencode($username) .
'&success=' . ($disduelicense + $disable + $delete));
}
function searchUser()

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

@ -1010,7 +1010,6 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('172', 'Yemen',
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('173', 'Samoa', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('174', 'Go', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('175', 'Developer system - only testing', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('176', 'I\'ve read and understand the <a target=\"_blank\" href=\"articles.php?page=dsb\">privacy statement</a> and the <a target=\"_blank\" href=\"articles.php?page=tos\">terms of use</a> and accept them.', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('177', 'With this wizard, you can make some part of your description <b>bold</b> or <i>italic</i>. No HTML knowledge required.', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('178', 'Here you can see the HTML code generated from your text. If you want to make a word <b>bold</b>, insert before the word \&lt;b\&gt; and after the word \&lt;/b\&gt;', '2010-08-28 11:48:03');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('179', 'Wallis And Futuna Islands', '2010-08-28 11:48:03');
@ -1885,7 +1884,7 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1427', 'Publica
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1428', 'Publish now', '2010-09-07 20:19:05');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1429', 'Publish on', '2010-09-07 20:19:05');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1430', 'Do not publish now.', '2010-09-07 20:19:05');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1431', 'I have read and agree to the <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de Terms of Service</a>', '2010-09-07 20:19:05');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1431', 'I have read and agree to the <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de Terms of Service</a> and the <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Opencaching.de Datalicense</a>', '2010-09-07 20:19:05');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1432', 'Info: Your log entry has been removed from the cache owner', '2010-09-07 20:19:05');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1433', 'Selection of city', '2010-09-07 20:19:05');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1434', 'Total of {resultscount} cities matched', '2010-09-07 20:19:05');
@ -2228,6 +2227,20 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1799', 'Only av
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1800', 'This cache can be done at certain seasons only - see the cache description for more details. For example, the cache may be placed in a corn labyrinth, which only exists from bloom to harvest season.', '2012-10-29 14:28:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1801', 'Help', '2012-11-09 19:28:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1802', 'Warning: This report is already assigned to another admin. Consult him first before you assume the report!', '2013-01-30 16:26:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1804', 'Datalicense', '2013-02-09 18:28:52');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1805', 'The www.opencaching.de content is licensed under <br /><a rel=\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/de/\">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.', '2013-02-09 18:28:52');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1806', 'Please select only one of the delete/disable options!', '2013-02-09 17:34:01');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1807', 'By submitting I accept the <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de Terms of Service</a> and the <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Opencaching.de Datalicense</a>', '2013-02-09 19:12:41');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1808', 'I\'ve read and understand the <a target=\"_blank\" href=\"articles.php?page=dsb\">privacy statement</a>, the <a target=\"_blank\" href=\"articles.php?page=impressum#tos\">terms of service</a> and the <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Datalicense</a> and accept them.', '2013-02-09 19:06:41');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1809', 'You have to accept the privacy statement, terms of service and the datalicense to register at opencaching.de', '2013-02-09 19:06:41');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1810', 'When downloading this file, you accept our <a href=\"articles.php?page=impressum#tos\">terms of use</a> and <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Datalicense</a>.', '2013-02-09 19:12:30');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1811', 'Disable (and lock all geocaches owned) and remove all foreign licensed content', '2013-02-09 19:28:12');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1812', 'ID', '2013-02-09 19:28:46');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1813', 'Owner', '2013-02-09 19:28:46');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1814', 'Reporter', '2013-02-09 19:28:46');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1815', 'You have to check that you are sure!', '2013-02-09 17:34:01');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1816', 'cache description was removed because owner declined content license', '2013-02-09 17:34:01');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('1817', 'User status was successfully changed.', '2013-02-09 17:34:01');
-- Table sys_trans_ref
SET NAMES 'utf8';
@ -2622,7 +2635,6 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('172',
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('173', 'table:countries;field=name', '0');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('174', './templates2/ocstyle/sys_main.tpl', '190');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('175', './templates2/ocstyle/sys_main.tpl', '162');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('176', './templates2/ocstyle/register.tpl', '209');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('177', './templates2/ocstyle/htmlprev.tpl', '17');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('178', './templates2/ocstyle/htmlprev.tpl', '44');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('179', 'table:countries;field=name', '0');
@ -4329,6 +4341,23 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1799'
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1800', 'table:cache_attrib;field=html_desc', '0');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1801', './lang/de/ocstyle/lib/menu.php', '199');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1802', './lang/de/ocstyle/adminreports.tpl', '83');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1804', './lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1805', './lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1806', './adminuser.php', '72');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1807', './lang/de/ocstyle/editcache.tpl.php', '353');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1807', './lang/de/ocstyle/editdesc.tpl.php', '104');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1807', './lang/de/ocstyle/editlog.tpl.php', '146');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1807', './lang/de/ocstyle/log_cache.tpl.php', '140');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1808', '/mnt/server-3.0/htdocs/lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1809', '/mnt/server-3.0/htdocs/lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1810', '/mnt/server-3.0/htdocs/lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1811', '/mnt/server-3.0/htdocs/lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1812', '/mnt/server-3.0/htdocs/lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1813', '/mnt/server-3.0/htdocs/lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1814', '/mnt/server-3.0/htdocs/lib2/smarty/ocplugins/prefilter.t.php', '241');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1815', './adminuser.php', '75');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1816', './lib2/logic/user.class.php', '765');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('1817', './templates2/ocstyle/adminuser.tpl', '20');
-- Table sys_trans_text
SET NAMES 'utf8';
@ -5378,7 +5407,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 ('1428', 'DE', 'sofort veröffentlichen', '2012-07-24 21:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1429', 'DE', 'veröffentlichen am', '2012-07-24 21:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1430', 'DE', 'noch nicht veröffentlichen', '2012-07-24 21:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'DE', 'Die <a href=\"articles.php?page=impressum#tos\" target=\"_BLANK\">Opencaching.de-Nutzungsbedingungen</a> habe ich gelesen und bin damit einverstanden', '2010-09-10 23:39:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'DE', 'Die <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de-Nutzungsbedingungen</a> und <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">-Datenlizenz</a> habe ich gelesen und bin damit einverstanden.', '2010-09-10 23:39:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1432', 'DE', 'Info: dein Logeintrag wurde vom Cachebesitzer entfernt', '2010-09-10 23:39:09');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1433', 'DE', 'Ortsauswahl', '2010-09-10 23:39:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1434', 'DE', 'Insgesamt {resultscount} Ortschaften gefunden', '2010-09-10 23:38:52');
@ -5718,7 +5747,21 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
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 ('1802', 'DE', 'Warnung: Diese Cachemeldung wird bereits von einem anderen Admin bearbeitet. Bitte sprich dich mit ihm ab, bevor du sie &uuml;bernimmst!', '2013-01-30 16:28:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1802', 'DE', 'Warnung: Diese Cachemeldung wird bereits von einem anderen Admin bearbeitet. Bitte sprich dich mit ihm ab, bevor du sie \&uuml;bernimmst!', '2013-01-30 16:28:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1804', 'DE', 'Datenlizenz', '2013-02-09 18:29:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1805', 'DE', 'Der Inhalt von www.opencaching.de steht unter einer <br /><a rel=\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/de/\">Creative Commons Namensnennung-NichtKommerziell-KeineBearbeitun-3.0-Deutschland</a>-Lizenz</a>.', '2013-02-09 18:30:58');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1806', 'DE', 'Bitte waehle nur eine der Lösch-/Sperroptionen aus!', '2013-02-09 17:34:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1807', 'DE', 'Mit dem Absenden akzeptiere ich die <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de-Nutzungsbedingungen</a> und <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">-Datenlizenz</a>.', '2013-02-09 19:13:15');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1808', 'DE', 'Die <a target=\"_blank\" href=\"articles.php?page=dsb\">Datenschutzbelehrung</a>, die <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Nutzungsbedingungen</a> und die <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Datenlizenz</a> habe ich gelesen und bin damit einverstanden.', '2013-02-09 19:07:09');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1809', 'DE', 'Du musst die Datenschutzbelehrung, die Nutzungsbedingungen und die Datenlizenz akzeptieren, um dich bei Opencaching.de zu registrieren.', '2013-02-09 19:21:22');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1810', 'DE', 'Mit dem Herunterladen dieser Datei akzeptierst du unsere <a href=\"articles.php?page=impressum#tos\">Nutzungsbedindungen</a> und <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Datenlizenz</a>.', '2013-02-09 19:20:44');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1811', 'DE', 'Deaktivieren (und Geocaches sperren) und alle Fremdlizenz-Inhalte löschen', '2013-02-09 19:30:12');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1812', 'DE', 'ID', '2013-02-09 19:31:58');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1813', 'DE', 'Besitzer', '2013-02-09 19:31:45');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1814', 'DE', 'Melder', '2013-02-09 19:31:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1815', 'DE', 'Du muss bestaetigen, dass du sicher bist!', '2013-02-09 19:31:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1816', 'DE', 'Die Cachebeschreibung wurde gel\&ouml;scht, weil der Besitzer die Opencaching.de-Datenlizenz abgelehnt hat.', '2013-02-09 19:31:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1817', 'DE', 'Der Benutzerstatus wurde erfolgreich geändert.', '2013-02-09 19:31:30');
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');
@ -5888,7 +5931,6 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('173', 'EN', 'Samoa', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('174', 'EN', 'Go', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('175', 'EN', 'Developer system – testing only', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('176', 'EN', 'I\'ve read and understand the <a target=\"_blank\" href=\"articles.php?page=dsb\">privacy statement</a> and the <a target=\"_blank\" href=\"articles.php?page=tos\">terms of use</a> and accept them.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('177', 'EN', 'With this wizard, you can make some part of your description <b>bold</b> or <i>italic</i>. No HTML knowledge required.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('178', 'EN', 'Here you can see the HTML code generated from your text. If you want to make a word <b>bold</b>, insert \&lt;b\&gt; before the word and \&lt;/b\&gt; after.', '2010-08-28 11:48:07');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('179', 'EN', 'Wallis And Futuna Islands', '2010-08-28 11:48:07');
@ -6763,7 +6805,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 ('1428', 'EN', 'Publish now', '2010-09-10 23:40:13');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1429', 'EN', 'Publish on', '2010-09-10 23:40:38');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1430', 'EN', 'Do not publish now.', '2010-09-10 23:40:30');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'EN', 'I have read and agree to the <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de Terms of Service</a>', '2010-09-10 23:39:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'EN', 'I have read and agree to the <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de Terms of Service</a> and <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Opencaching.de Data license</a>.', '2010-09-10 23:39:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1432', 'EN', 'Info: Your log entry has been removed from the cache owner', '2010-09-10 23:39:09');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1433', 'EN', 'Selection of city', '2010-09-10 23:39:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1434', 'EN', 'Total of {resultscount} cities matched', '2010-09-10 23:38:52');
@ -7105,6 +7147,21 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
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 ('1802', 'EN', 'Warning: This report is already assigned to another admin. Consult him first before you assume the report!', '2013-02-09 18:29:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1804', 'EN', 'Data licsense', '2013-02-09 18:30:12');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1805', 'EN', 'The www.opencaching.de content is licensed under <br /><a rel=\"license\" href=\"http://creativecommons.org/licenses/by-nc-nd/3.0/de/\">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.', '2013-02-09 18:31:27');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1806', 'EN', 'Please select only one of the delete/disable options!', '2013-02-09 17:34:01');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1807', 'EN', 'By submitting I accept the <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de Terms of Service</a> and the <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Opencaching.de Data license</a>.', '2013-02-09 19:23:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1808', 'EN', 'I\'ve read and understand the <a target=\"_blank\" href=\"articles.php?page=dsb\">privacy statement</a>, the <a target=\"_blank\" href=\"articles.php?page=impressum#tos\">terms of service</a> and the <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Data license</a> and accept them.', '2013-02-09 19:07:39');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1809', 'EN', 'You have to accept the privacy statement, the terms of service and the data license to register at opencaching.de.', '2013-02-09 19:23:21');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1810', 'EN', 'When downloading this file, you accept our <a href=\"articles.php?page=impressum#tos\">terms of use</a> and <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Data license</a>.', '2013-02-09 19:23:02');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1811', 'EN', 'Disable (and lock all geocaches owned) and remove all foreign licensed content', '2013-02-09 19:30:44');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1812', 'EN', 'By submitting I accept the <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">Opencaching.de Terms of Service</a> and the <a href=\"articles.php?page=impressum#datalicense\" target=\"_blank\">Data license</a>.', '2013-02-09 19:13:54');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1813', 'EN', 'Owner', '2013-02-09 19:30:32');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1814', 'EN', 'Reporter', '2013-02-09 19:30:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1815', 'EN', 'You have to check that you are sure!', '2013-02-09 19:30:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1816', 'EN', 'The cache description was removed, because the owner declined the Opencaching.de data license.', '2013-02-09 19:30:23');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1817', 'EN', 'User status was successfully changed.', '2013-02-09 19:31:30');
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');
@ -7274,7 +7331,6 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('173', 'ES', 'Samoa', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('174', 'ES', 'Ir', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('175', 'ES', 'Developer system – testing only', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('176', 'ES', 'He leído y entendido las <a target=\"_blank\" href=\"articles.php?page=dsb\">privacy statement</a> y las lt;a target=\"_blank\" href=\"articles.php?page=tos\"> de los terminos de uso </a> y las acepto.', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('177', 'ES', 'Con este asistente, puede hacer que alguna parte de su descripción <b>bold</b> or <i>italic</i>. No requiere conocimientos en HTML', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('178', 'ES', 'Aquí puedes ver el código HTML generado por el texto. Si quieres poner una palabra <b>bold</b> insertar insert \&lt;b\&gt; antes de una palabra y \&lt;/b\&gt; después.', '2010-12-09 00:17:56');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('179', 'ES', 'Islas de Wallis y Futuna', '2010-12-09 00:17:56');
@ -8149,7 +8205,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 ('1428', 'ES', 'Publicado ahora', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1429', 'ES', 'Publicado el', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1430', 'ES', 'No publicar ahora.', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'ES', 'He leído y acepto las <a href=\"articles.php?page=impressum#tos\" target=\"_BLANK\">la condiciones de uso de Opencaching.de</a>', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'ES', 'He leído y acepto las <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">la condiciones de uso de Opencaching.de</a>', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1432', 'ES', 'Información: el registro ha sido retirado por el titular del cache', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1433', 'ES', 'Seleccione una ciudad', '2010-12-09 00:18:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1434', 'ES', 'Total de {resultscount} las ciudades correspondientes', '2010-12-09 00:18:00');
@ -8743,7 +8799,6 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('173', 'IT', 'Samoa', '2010-08-28 22:11:42');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('174', 'IT', 'Vai', '2010-08-28 22:13:36');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('175', 'IT', 'Sistema di sviluppo - solo test', '2010-08-28 22:13:55');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('176', 'IT', 'Ho letto e compreso la <a target=\"_blank\" href=\"articles.php?page=dsb\">nota informativa</a> e le <a target=\"_blank\" href=\"articles.php?page=tos\">condizioni d\'uso</a> e li accetto.', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('177', 'IT', 'Utilizzando questa procedura, puoi rendere parte della tua descizione in <b>grassetto</> o in <i>corsivo</>. Non è necessario conoscere l\'HTML.', '2010-08-28 22:16:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('178', 'IT', 'Qui puoi vedere il codice HTML generato a partire dal tuo testo. Se desideri rendere una parola in <b>grassetto</b>, inserisci \&lt;b\&gt; prima della parola e \&lt;/b\&gt; dopo.', '2010-08-28 22:18:11');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('179', 'IT', 'Isole Wallis e Futuna', '2010-08-28 22:18:32');
@ -9618,7 +9673,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 ('1428', 'IT', 'Già pubblicata', '2010-09-10 23:40:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1429', 'IT', 'Pubblicata su', '2010-09-13 22:10:04');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1430', 'IT', 'Non ancora pubblicata.', '2010-09-13 22:10:04');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'IT', 'Ho letto e accetto le <a href=\"articles.php?page=impressum#tos\" target=\"_BLANK\">condizioni d\'uso di Opencaching.de</a>', '2010-09-10 23:39:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1431', 'IT', 'Ho letto e accetto le <a href=\"articles.php?page=impressum#tos\" target=\"_blank\">condizioni d\'uso di Opencaching.de</a>', '2010-09-10 23:39:25');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1432', 'IT', 'Informazione: il tuo log è stato cancellato dal proprietario della cache', '2010-09-10 23:39:09');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1433', 'IT', 'Seleziona città', '2010-10-27 18:49:19');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1434', 'IT', 'Totale di {resultscount} città corrispondenti', '2010-09-10 23:38:52');
@ -9909,7 +9964,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 ('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}\ 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 ('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');
@ -10996,7 +11051,6 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('153', 'PL', 'Znalezione skrzynki', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('154', 'PL', '%1 z możliwych %2', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('167', 'PL', 'W celu rejestracji na OpenCaching musisz posiadać rzeczywisty adres E-mail na który zostanie wysłany kod aktywacyjny. Możesz tylko jednego użytkownika zarejestrować na jeden adres E-mail.', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('176', 'PL', 'Tak. Zapoznałem się z zasadmi o <a target=\"_blank\" href=\"articles.php?page=dsb\">Ochronie danych osobowych</a> oraz <a target=\"_blank\" href=\"articles.php?page=tos\">Zasadami Używania OC</a> i akceptuje je.', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('199', 'PL', 'Języki', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('207', 'PL', 'Login', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('208', 'PL', 'Hasło', '2010-08-28 11:48:08');
@ -11098,7 +11152,6 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('167', 'RU', 'Для регистрации вы должны выбрать имя пользователя (псевдоним, под которым вы будете известны на сайте) \n и указать действующий адрес электронной почты. \n На этот адрес будет выслано письмо с кодом активации.\n Вы можете указать также ваши настоящие имя и фамилию, \n но это не является обязательным.', '2010-12-06 22:17:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('172', 'RU', 'Йемен', '2010-10-06 22:23:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('173', 'RU', 'Самоа', '2010-10-06 22:23:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('176', 'RU', 'Я принимаю <a target=\"_blank\" href=\"articles.php?page=dsb\">Положение о конфиденциальности</a> и <a target=\"_blank\" href=\"articles.php?page=tos\">Условия использования</a>.', '2010-12-06 22:17:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('179', 'RU', 'Уоллис и Футуна', '2010-10-06 22:23:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('180', 'RU', 'Опубликовать новость', '2010-12-06 22:17:35');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('181', 'RU', 'Вануату', '2010-10-06 22:23:06');
@ -11515,4 +11568,4 @@ TRUNCATE TABLE `watches_waitingtypes`;
INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('1', 'ownerlog');
INSERT INTO `watches_waitingtypes` (`id`, `watchtype`) VALUES ('2', 'cache_watches');
INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', 'b5463e8c7d92c84043d194910ee6ba67') ON DUPLICATE KEY UPDATE `value`='b5463e8c7d92c84043d194910ee6ba67';
INSERT INTO `sysconfig` (`name`, `value`) VALUES ('datasql_checksum', '40c2925aa2f7645961f610c006b13d42') ON DUPLICATE KEY UPDATE `value`='40c2925aa2f7645961f610c006b13d42';

2
htdocs/lang/de/ocstyle/main.tpl.php
View File

@ -230,7 +230,7 @@
<!-- Datalicense -->
<p class="sidebar-maintitle">{t}Datalicense{/t}</p>
<div style="margin-top:20px;width:100%;text-align:center;">
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />Die Inhalte von www.opencaching.de stehen unter einer<br /><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">Creative Commons Namensnennung-NichtKommerziell-KeineBearbeitung 3.0 Deutschland Lizenz</a>.
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />{t}The www.opencaching.de content is licensed under <br /><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.{/t}
<br />
&nbsp;
</div>

2
htdocs/lib2/imagebmp.inc.php
View File

@ -1,4 +1,4 @@
<?
<?php
/*
*------------------------------------------------------------
* BMP Image functions

222
htdocs/lib2/logic/user.class.php
View File

@ -722,6 +722,7 @@ class user
return true;
}
/**
* disables user (if not disabled), removes all licensed content from db and
* replaces every picture with a dummy one
@ -734,56 +735,46 @@ class user
global $translate;
// check if disabled, disable if not
if($this->canDisable()) {
if(!$this->disable()) {
if ($this->canDisable())
if (!$this->disable())
return 'disable user failed';
}
}
/*
* set all cache_desc and hint to ''
*/
// check if there are caches
$num_caches = sql_value("SELECT COUNT(*) FROM `caches` WHERE `user_id`='&1'",0,$this->getUserId());
if($num_caches > 0) {
$num_caches = sql_value("SELECT COUNT(*) FROM `caches` WHERE `user_id`='&1'",
0, $this->getUserId());
if ($num_caches > 0) {
$cache_descs = array();
$rs = sql( "SELECT `cache_desc`.`id`,`cache_desc`.`language` " .
"FROM `cache_desc`,`caches` " .
"WHERE `caches`.`cache_id`=`cache_desc`.`cache_id` " .
"AND `caches`.`user_id`='&1'",
$this->getUserId()
$rs = sql("SELECT `cache_desc`.`id`,`cache_desc`.`language` " .
"FROM `cache_desc`,`caches` " .
"WHERE `caches`.`cache_id`=`cache_desc`.`cache_id` " .
"AND `caches`.`user_id`='&1'",
$this->getUserId()
);
while($cache_desc = sql_fetch_array($rs,MYSQL_ASSOC)) {
while ($cache_desc = sql_fetch_array($rs,MYSQL_ASSOC))
$cache_descs[] = $cache_desc;
}
sql_free_result($rs);
// walk through cache_descs and set message for each language
foreach($cache_descs as $desc) {
foreach ($cache_descs as $desc)
{
sql("UPDATE `cache_desc` " .
"SET `desc`='&1',`hint`='&2' " .
"WHERE `id`='&3'",
$translate->t('Removed because owner declined content license', '', basename(__FILE__), __LINE__, '', 1, $desc['language']),
"SET `desc`='&1',`hint`='&2' " .
"WHERE `id`='&3'",
"<em>" . $translate->t('cache description was removed because owner declined content license', '', basename(__FILE__), __LINE__, '', 1, $desc['language']) . "</em>",
'',
$desc['id']
);
}
// replace pictures
$errmesg = $this->replace_pictures(OBJECT_CACHE);
if($errmesg !== true) {
if ($errmesg !== true)
return "removing cache pictures: $errmesg";
}
}
/*
* set all cache_logs ''
*/
@ -794,24 +785,24 @@ class user
0,
$this->getUserId()
);
if($num_cache_logs > 0) {
if ($num_cache_logs > 0) {
// set text ''
sql("UPDATE `cache_logs` " .
"SET `text`='&1' WHERE `user_id`='&2'",
'Removed because user declined content license',
"SET `text`='&1' WHERE `user_id`='&2'",
"<em>Der Logtext wurde entfernt, weil der Benutzer die Opencaching.de-Datenlizenz abgelehnt hat." .
"<br /><br />" .
"The text has been deleted because the used declined the Opencaching.de data license.</em>",
$this->getUserId());
// replace pictures
$errmesg = $this->replace_pictures(OBJECT_CACHELOG);
if($errmesg !== true) {
if ($errmesg !== true)
return "removing log pictures: $errmesg";
}
}
// success
return true;
}
/**
@ -825,31 +816,31 @@ class user
global $opt;
// load bmp-support
require_once($opt['rootpath'].'lib2/imagebmp.inc.php');
require_once($opt['rootpath'] . 'lib2/imagebmp.inc.php');
// paths cleared by trailing '/'
if(substr($opt['logic']['pictures']['dir'],-1) != '/') {
if (substr($opt['logic']['pictures']['dir'],-1) != '/')
$picpath = $opt['logic']['pictures']['dir'];
} else {
else
$picpath = substr($opt['logic']['pictures']['dir'],0,-1);
}
$thumbpath = "$picpath/thumbs";
if(isset($opt['logic']['pictures']['dummy']['bgcolor']) && is_array($opt['logic']['pictures']['dummy']['bgcolor'])) {
$pdummy = isset($opt['logic']['pictures']['dummy']);
if ($pdummy && isset($opt['logic']['pictures']['dummy']['bgcolor']) && is_array($opt['logic']['pictures']['dummy']['bgcolor']))
$dummybg = $opt['logic']['pictures']['dummy']['bgcolor'];
} else {
else
$dummybg = array(255,255,255);
}
if(isset($opt['logic']['pictures']['dummy']['text'])) {
if ($pdummy && isset($opt['logic']['pictures']['dummy']['text']))
$dummytext = $opt['logic']['pictures']['dummy']['text'];
} else {
else
$dummytext = '';
}
if(isset($opt['logic']['pictures']['dummy']['textcolor']) && is_array($opt['logic']['pictures']['dummy']['textcolor'])) {
if ($pdummy && isset($opt['logic']['pictures']['dummy']['textcolor']) && is_array($opt['logic']['pictures']['dummy']['textcolor']))
$dummytextcolor = $opt['logic']['pictures']['dummy']['textcolor'];
} else {
else
$dummytextcolor = array(0,0,0);
}
$tmh = 0;
$tmw = 0;
@ -857,52 +848,42 @@ class user
/*
* check log or cache
*/
if($object_type == OBJECT_CACHE) {
if ($object_type == OBJECT_CACHE)
// get filenames of the pictures of $this' caches
$rs = sql( "SELECT `pictures`.`url` " .
"FROM `pictures`,`caches` " .
"WHERE `caches`.`cache_id`=`pictures`.`object_id`" .
"AND `caches`.`user_id`='&1'",
$this->getUserId()
);
// set thumb-dimensions
$tmh = $opt['logic']['pictures']['thumb_max_height'];
$tmw = $opt['logic']['pictures']['thumb_max_width'];
} elseif($object_type == OBJECT_CACHELOG) {
$rs = sql("SELECT `pictures`.`url` " .
"FROM `pictures`,`caches` " .
"WHERE `caches`.`cache_id`=`pictures`.`object_id`" .
"AND `caches`.`user_id`='&1'",
$this->getUserId()
);
elseif ($object_type == OBJECT_CACHELOG)
// get filenames of the pictures of $this' logs
$rs = sql( "SELECT `pictures`.`url` " .
"FROM `pictures`,`cache_logs` " .
"WHERE `cache_logs`.`id`=`pictures`.`object_id`" .
"AND `cache_logs`.`user_id`='&1'",
$this->getUserId()
);
// set thumb-dimensions
$tmh = $opt['logic']['pictures']['thumb_max_height']/3;
$tmw = $opt['logic']['pictures']['thumb_max_width']/3;
}
$rs = sql("SELECT `pictures`.`url` " .
"FROM `pictures`,`cache_logs` " .
"WHERE `cache_logs`.`id`=`pictures`.`object_id`" .
"AND `cache_logs`.`user_id`='&1'",
$this->getUserId()
);
// set thumb-dimensions
$tmh = $opt['logic']['pictures']['thumb_max_height'];
$tmw = $opt['logic']['pictures']['thumb_max_width'];
$filenames = array();
$i = 0;
while($url = sql_fetch_array($rs,MYSQL_NUM)) {
$filenames[] = substr($url[$i],-40);
$i++;
}
while ($url = sql_fetch_array($rs,MYSQL_NUM))
$filenames[] = substr($url['url'],-40);
// free result
sql_free_result($rs);
/*
* walk through filenames and replace original
*/
// check if there is something to replace
if(count($filenames) > 0) {
if (count($filenames) > 0) {
foreach($filenames as $fn) {
foreach ($filenames as $fn) {
// get uuid and extension
$uuid = substr($fn,0,36);
@ -911,7 +892,7 @@ class user
$thumb_dir2 = substr($uuid,1,1);
// read original size
if(file_exists("$picpath/$fn")) {
if (file_exists("$picpath/$fn")) {
list($w,$h,$t,$attr) = getimagesize("$picpath/$fn");
} else {
$w = 600;
@ -928,7 +909,9 @@ class user
imagefill($im,0,0,$col_bg);
// check for replacement-image
if($opt['logic']['pictures']['dummy']['replacepic'] != $opt['rootpath'] . 'images/' && file_exists($opt['logic']['pictures']['dummy']['replacepic'])) {
if ($pdummy && isset($opt['logic']['pictures']['dummy']['replacepic'])
&& $opt['logic']['pictures']['dummy']['replacepic'] != $opt['rootpath'] . 'images/'
&& file_exists($opt['logic']['pictures']['dummy']['replacepic'])) {
// get dimensions of the replacement
list($rw,$rh,$rt,$rattr) = getimagesize($opt['logic']['pictures']['dummy']['replacepic']);
@ -941,7 +924,7 @@ class user
// check dimensions of original and set replacement size
$rsize = 0;
if($w > $h) {
if ($w > $h) {
if(($h * 0.85) > $rwh) {
$rsize = $rwh;
} else {
@ -960,48 +943,45 @@ class user
// get replacement image
$rext = substr($opt['logic']['pictures']['dummy']['replacepic'],-3);
$rim = null;
if($rext == 'jpg') {
if ($rext == 'jpg') {
$rim = imagecreatefromjpeg($opt['logic']['pictures']['dummy']['replacepic']);
} elseif($rext == 'png') {
} elseif ($rext == 'png') {
$rim = imagecreatefrompng($opt['logic']['pictures']['dummy']['replacepic']);
} elseif($rext == 'gif') {
} elseif ($rext == 'gif') {
$rim = imagecreatefromgif($opt['logic']['pictures']['dummy']['replacepic']);
} elseif($rext == 'bmp') {
} elseif ($rext == 'bmp') {
$rim = imagecreatefrombmp($opt['logic']['pictures']['dummy']['replacepic']);
}
// copy image
if(!is_null($rim)) {
if (!is_null($rim))
imagecopyresampled($im, $rim, $dx, $dy, 0, 0, $rsize, $rsize, $rw, $rh);
}
} else {
// set text
if($dummytext != '') {
if ($dummytext != '')
imagestring($im,1,10,$h/2,$dummytext,$col_text);
else {
imageline($im,0,0,$w,$h,0xff0000);
imageline($im,0,$h,$w,0,0xff0000);
}
}
// save dummy
if($ext == 'jpg') {
if(!imagejpeg($im,"$picpath/$fn",75)) {
if ($ext == 'jpg') {
if (!imagejpeg($im,"$picpath/$fn",75))
return "save dummy failed [$ext]";
}
} elseif($ext == 'png') {
if(!imagepng($im,"$picpath/$fn",4)) {
} elseif ($ext == 'png') {
if (!imagepng($im,"$picpath/$fn",4))
return "save dummy failed [$ext]";
}
} elseif($ext == 'gif') {
if(!imagegif($im,"$picpath/$fn")) {
} elseif ($ext == 'gif') {
if (!imagegif($im,"$picpath/$fn"))
return "save dummy failed [$ext]";
}
} elseif($ext == 'bmp') {
if(!imagebmp($im,"$picpath/$fn")) {
} elseif ($ext == 'bmp') {
if (!imagebmp($im,"$picpath/$fn"))
return "save dummy failed [$ext]";
}
}else {
} else {
return "save dummy failed [$ext], unknown extension";
}
@ -1030,35 +1010,29 @@ class user
imagecopyresampled($tim, $im, 0, 0, 0, 0, $tw, $th, $w, $h);
// check directories or create them
if(!file_exists("$thumbpath/$thumb_dir1")){
if(!mkdir("$thumbpath/$thumb_dir1")) {
if (!file_exists("$thumbpath/$thumb_dir1"))
if (!mkdir("$thumbpath/$thumb_dir1")) {
return 'mkdir in thumbpath failed';
}
}
if(!file_exists("$thumbpath/$thumb_dir1/$thumb_dir2")){
if(!mkdir("$thumbpath/$thumb_dir1/$thumb_dir2")) {
if (!file_exists("$thumbpath/$thumb_dir1/$thumb_dir2")){
if (!mkdir("$thumbpath/$thumb_dir1/$thumb_dir2"))
return 'mkdir in thumbpath failed';
}
}
// save thumb
if($ext == 'jpg') {
if(!imagejpeg($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn",75)) {
if ($ext == 'jpg') {
if (!imagejpeg($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn",75))
return "save thumb failed [$ext]";
}
} elseif($ext == 'png') {
if(!imagepng($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn",4)) {
} elseif ($ext == 'png') {
if (!imagepng($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn",4))
return "save thumb failed [$ext]";
}
} elseif($ext == 'gif') {
if(!imagegif($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn")) {
if (!imagegif($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn"))
return "save thumb failed [$ext]";
}
} elseif($ext == 'bmp') {
if(!imagebmp($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn")) {
if (!imagebmp($tim,"$thumbpath/$thumb_dir1/$thumb_dir2/$fn"))
return "save thumb failed [$ext]";
}
}else {
} else {
return "save thumb failed [$ext], unknown extension";
}
}

3
htdocs/templates2/ocstyle/adminuser.tpl
View File

@ -16,6 +16,9 @@
{if $error=='userunknown'}
<p style="line-height: 1.6em; color: red; font-weight: bold;">{t}Username unknown{/t}</p>
{/if}
{if $success=='1'}
<p style="line-height: 1.6em; color: green; font-weight: bold;">{t}User status was successfully changed.{/t}</p>
{/if}
<p style="line-height: 1.6em;"><input type="submit" value="{t}Submit{/t}" /></p>

4
htdocs/templates2/ocstyle/articles/DE/impressum.tpl
View File

@ -279,7 +279,7 @@
<p>
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">
<img alt="Creative Commons Lizenzvertrag" style="border: 0; padding-right: 15px; padding-bottom: 15px; float: left;" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a>
Alle durch die Benutzer auf Opencaching.de eingebrachten Inhalte stehen derzeit unter
Alle durch die Benutzer auf Opencaching.de eingebrachten Inhalte stehen unter
der Lizenz "Creative Commons Attribution-NonCommercial-NoDerivs 3.0", auf Deutsch
"Namensnennung-NichtKommerziell-KeineBearbeitung 3.0" (CC BY-NC-ND 3.0), das hei&szlig;t,
Sie d&uuml;rfen die Inhalte vervielf&auml;ltigen, verbreiten und &ouml;ffentlich
@ -318,7 +318,7 @@
Wortlaut dieser Lizenz befindet sich
<a href="https://github.com/OpencachingDeutschland/oc-server3/blob/master/doc/license.txt">hier</a>.
Dabei ist zu beachten, dass einige Bestandteile der Software von Drittanbietern
stammen. Diese Bestandteile unterliegen m&ouml;Sglicherweise anderen Lizenzen.
stammen. Diese Bestandteile unterliegen m&ouml;glicherweise anderen Lizenzen.
</p>
<p>
Der Quellcode kann via <a href="https://github.com/OpencachingDeutschland/oc-server3">GitHub</a>

4
htdocs/templates2/ocstyle/articles/EN/impressum.tpl
View File

@ -105,7 +105,7 @@
</p>
<p>&nbsp;</p>
<div>
</div>
<div class="content2-container bg-blue02">
<p class="content-title-noshade-size3">
@ -253,7 +253,7 @@
The form of attribution is:
</p>
<p style="font-weight: 800;">
&copy; $USERNAME, www.opencaching.de, CC-BY-NC-ND, Stand: $DATUM
&copy; $USERNAME, www.opencaching.de, CC-BY-NC-ND, as of $DATUM
</p>
<p>
Date may be omitted for photos and log entries.

2
htdocs/templates2/ocstyle/sys_main.tpl
View File

@ -205,7 +205,7 @@
{* <!-- Datalicense --> *}
<p class="sidebar-maintitle">{t}Datalicense{/t}</p>
<div style="margin-top:20px;width:100%;text-align:center;">
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />Die Inhalte von www.opencaching.de stehen unter einer<br /><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">Creative Commons Namensnennung-NichtKommerziell-KeineBearbeitung 3.0 Deutschland Lizenz</a>.
<a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><br />{t}The www.opencaching.de content is licensed under <br /><a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">German Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported</a> License</a>.{/t}
<br />
&nbsp;
</div>