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

added db-mutation and translations, updates #328

Browse Source
This commit is contained in:
Nils Bohrs
2013-11-03 11:20:24 +01:00
parent 67ddf1af20
commit 015e857ffa
4 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/dbsv-update.php
View File

@ -356,6 +356,14 @@
sql("DROP TABLE IF EXISTS `mapresult`");
sql("DROP TABLE IF EXISTS `mapresult_data`");
}
function dbv_121() // add user profile flag for receiving newsletter
{
if (!sql_field_exists('user','accept_mailing'))
{
sql("ALTER TABLE `user` ADD COLUMN `accept_mailing` tinyint(1) NOT NULL default '1' AFTER `mailing_problems`");
}
}
// When adding new mutations, take care that they behave well if run multiple

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

@ -2594,6 +2594,10 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2167', 'OC Admi
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2168', 'Newest log entries for caches of %1', '2013-08-24 12:56:14');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2169', 'Do you really want to delete this picture?', '2013-10-01 18:10:14');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2170', 'Nearby search at geocaching.com', '2013-10-02 18:40:04');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2171', 'Please send me mailings about news and actions on opencaching.de. (max. 2-5 per year)', '2013-11-03 10:09:14');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2172', 'Yes, I want to recieve mailings about news and actions on opencaching.de. (max. 2-5 per year)', '2013-11-03 10:09:14');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2173', 'No, I dont\'t want any mailings about news and actions on opencaching.de.', '2013-11-03 10:09:14');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2174', 'Newsletter:', '2013-11-03 10:09:14');
-- Table sys_trans_ref
SET NAMES 'utf8';
@ -4980,6 +4984,10 @@ INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2167'
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2168', './templates2/ocstyle/newlogs.tpl', '14');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2169', './templates2/ocstyle/res_logentry_logitem.tpl', '91');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2170', './templates2/ocstyle/adminreports.tpl', '59');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2171', './templates2/ocstyle/myprofile.tpl', '145');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2172', './templates2/ocstyle/myprofile.tpl', '149');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2173', './templates2/ocstyle/myprofile.tpl', '151');
INSERT INTO `sys_trans_ref` (`trans_id`, `resource_name`, `line`) VALUES ('2174', './templates2/ocstyle/myprofile.tpl', '141');
-- Table sys_trans_text
SET NAMES 'utf8';
@ -6673,6 +6681,10 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2168', 'DE', 'Neueste Logeinträge für Caches von %1', '2013-08-24 11:48:06');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2169', 'DE', 'Willst du dieses Bild wirklich löschen?', '2013-10-01 18:10:24');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2170', 'DE', 'Umkreissuche auf geocaching.com', '2013-10-02 18:40:04');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2171', 'DE', 'Bitte sendet mir Informationen zu Neuigkeiten und Aktionen auf opencaching.de per Email zu. (max. 2-5 pro Jahr)', '2013-11-03 10:09:14');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2172', 'DE', 'Ja, ich möchte Informationen zu Neuigkeiten und Aktionen auf opencaching.de per Email erhalten. (max. 2-5 pro Jahr)', '2013-11-03 10:09:14');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2173', 'DE', 'Nein, ich möchte keine Informationen zu Neuigkeiten und Aktionen auf opencaching.de per Email erhalten.', '2013-11-03 10:09:14');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2174', 'DE', 'Newsletter:', '2013-11-03 10:09:14');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1', 'EN', 'Reorder IDs', '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');

2
htdocs/doc/sql/stored-proc/maintain-current.inc.php
View File

@ -613,7 +613,7 @@
/* waypoint reservation was not successfull. Maybe we are on a development machine, where cronjob for waypoint pool
* generation did not run or the pool is empty. To get a valid waypoint, we simply increment the highest used waypoint by one.
* NOTE: This ignores the setting of $opt[logic][waypoint_pool][fill_gaps]
* NOTE: This ignores the setting of opt[logic][waypoint_pool][fill_gaps]
* CAUTION: This statement is realy slow and you should always keep your waypoint pool filled with some waypoint on a production server
*/
INSERT INTO `cache_waypoint_pool` (`wp_oc`, `uuid`)

1
htdocs/doc/sql/tables/user.sql
View File

@ -14,6 +14,7 @@ CREATE TABLE `user` (
`first_email_problem` date default NULL,
`last_email_problem` datetime default NULL,
`mailing_problems` int(10) unsigned NOT NULL default '0',
`accept_mailing` tinyint(1) NOT NULL default '1',
`latitude` double NOT NULL,
`longitude` double NOT NULL,
`is_active_flag` tinyint(1) NOT NULL,