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

resolved merge conflict

Browse Source
This commit is contained in:
following
2013-02-16 23:50:55 +01:00
parent 9a1e00ec57 06d832c392
commit 721dc7aeed
23 changed files with 1140 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
htdocs/config2/settings-dist.inc.php
+16
View File
@@ -250,6 +250,13 @@
*/
$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';
@@ -264,6 +271,15 @@
$opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
$opt['logic']['pictures']['thumb_dir'] = $opt['rootpath'] . 'images/uploads/thumbs';
/* Defaults for picture replacement on declined license
*
* replacement picture must be square sized
*/
$opt['logic']['pictures']['dummy']['bgcolor'] = array(255,255,255);
$opt['logic']['pictures']['dummy']['text'] = '';
$opt['logic']['pictures']['dummy']['textcolor'] = array(0,0,0);
$opt['logic']['pictures']['dummy']['replacepic'] = $opt['rootpath'] . 'images/';
/* location of uploaded podcasts
*/
$opt['logic']['podcasts']['dir'] = $opt['rootpath'] . 'podcasts/uploads';