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

updated and optimized setting files; updated db changelog

Browse Source
This commit is contained in:
following
2013-03-15 10:25:44 +01:00
parent 69abeb673c
commit 8287bb9ef8
7 changed files with 64 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/config2/locale.inc.php
View File

@@ -89,7 +89,6 @@
$opt['locale']['PT']['locales'] = array('pt_PT.utf8', 'pt_PT', 'pt');
$opt['locale']['JA']['locales'] = array('ja_JP.utf8', 'ja_JP', 'jp');
$opt['locale']['EN']['timezone'] = 'Europe/Berlin';
$opt['locale']['EN']['format']['dm'] = '%m/%d';
$opt['locale']['EN']['format']['dateshort'] = '%m/%d/%y';
$opt['locale']['EN']['format']['date'] = '%x';
@@ -102,7 +101,6 @@
$opt['locale']['EN']['page']['subtitle1'] = 'Geocaching with Opencaching';
$opt['locale']['EN']['page']['subtitle2'] = '';
$opt['locale']['DE']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dm'] = '%d.%m.';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['DE']['format']['date'] = '%x';
@@ -116,7 +114,6 @@
$opt['locale']['DE']['page']['subtitle2'] = 'Österreich und der Schweiz';
$opt['locale']['DE']['helpwiki'] = "http://wiki.opencaching.de/index.php/";
$opt['locale']['FR']['timezone'] = 'Europe/Berlin';
$opt['locale']['FR']['format']['dm'] = '%d.%m.';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['FR']['format']['date'] = '%x';
@@ -127,7 +124,6 @@
$opt['locale']['FR']['format']['timesec'] = '%X';
$opt['locale']['FR']['country'] = 'FR';
$opt['locale']['PL']['timezone'] = 'Europe/Berlin';
$opt['locale']['PL']['format']['dm'] = '%d.%m.';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['PL']['format']['date'] = '%x';
@@ -138,7 +134,6 @@
$opt['locale']['PL']['format']['timesec'] = '%X';
$opt['locale']['PL']['country'] = 'PL';
$opt['locale']['NL']['timezone'] = 'Europe/Berlin';
$opt['locale']['NL']['format']['dm'] = '%d.%m.';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['NL']['format']['date'] = '%x';
@@ -151,7 +146,6 @@
$opt['locale']['NL']['page']['subtitle2'] = '';
$opt['locale']['NL']['country'] = 'NL';
$opt['locale']['IT']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['IT']['format']['dm'] = '%d.%m.';
$opt['locale']['IT']['format']['date'] = '%x';
@@ -164,7 +158,6 @@
$opt['locale']['IT']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['IT']['page']['subtitle2'] = '';
$opt['locale']['RU']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['RU']['format']['dm'] = '%d.%m.';
$opt['locale']['RU']['format']['date'] = '%x';
@@ -175,7 +168,6 @@
$opt['locale']['RU']['format']['timesec'] = '%X';
$opt['locale']['RU']['country'] = 'RU';
$opt['locale']['ES']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['ES']['format']['dm'] = '%d.%m.';
$opt['locale']['ES']['format']['date'] = '%x';
@@ -188,7 +180,6 @@
$opt['locale']['ES']['page']['subtitle1'] = 'Geocaching con Opencaching';
$opt['locale']['ES']['page']['subtitle2'] = '';
$opt['locale']['SV']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['SV']['format']['dm'] = '%d.%m.';
$opt['locale']['SV']['format']['date'] = '%Y-%m-%d';
@@ -201,7 +192,6 @@
$opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
$opt['locale']['SV']['page']['subtitle2'] = '';
$opt['locale']['NO']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['NO']['format']['dm'] = '%d.%m.';
$opt['locale']['NO']['format']['date'] = '%Y-%m-%d';
@@ -214,7 +204,6 @@
$opt['locale']['NO']['page']['subtitle1'] = 'Geocaching med Opencaching';
$opt['locale']['NO']['page']['subtitle2'] = '';
$opt['locale']['DA']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['DA']['format']['dm'] = '%d.%m.';
$opt['locale']['DA']['format']['date'] = '%Y-%m-%d';
@@ -227,7 +216,6 @@
$opt['locale']['DA']['page']['subtitle1'] = 'Geocaching med Opencaching';
$opt['locale']['DA']['page']['subtitle2'] = '';
$opt['locale']['PT']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['PT']['format']['dm'] = '%d.%m.';
$opt['locale']['PT']['format']['date'] = '%Y-%m-%d';
@@ -240,7 +228,6 @@
$opt['locale']['PT']['page']['subtitle1'] = 'Geocaching com Opencaching';
$opt['locale']['PT']['page']['subtitle2'] = '';
$opt['locale']['JA']['timezone'] = 'Europe/Berlin';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
$opt['locale']['JA']['format']['dm'] = '%d.%m.';
$opt['locale']['JA']['format']['date'] = '%Y-%m-%d';

54
htdocs/config2/settings-dev.inc.php
View File

