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

update emaillist script; updated data license user states, typos ...

Browse Source
This commit is contained in:
following
2013-02-20 23:26:01 +01:00
parent 121b82c225
commit 4fffc4b0f1
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/doc/sql/static-data/data.sql
+4 -3
View File
@@ -516,8 +516,9 @@ INSERT INTO `countries_options` (`country`, `display`, `gmLat`, `gmLon`, `gmZoom
-- Table data_licenses -- Table data_licenses
SET NAMES 'utf8'; SET NAMES 'utf8';
TRUNCATE TABLE `data_licenses`; TRUNCATE TABLE `data_licenses`;
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('1', 'old Opencaching.de license'); INSERT INTO `data_licenses` (`id`, `license`) VALUES ('0', 'passively accepted new license');
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('2', 'CC BY-NC-ND 3.0'); INSERT INTO `data_licenses` (`id`, `license`) VALUES ('1', 'declined new license');
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('2', 'actively accepted new license');
-- Table languages -- Table languages
SET NAMES 'utf8'; SET NAMES 'utf8';
@@ -9744,7 +9745,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 ('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 ('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 ('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> e la <a href=\"http://www.opencaching.de/articles.php?page=impressum#datalicense\">Lecenza dati 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 ('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 ('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'); 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');
htdocs/templates2/ocstyle/articles/DE/impressum.tpl
+1 -1
View File
@@ -284,7 +284,7 @@
"Namensnennung-NichtKommerziell-KeineBearbeitung 3.0" (CC BY-NC-ND 3.0), das hei&szlig;t, "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 Sie d&uuml;rfen die Inhalte vervielf&auml;ltigen, verbreiten und &ouml;ffentlich
zug&auml;nglich machen. Dabei ist die Namensnennung des Autors/Rechteinhabers in der zug&auml;nglich machen. Dabei ist die Namensnennung des Autors/Rechteinhabers in der
unten angegeben Form zu wahren. Eine kommerzielle Nutzung der Inhalte ist in unten angegebenen Form zu wahren. Eine kommerzielle Nutzung der Inhalte ist in
jeglicher Form ausgeschlossen, ebenso d&uuml;rfen keine Ver&auml;nderungen/Abwandlungen jeglicher Form ausgeschlossen, ebenso d&uuml;rfen keine Ver&auml;nderungen/Abwandlungen
der Inhalte vorgenommen werden. der Inhalte vorgenommen werden.
<br /> <br />
htdocs/util-local/mailing/email-addresslist.php
+3 -1
View File
@@ -6,7 +6,9 @@
require($opt['rootpath'] . 'lib2/web.inc.php'); require($opt['rootpath'] . 'lib2/web.inc.php');
$rs = sql("SELECT email FROM user WHERE NOT ISNULL(email) and is_active_flag!=0 ORDER BY user_id DESC"); $rs = sql("SELECT email FROM user
WHERE NOT ISNULL(email) AND is_active_flag!=0 AND email_problems=0
ORDER BY user_id DESC");
while ($r = sql_fetch_assoc($rs)) while ($r = sql_fetch_assoc($rs))
{ {
echo $r['email'] . "\n"; echo $r['email'] . "\n";