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

discard 'data_license' table in davour of constant definitions

Browse Source
This commit is contained in:
following 2013-03-15 16:48:17 +01:00
parent 55c9d3e23c
commit a15b558275
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/doc/sql/db-changes.txt
View File

@ -50,3 +50,4 @@ date commit ID change
2013-03-10 f8738936 added field 'mappreview' in pictures and pictures_modified
2013-03-14 69abeb67 added fields coordinates_type.preposition and pp_trans_id
2013-03-15 discarded table 'data_license'

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

@ -517,13 +517,6 @@ INSERT INTO `countries_options` (`country`, `display`, `gmLat`, `gmLon`, `gmZoom
INSERT INTO `countries_options` (`country`, `display`, `gmLat`, `gmLon`, `gmZoom`, `nodeId`) VALUES ('TR', '1', '38.0307856938229', '33.90380859375', '6', '0');
INSERT INTO `countries_options` (`country`, `display`, `gmLat`, `gmLon`, `gmZoom`, `nodeId`) VALUES ('US', '1', '30.1451271833761', '-94.658203125', '4', '10');
-- Table data_licenses
SET NAMES 'utf8';
TRUNCATE TABLE `data_licenses`;
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('0', 'passively accepted new license');
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('1', 'declined new license');
INSERT INTO `data_licenses` (`id`, `license`) VALUES ('2', 'actively accepted new license');
-- Table helppages
SET NAMES 'utf8';
TRUNCATE TABLE `helppages`;

6
htdocs/doc/sql/tables/data_licenses.sql
View File

@ -1,6 +0,0 @@
SET NAMES 'utf8';
DROP TABLE IF EXISTS `data_licenses`;
CREATE TABLE `data_licenses` (
`id` tinyint(1) NOT NULL,
`license` varchar(30) NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ;

6
htdocs/lib2/logic/const.inc.php
View File

@ -64,4 +64,10 @@
define('USR_OPT_MAP_PREVIEW', 10);
define('USR_OPT_PICSTAT', 11);
define('USR_OPT_TRANSLANG', 12);
// user.data_license values
define('OLD_DATA_LICSENSE',0); // deadline not reached
define('NEW_DATA_LICENSE_DECLINED',1); // declined license
define('NEW_DATA_LICSENSE_ACTIVELY_ACCEPTED',1); // accepted new license on registration
define('NEW_DATA_LICSENSE_PASSIVELY_ACCEPTED',2); // did not decline license until deadline
?>