@@ -48,35 +48,6 @@
$opt['db']['error']['mail'] = 'root';
$opt['db']['error']['subject'] = 'sql_error';
/* cookie or session
*
* SAVE_COOKIE = only use cookies
* SAVE_SESSION = use php sessions
*
* to use SESSIONS set php.ini to session default values:
*
* session.auto_start = 0
* session.use_cookies = 1
* session.use_only_cookies = 0
* session.cookie_lifetime = 0
* session.cookie_path = "/"
* session.cookie_domain = ""
* session.cookie_secure = off
* session.use_trans_sid = 0
*
* other parameters may be customized
*/
$opt['session']['mode'] = SAVE_COOKIE;
$opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE
$opt['session']['path'] = '/';
$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
/* If the Referer was sent by the client and the substring was not found,
* the embedded session id will be marked as invalid.
* Only used with session.mode = SAVE_SESSION
*/
$opt['session']['check_referer'] = true;
/* Debug level (combine with OR | )
* DEBUG_NO = productive use
* DEBUG_DEVELOPER = developer system
@@ -97,6 +68,10 @@
$opt['logic']['node']['id'] = 4;
$opt['logic']['waypoint_pool']['prefix'] = 'OC';
/* cachemaps
*/
$opt['logic']['cachemaps']['url'] = 'http://maps.google.com/maps/api/staticmap?center={latitude},{longitude}&zoom={userzoom}&size=200x200&maptype=hybrid&markers=color:blue|label:|{latitude},{longitude}&sensor=false';
/* other template options
*
*/
@@ -110,25 +85,6 @@
$opt['logic']['pictures']['url'] = $opt['page']['absolute_url'] . '/images/uploads';
$opt['logic']['pictures']['thumb_url'] = $opt['logic']['pictures']['url'] . '/thumbs';
/* maps
*/
$opt['logic']['cachemaps']['wmsurl'] = 'http://www.opencaching.de/cachemaps.php?wp={wp_oc}';
$opt['map']['disablefullscreen'] = false;
/* cachemaps (new)
* how to display the cache map on viewcache.php (200x200 pixel)
*
* option 1) via <img> tag (e.g. google maps)
* 2) via <iframe> tag (e.g. own mapserver)
*
* placeholders:
* {userzoom} = user zoomlevel (see myprofile.php)
* {latitude} = latitude of the cache
* {longitude} = longitude of the cache
*/
$opt['logic']['cachemaps']['url'] = 'http://maps.google.com/maps/api/staticmap?center={latitude},{longitude}&zoom={userzoom}&size=200x200&markers=color:blue|label:|{latitude},{longitude}&sensor=false'; // &key={gmkey}
$opt['logic']['cachemaps']['iframe'] = false;
/* E-Mail for notification about news (newstopic.php)
*/
$opt['news']['mail'] = 'root';
@@ -147,8 +103,6 @@
$opt['lib']['garmin']['url'] = 'http://local.opencaching.de/';
$opt['lib']['garmin']['redirect'] = $opt['lib']['garmin']['url'] . 'garmin.php?redirect=1&cacheid={cacheid}';
$opt['template']['default']['style'] = 'ocstyle';
$opt['bin']['cs2cs'] = '/var/www/bin/cs2cs';
// other settings

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

@@ -34,10 +34,7 @@
* mysql.trace_mode = On
*/
$opt['php']['debug'] = PHP_DEBUG_SKIP;
/* settings for the template engine
*
*/
$opt['php']['timezone'] = 'Europe/Berlin';
// database connection
@@ -501,10 +498,6 @@
$opt['map']['min_maxrecords'] = 100;
$opt['map']['max_maxrecords'] = 4000;
// the full screen mode requires a GIS server at the moment
// has to be migrated to map2.php
// $opt['map']['disablefullscreen'] = true; no longer used
/* external binaries
*/
$opt['bin']['cs2cs'] = 'cs2cs';

86
htdocs/config2/settings-sample.inc.php
View File

@@ -4,36 +4,25 @@
*
* Unicode Reminder メモ
*
* All settings to run the website.
* Sample of settings.inc.php - all lib2 settings needed to run the website.
* In addition to this, you must create settings.inc.php files from
* .dist files at the following places:
*
* lib
* util/mysql_root
* util/notifications
* util/publish_caches
* util/watchlist
*
***************************************************************************/
/* PHP settings
*
* PHP_DEBUG_SKIP
*
* dont use ini_set()
*
* PHP_DEBUG_OFF
*
* use the following php.ini-settings
* display_errors = On
* error_reporting = E_ALL & ~E_NOTICE
* mysql.trace_mode = Off
*
* strongly recommended settings
* register_globals = Off
*
* PHP_DEBUG_ON
*
* use the following php.ini-settings
* display_errors = On
* error_reporting = E_ALL
* mysql.trace_mode = On
* see settings-dist.inc.php for explanation
*/
$opt['php']['debug'] = PHP_DEBUG_ON;
$opt['php']['timezone'] = 'Europe/Berlin';
/* settings for the template engine
*
/* database settings
*/
$opt['db']['servername'] = 'localhost';
$opt['db']['username'] = '<db>';
@@ -50,10 +39,10 @@
$opt['db']['error']['mail'] = '<admin email>';
$opt['db']['error']['subject'] = 'sql_error';
// database placeholder
// database names
$opt['db']['placeholder']['db'] = 'ocde';
$opt['db']['placeholder']['tmpdb'] = 'ocdetmp';
$opt['db']['placeholder']['hist'] = 'ocdehist';
$opt['db']['placeholder']['hist'] = 'ocde';
/* cookie or session
*
@@ -70,13 +59,14 @@
* session.cookie_domain = ""
* session.cookie_secure = off
* session.use_trans_sid = 0
*
* set session.safe_path to a secure place
*
* other parameters may be customized
*/
$opt['session']['mode'] = SAVE_COOKIE;
$opt['session']['cookiename'] = '<cookiename>'; // only with SAVE_COOKIE
$opt['session']['path'] = '/';
$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde'
$opt['session']['domain'] = '<do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain']
/* If the Referer was sent by the client and the substring was not found,
* the embedded session id will be marked as invalid.
@@ -102,8 +92,10 @@
/* other template options
*
*/
$opt['page']['name'] = 'Geocaching mit Opencaching';
$opt['page']['absolute_url'] = 'http://<domain>';
$opt['mail']['from'] = '<admin email>';
$opt['page']['max_logins_per_hour'] = 250;
/* location of uploaded images
*/
@@ -115,10 +107,6 @@
*/
$opt['logic']['podcasts']['url'] = 'http://<domain>/podcasts/uploads';
/* cachemaps
*/
$opt['logic']['cachemaps']['wmsurl'] = 'http://www.opencaching.de/cachemaps.php?wp={wp_oc}';
/* password authentication method
* (true means extra hash on the digested password)
*/
@@ -129,6 +117,23 @@
$opt['news']['mail'] = '<admin email>';
$opt['mail']['subject'] = '[<domain>] ';
/* pregenerated waypoint list for new caches
* - Waypoint prefix (OC, OP, OZ ... AA=local development)
* - When pool contains less than min_count, generation process starts
* and fills up the pool until max_count is reached.
*/
$opt['logic']['waypoint_pool']['prefix'] = 'AA';
$opt['logic']['waypoint_pool']['min_count'] = 1000;
$opt['logic']['waypoint_pool']['max_count'] = 2000;
// chars used for waypoints. Remember to reinstall triggers and clear cache_waypoint_pool after changing
$opt['logic']['waypoint_pool']['valid_chars'] = '0123456789ABCDEF';
// fill_gaps = true: search for gaps between used waypoints and fill up these gaps
// (fill_gaps is slow and CPU intensive on database server. For
// productive servers you may want to generate some waypoints
// without fill_gaps first)
// fill_gaps = false: continue with the last waypoint
$opt['logic']['waypoint_pool']['fill_gaps'] = false;
/* 3rd party library options
* see https://my.garmin.com/api/communicator/key-generator.jsp
*/
@@ -137,8 +142,19 @@
$opt['logic']['node']['id'] = 4;
$opt['logic']['theme'] = 'seasons'; // leave blank to disable theme
$opt['logic']['lowresfriendly'] = false;
// Google Maps API key
// http://code.google.com/intl/de/apis/maps/signup.html
// $opt['lib']['google']['mapkey']['<domain>'] = 'EEFFGGHH...';
// email address for user contact emails
// has to be an autoresponder informing about wrong mail usage
$opt['mail']['usermail'] = 'usermail@opencaching.de';
// contact address
$opt['mail']['contact'] = 'contact@opencaching.de';
$opt['page']['showdonations'] = true;
function post_config()
{

3
htdocs/config2/sqlroot-dist.inc.php
View File

@@ -13,6 +13,9 @@
*
* Default settings for all options in sqlroot.inc.php
* Do not modify this file - use settings.inc.php!
*
* This is currently needed only for 'reset IDs' function in translate.php
* (via sql_connect_root in lib2/db.inc.php).
***************************************************************************/
if ($opt['debug'] == DEBUG_NO)

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

@@ -43,9 +43,10 @@ date commit ID change
caches_attributes_modified, cache_logs_restored,
cache_pictures_modified and listing_restored
- modified lots of triggers
2013-03-09 added field 'restored_by' to cache_coordinates, cache_countries,
2013-03-09 09b51ecc added field 'restored_by' to cache_coordinates, cache_countries,
cache_logs_archived, all new tables and to triggers
removed table listing_restored
added index cache_logs_archived:user_id
2013-03-10 added field 'mappreview' in pictures and pictures_modified
2013-03-14 added fields coordinates_type.preposition and pp_trans_id
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

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

@@ -225,7 +225,7 @@ function set_timezone()
{
global $opt;
date_default_timezone_set($opt['locale'][$opt['template']['locale']]['timezone']);
date_default_timezone_set($opt['php']['timezone']);
}
function fix_magic_quotes_gpc()