@@ -108,7 +108,7 @@ discard block |
||
| 108 | 108 | // database placeholder |
| 109 | 109 | |
| 110 | 110 | // productive database with opencaching-tables |
| 111 | -$opt['db']['placeholder']['db'] = ''; // selected by default |
|
| 111 | +$opt['db']['placeholder']['db'] = ''; // selected by default |
|
| 112 | 112 | |
| 113 | 113 | // empty database for temporary table creation |
| 114 | 114 | $opt['db']['placeholder']['tmpdb'] = ''; |
@@ -122,14 +122,14 @@ discard block |
||
| 122 | 122 | $opt['system']['maillog']['syslog_db_user'] = ''; |
| 123 | 123 | $opt['system']['maillog']['syslog_db_password'] = ''; |
| 124 | 124 | $opt['system']['maillog']['syslog_db_table'] = ''; |
| 125 | -$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB |
|
| 126 | -$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB |
|
| 127 | -$opt['system']['maillog']['column']['id'] = 'id'; // 'ID' |
|
| 128 | -$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt' |
|
| 125 | +$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB |
|
| 126 | +$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB |
|
| 127 | +$opt['system']['maillog']['column']['id'] = 'id'; // 'ID' |
|
| 128 | +$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt' |
|
| 129 | 129 | $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost' |
| 130 | -$opt['system']['maillog']['column']['message'] = 'message'; // 'Message' |
|
| 131 | -$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag' |
|
| 132 | -$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries |
|
| 130 | +$opt['system']['maillog']['column']['message'] = 'message'; // 'Message' |
|
| 131 | +$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag' |
|
| 132 | +$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries |
|
| 133 | 133 | |
| 134 | 134 | /* cookie or session |
| 135 | 135 | * |
@@ -151,15 +151,15 @@ discard block |
||
| 151 | 151 | * |
| 152 | 152 | * other parameters may be customized |
| 153 | 153 | */ |
| 154 | -$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly |
|
| 154 | +$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly |
|
| 155 | 155 | $opt['session']['cookiename'] = 'oc_devel'; // only with SAVE_COOKIE |
| 156 | 156 | $opt['session']['path'] = '/'; |
| 157 | -$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain'] |
|
| 157 | +$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain'] |
|
| 158 | 158 | |
| 159 | 159 | /* maximum session lifetime |
| 160 | 160 | */ |
| 161 | 161 | $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year) |
| 162 | -$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js |
|
| 162 | +$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js |
|
| 163 | 163 | |
| 164 | 164 | /* If the Referer was sent by the client and the substring was not found, |
| 165 | 165 | * the embedded session id will be marked as invalid. |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | /* other template options |
| 186 | 186 | * |
| 187 | 187 | */ |
| 188 | -$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site |
|
| 188 | +$opt['page']['origin_url'] = 'http://www.opencaching.de/'; // production installation for this OC site |
|
| 189 | 189 | $opt['page']['develsystem'] = false; |
| 190 | 190 | $opt['page']['teampic_url'] = 'http://www.opencaching.de/images/team/'; |
| 191 | 191 | $opt['page']['teammember_url'] = 'http://www.opencaching.de/'; |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | 'newcaches' => [ |
| 220 | 220 | 'show' => true, |
| 221 | 221 | 'url' => 'http://www.opencaching.de', |
| 222 | - 'urlname' => '', // optional: show other name than the url-domain |
|
| 222 | + 'urlname' => '', // optional: show other name than the url-domain |
|
| 223 | 223 | ], |
| 224 | 224 | ]; |
| 225 | 225 | |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | /* license-related functions |
| 381 | 381 | */ |
| 382 | -$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php |
|
| 382 | +$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php |
|
| 383 | 383 | $opt['logic']['license']['admin'] = true; |
| 384 | 384 | $opt['logic']['license']['disclaimer'] = false; |
| 385 | 385 | $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense'; |
@@ -387,18 +387,18 @@ discard block |
||
| 387 | 387 | |
| 388 | 388 | /* optional APIs |
| 389 | 389 | */ |
| 390 | -$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable |
|
| 391 | -$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable |
|
| 390 | +$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable |
|
| 391 | +$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable |
|
| 392 | 392 | |
| 393 | 393 | /* cache report info settings |
| 394 | 394 | */ |
| 395 | 395 | $opt['logic']['cache_reports']['delaydays'] = 2; |
| 396 | -$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable |
|
| 397 | -$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable |
|
| 396 | +$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable |
|
| 397 | +$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable |
|
| 398 | 398 | |
| 399 | 399 | /* cronjob |
| 400 | 400 | */ |
| 401 | -$opt['cron']['username'] = 'apache'; // system username for cronjobs |
|
| 401 | +$opt['cron']['username'] = 'apache'; // system username for cronjobs |
|
| 402 | 402 | |
| 403 | 403 | /* phpbb news integration (index.php, outdated) |
| 404 | 404 | * |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | ); |
| 81 | 81 | |
| 82 | 82 | $opt['page']['develsystem'] = true; |
| 83 | -$opt['page']['max_logins_per_hour'] = 1000; // for development ... |
|
| 83 | +$opt['page']['max_logins_per_hour'] = 1000; // for development ... |
|
| 84 | 84 | |
| 85 | 85 | $opt['mail']['from'] = 'root'; |
| 86 | 86 | $opt['mail']['subject'] = '[local.opencaching.de] '; |
@@ -15,11 +15,11 @@ discard block |
||
| 15 | 15 | * bin/dbsv-update.php will then migrate the tables' charset. |
| 16 | 16 | */ |
| 17 | 17 | $opt['charset']['iconv'] = 'UTF-8'; // 'ISO-8859-1'; // use iconv compatible charset-name |
| 18 | -$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name |
|
| 18 | +$opt['charset']['mysql'] = 'utf8'; // use mysql compatible charset-name |
|
| 19 | 19 | |
| 20 | 20 | // handling of SQL and PHP errors |
| 21 | 21 | $opt['db']['error']['display'] = false; |
| 22 | -$opt['db']['error']['mail'] = 'root'; // set '' to disable |
|
| 22 | +$opt['db']['error']['mail'] = 'root'; // set '' to disable |
|
| 23 | 23 | |
| 24 | 24 | // page title |
| 25 | 25 | $opt['page']['title'] = 'OPENCACHING'; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | * Additionally, the cookie domain (different vor lib1 and lib2) can be overwritten. |
| 58 | 58 | * See examples for overriding in settings-sample.inc.php. |
| 59 | 59 | */ |
| 60 | -$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended |
|
| 60 | +$opt['page']['meta']['keywords'] = 'Geocaching, Geocache, Cache, Schatzsuche, GPS, kostenlos, GPX, Koordinaten, Hobby, Natur'; // 5-10 keywords are recommended |
|
| 61 | 61 | // see http://forum.opencaching.de/index.php?topic=3065.0 |
| 62 | 62 | // and http://forum.opencaching.de/index.php?topic=3065.0 regarding description |
| 63 | 63 | $opt['page']['meta']['description'] = 'Opencaching.de ist das freie Portal für Geocaching, ein Schatzsuche-Spiel. Mittels GPS-Koordinaten sind Behälter oder Objekte zu finden.'; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | // see also setting in lib/settings.inc.php! |
| 95 | 95 | $opt['logic']['admin']['team_comments_only_for_reports'] = true; |
| 96 | 96 | $opt['logic']['admin']['enable_listing_admins'] = false; |
| 97 | -$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated |
|
| 97 | +$opt['logic']['admin']['listingadmin_notification'] = ''; // Email address(es), comma separated |
|
| 98 | 98 | |
| 99 | 99 | /* |
| 100 | 100 | * html purifier |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | * other parameters may be customized |
| 67 | 67 | */ |
| 68 | 68 | $opt['session']['mode'] = SAVE_COOKIE; |
| 69 | -$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde' |
|
| 70 | -$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain'] |
|
| 69 | +$opt['session']['cookiename'] = '<cookiename>'; // e.g. 'ocde' |
|
| 70 | +$opt['session']['domain'] = '<.do.main>'; // may be overwritten by $opt['domain'][...]['cookiedomain'] |
|
| 71 | 71 | |
| 72 | 72 | /* If the Referer was sent by the client and the substring was not found, |
| 73 | 73 | * the embedded session id will be marked as invalid. |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | |
| 101 | 101 | /* default locale |
| 102 | 102 | */ |
| 103 | -$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 103 | +$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 104 | 104 | |
| 105 | 105 | /* multi-domain settings |
| 106 | 106 | * |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | $dontwatch = isset($_REQUEST['dontwatch']); |
| 16 | 16 | $bookmark = isset($_REQUEST['bookmark']); |
| 17 | 17 | $unbookmark = isset($_REQUEST['unbookmark']); |
| 18 | -$invalid_waypoints = isset($_REQUEST['invalidwp']) ? '&invalidwp='.urlencode($_REQUEST['invalidwp']) : ''; |
|
| 18 | +$invalid_waypoints = isset($_REQUEST['invalidwp']) ? '&invalidwp=' . urlencode($_REQUEST['invalidwp']) : ''; |
|
| 19 | 19 | |
| 20 | 20 | if ($id) { |
| 21 | 21 | $login->verify(); |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | tpl_set_var('rating_message', mb_ereg_replace('{rating_msg}', $rating_msg, $rating_tpl)); |
| 177 | 177 | |
| 178 | 178 | if (isset($_POST['descMode'])) { |
| 179 | - $descMode = $_POST['descMode'] + 0; // Ocprop: 2 |
|
| 179 | + $descMode = $_POST['descMode'] + 0; // Ocprop: 2 |
|
| 180 | 180 | if (($descMode < 1) || ($descMode > 3)) { |
| 181 | 181 | $descMode = 3; |
| 182 | 182 | } |
@@ -434,7 +434,7 @@ discard block |
||
| 434 | 434 | tpl_set_var('logminute', htmlspecialchars($log_time_minute, ENT_COMPAT, 'UTF-8')); |
| 435 | 435 | tpl_set_var('cachename', htmlspecialchars($cache_name, ENT_COMPAT, 'UTF-8')); |
| 436 | 436 | tpl_set_var('cacheid', $log_record['cache_id']); |
| 437 | - tpl_set_var('reset', $reset); // obsolete |
|
| 437 | + tpl_set_var('reset', $reset); // obsolete |
|
| 438 | 438 | tpl_set_var('submit', $submit); |
| 439 | 439 | tpl_set_var('logid', $log_id); |
| 440 | 440 | tpl_set_var('date_message', !$date_ok ? $date_message : ''); |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | if ($count > 0) { |
| 29 | 29 | $formatter = new FormatterCoordinate(); |
| 30 | 30 | |
| 31 | - for ($i = 0; $i < $count; $i ++) { |
|
| 31 | + for ($i = 0; $i < $count; $i++) { |
|
| 32 | 32 | $waypoints[$i]['coord']['lat'] = $waypoints[$i]['coordinate']->latitude(); |
| 33 | 33 | $waypoints[$i]['coord']['lon'] = $waypoints[$i]['coordinate']->longitude(); |
| 34 | 34 | $waypoints[$i]['coordinateHtml'] = $formatter->formatHtml($waypoints[$i]['coordinate'], '<br />'); |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | // sql debugging |
| 128 | 128 | $sql_allow_debug = 0; |
| 129 | -$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars |
|
| 129 | +$sql_debug_cryptkey = 'this is my very, very secret \'secret key\''; // min. 24 chars |
|
| 130 | 130 | |
| 131 | 131 | // replacements for sql() |
| 132 | 132 | $sql_replacements['db'] = $dbname; |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | |
| 149 | 149 | /* default locale |
| 150 | 150 | */ |
| 151 | -$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 151 | +$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 152 | 152 | |
| 153 | 153 | // include all locale settings |
| 154 | 154 | require_once $rootpath . 'config2/locale.inc.php'; |
@@ -117,11 +117,11 @@ |
||
| 117 | 117 | /* maximum number of failed logins per hour before that IP address is blocked |
| 118 | 118 | * (used to prevent brute-force-attacks) |
| 119 | 119 | */ |
| 120 | -$opt['page']['max_logins_per_hour'] = 1000; // for development ... |
|
| 120 | +$opt['page']['max_logins_per_hour'] = 1000; // for development ... |
|
| 121 | 121 | $opt['page']['headoverlay'] = 'oc_head_alpha3'; |
| 122 | 122 | |
| 123 | 123 | // data license |
| 124 | -$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php |
|
| 124 | +$opt['logic']['license']['disclaimer'] = true; // also in lib2/settings-dist.inc.php |
|
| 125 | 125 | $opt['logic']['license']['terms'] = $absolute_server_URI . 'articles.php?page=impressum#datalicense'; |
| 126 | 126 | |
| 127 | 127 | $opt['logic']['admin']['listingadmin_notification'] = 'root'; |