@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | // database placeholder |
108 | 108 | |
109 | 109 | // productive database with opencaching-tables |
110 | -$opt['db']['placeholder']['db'] = ''; // selected by default |
|
110 | +$opt['db']['placeholder']['db'] = ''; // selected by default |
|
111 | 111 | |
112 | 112 | // empty database for temporary table creation |
113 | 113 | $opt['db']['placeholder']['tmpdb'] = ''; |
@@ -121,14 +121,14 @@ discard block |
||
121 | 121 | $opt['system']['maillog']['syslog_db_user'] = ''; |
122 | 122 | $opt['system']['maillog']['syslog_db_password'] = ''; |
123 | 123 | $opt['system']['maillog']['syslog_db_table'] = ''; |
124 | -$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB |
|
125 | -$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB |
|
126 | -$opt['system']['maillog']['column']['id'] = 'id'; // 'ID' |
|
127 | -$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt' |
|
124 | +$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB |
|
125 | +$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB |
|
126 | +$opt['system']['maillog']['column']['id'] = 'id'; // 'ID' |
|
127 | +$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt' |
|
128 | 128 | $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost' |
129 | -$opt['system']['maillog']['column']['message'] = 'message'; // 'Message' |
|
130 | -$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag' |
|
131 | -$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries |
|
129 | +$opt['system']['maillog']['column']['message'] = 'message'; // 'Message' |
|
130 | +$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag' |
|
131 | +$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries |
|
132 | 132 | |
133 | 133 | /* cookie or session |
134 | 134 | * |
@@ -150,15 +150,15 @@ discard block |
||
150 | 150 | * |
151 | 151 | * other parameters may be customized |
152 | 152 | */ |
153 | -$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly |
|
153 | +$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly |
|
154 | 154 | $opt['session']['cookiename'] = 'ocvagrant'; // only with SAVE_COOKIE |
155 | 155 | $opt['session']['path'] = '/'; |
156 | -$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain'] |
|
156 | +$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain'] |
|
157 | 157 | |
158 | 158 | /* maximum session lifetime |
159 | 159 | */ |
160 | 160 | $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year) |
161 | -$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js |
|
161 | +$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js |
|
162 | 162 | |
163 | 163 | /* If the Referer was sent by the client and the substring was not found, |
164 | 164 | * the embedded session id will be marked as invalid. |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | /* other template options |
185 | 185 | * |
186 | 186 | */ |
187 | -$opt['page']['origin_url'] = 'https://www.opencaching.de/'; // production installation for this OC site |
|
187 | +$opt['page']['origin_url'] = 'https://www.opencaching.de/'; // production installation for this OC site |
|
188 | 188 | $opt['page']['develsystem'] = false; |
189 | 189 | $opt['page']['teampic_url'] = 'https://www.opencaching.de/images/team/'; |
190 | 190 | $opt['page']['teammember_url'] = 'https://www.opencaching.de/'; |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | 'newcaches' => [ |
219 | 219 | 'show' => true, |
220 | 220 | 'url' => 'https://www.opencaching.de', |
221 | - 'urlname' => '', // optional: show other name than the url-domain |
|
221 | + 'urlname' => '', // optional: show other name than the url-domain |
|
222 | 222 | ], |
223 | 223 | ]; |
224 | 224 | |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | /* license-related functions |
380 | 380 | */ |
381 | -$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php |
|
381 | +$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php |
|
382 | 382 | $opt['logic']['license']['admin'] = true; |
383 | 383 | $opt['logic']['license']['disclaimer'] = false; |
384 | 384 | $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense'; |
@@ -386,18 +386,18 @@ discard block |
||
386 | 386 | |
387 | 387 | /* optional APIs |
388 | 388 | */ |
389 | -$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable |
|
390 | -$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable |
|
389 | +$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable |
|
390 | +$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable |
|
391 | 391 | |
392 | 392 | /* cache report info settings |
393 | 393 | */ |
394 | 394 | $opt['logic']['cache_reports']['delaydays'] = 2; |
395 | -$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable |
|
396 | -$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable |
|
395 | +$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable |
|
396 | +$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable |
|
397 | 397 | |
398 | 398 | /* cronjob |
399 | 399 | */ |
400 | -$opt['cron']['username'] = 'apache'; // system username for cronjobs |
|
400 | +$opt['cron']['username'] = 'apache'; // system username for cronjobs |
|
401 | 401 | |
402 | 402 | /* generate sitemap.xml and upload to search engines |
403 | 403 | * |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $nFileNr = 0; |
65 | 65 | $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0'); |
66 | 66 | while ($r = sql_fetch_array($rs)) { |
67 | - $nFileNr ++; |
|
67 | + $nFileNr++; |
|
68 | 68 | $fileparts = mb_split('/', $r['url']); |
69 | 69 | $filename = $fileparts[count($fileparts) - 1]; |
70 | 70 | |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | exit; |
234 | 234 | } |
235 | 235 | |
236 | - for ($i = 1; $i <= $filescount; $i ++) { |
|
236 | + for ($i = 1; $i <= $filescount; $i++) { |
|
237 | 237 | echo 'Download Paket: ' . $i . ' von ' . $filescount . "\n"; |
238 | 238 | |
239 | 239 | $fileurl = $opt['url_getsession']; |
@@ -407,11 +407,11 @@ discard block |
||
407 | 407 | if ($sSubElement != '') { |
408 | 408 | // vorheriges element zuerst schlißen |
409 | 409 | $sSubElement = ''; |
410 | - $nRecursionLevel --; |
|
410 | + $nRecursionLevel--; |
|
411 | 411 | } |
412 | 412 | |
413 | 413 | $sSubElement = mb_strtoupper($xmlReader->name); |
414 | - $nRecursionLevel ++; |
|
414 | + $nRecursionLevel++; |
|
415 | 415 | |
416 | 416 | // attribute auslesen |
417 | 417 | if ($xmlReader->moveToFirstAttribute()) { |
@@ -428,7 +428,7 @@ discard block |
||
428 | 428 | } else { |
429 | 429 | if ($xmlReader->nodeType == XMLReader::END_ELEMENT) { |
430 | 430 | $sSubElement = ''; |
431 | - $nRecursionLevel --; |
|
431 | + $nRecursionLevel--; |
|
432 | 432 | } |
433 | 433 | } |
434 | 434 | } |
@@ -1,4 +1,4 @@ |
||
1 | 1 | <?php return array ( |
2 | - 'version_number' => 1686, |
|
3 | - 'git_revision' => 'f899783a15b8b8721da9792c94314a2b462f05e7', |
|
2 | + 'version_number' => 1686, |
|
3 | + 'git_revision' => 'f899783a15b8b8721da9792c94314a2b462f05e7', |
|
4 | 4 | ); |
@@ -1,4 +1,4 @@ |
||
1 | -<?php return array ( |
|
1 | +<?php return array( |
|
2 | 2 | 'version_number' => 1686, |
3 | 3 | 'git_revision' => 'f899783a15b8b8721da9792c94314a2b462f05e7', |
4 | 4 | ); |