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

fixed data license settings for new users; reconfigured OKAPI license link

Browse Source
This commit is contained in:
following
2013-03-23 10:57:14 +01:00
parent c5095e290b
commit 75891a2f02
5 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/config2/settings-dist.inc.php
View File

@@ -248,13 +248,6 @@
*/
$opt['logic']['node']['id'] = 4;
/* data license for new registered users:
0 = not specified
1 = old Opencaching.de license
2 = CC BY-NC-ND 3.0
*/
$opt['logic']['license'] = 2;
/* location of uploaded images
*/
$opt['logic']['pictures']['dir'] = $opt['rootpath'] . 'images/uploads';
@@ -368,9 +361,11 @@
/* license-related functions
*/
$opt['logic']['license'] = array(); // PHP warning without this - why only here??
$opt['logic']['license']['newusers'] = NEW_DATA_LICENSE_ACTIVELY_ACCEPTED;
$opt['logic']['license']['admin'] = true;
$opt['logic']['license']['disclaimer'] = false; // also in lib/settings.inc.php
$opt['logic']['license']['disclaimer'] = false;
$opt['logic']['license']['terms'] = 'http://www.opencaching.de/articles.php?page=impressum#datalicense';
// 'disclaimer' and 'terms' also in lib/settings.inc.php
/* Database charset
* frontend and php charsets are UTF-8

1
htdocs/lib/settings-dev.inc.php
View File

@@ -142,6 +142,7 @@
// data license
$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php
$opt['logic']['license']['terms'] = 'http://www.opencaching.de/articles.php?page=impressum#datalicense';
// see config2/settings-dist.inc.php
$opt['template']['default']['locale'] = 'DE'; // may be overwritten by $opt['domain'][...]['locale']

6
htdocs/lib2/common.inc.php
View File

@@ -37,8 +37,9 @@ function __autoload($class_name)
fix_magic_quotes_gpc();
// set options
require($opt['rootpath'] . 'config2/settings-dist.inc.php');
require($opt['rootpath'] . 'config2/settings.inc.php');
require_once($opt['rootpath'] . 'lib2/logic/const.inc.php');
require_once($opt['rootpath'] . 'config2/settings-dist.inc.php');
require_once($opt['rootpath'] . 'config2/settings.inc.php');
set_domain();
@@ -81,7 +82,6 @@ function __autoload($class_name)
$tpl = new OcSmarty();
// include all we need
require_once($opt['rootpath'] . 'lib2/logic/const.inc.php');
require_once($opt['rootpath'] . 'lib2/logic/geomath.class.php');
require_once($opt['rootpath'] . 'lib2/error.inc.php');
require_once($opt['rootpath'] . 'lib2/util.inc.php');

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

@@ -75,7 +75,7 @@ class user
$this->reUser->addBoolean('no_htmledit_flag', false, false);
$this->reUser->addInt('notify_radius', 0, false);
$this->reUser->addInt('admin', 0, false);
$this->reUser->addInt('data_license', $opt['logic']['license'], false);
$this->reUser->addInt('data_license', $opt['logic']['license']['newusers'], false);
$this->reUser->addInt('node', 0, false);
$this->reUserStat = new rowEditor('stat_user');

2
htdocs/okapi_settings.php
View File

@@ -18,7 +18,7 @@ function get_okapi_settings()
'OC_BRANCH' => 'oc.de', # Tell OKAPI to work in "OCDE mode".
'SUPPORTS_LOGTYPE_NEEDS_MAINTENANCE' => false, # OCDE doesn't support it, see [2] for more info.
'DATA_LICENSE_URL' => 'http://www.opencaching.de/articles.php?page=impressum#datalicense',
'DATA_LICENSE_URL' => $opt['logic']['license']['terms'],
# Settings which ARE present in settings.inc.php: