@@ -8,8 +8,8 @@ discard block |
||
| 8 | 8 | * Do not modify this file - use settings.inc.php! |
| 9 | 9 | ***************************************************************************/ |
| 10 | 10 | |
| 11 | -require_once __DIR__. '/locale.inc.php'; |
|
| 12 | -require_once __DIR__. '/settings-dist-common.inc.php'; |
|
| 11 | +require_once __DIR__ . '/locale.inc.php'; |
|
| 12 | +require_once __DIR__ . '/settings-dist-common.inc.php'; |
|
| 13 | 13 | |
| 14 | 14 | /* PHP settings |
| 15 | 15 | * |
@@ -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 | |
@@ -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 | /* phpbb news integration (index.php, outdated) |
| 403 | 403 | * |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | } |
| 492 | 492 | |
| 493 | 493 | /** |
| 494 | - * @param $byte |
|
| 494 | + * @param integer $byte |
|
| 495 | 495 | * @param $start |
| 496 | 496 | * @param $len |
| 497 | 497 | * |
@@ -508,8 +508,8 @@ discard block |
||
| 508 | 508 | |
| 509 | 509 | $CurrentBit = 0; |
| 510 | 510 | /** |
| 511 | - * @param $f |
|
| 512 | - * @param $count |
|
| 511 | + * @param resource $f |
|
| 512 | + * @param integer $count |
|
| 513 | 513 | * |
| 514 | 514 | * @return number |
| 515 | 515 | */ |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | } |
| 565 | 565 | |
| 566 | 566 | /** |
| 567 | - * @param $n |
|
| 567 | + * @param integer $n |
|
| 568 | 568 | * |
| 569 | 569 | * @return string |
| 570 | 570 | */ |
@@ -585,7 +585,7 @@ discard block |
||
| 585 | 585 | |
| 586 | 586 | /** |
| 587 | 587 | * @param $d |
| 588 | - * @param $n |
|
| 588 | + * @param integer $n |
|
| 589 | 589 | * |
| 590 | 590 | * @return string |
| 591 | 591 | */ |
@@ -91,10 +91,10 @@ discard block |
||
| 91 | 91 | * |
| 92 | 92 | */ |
| 93 | 93 | /** |
| 94 | - * @param $block |
|
| 95 | - * @param $message |
|
| 94 | + * @param string $block |
|
| 95 | + * @param string $message |
|
| 96 | 96 | * @param $smarty |
| 97 | - * @param $line |
|
| 97 | + * @param integer $line |
|
| 98 | 98 | * |
| 99 | 99 | * @return string |
| 100 | 100 | */ |
@@ -268,7 +268,7 @@ discard block |
||
| 268 | 268 | |
| 269 | 269 | /** |
| 270 | 270 | * @param $haystack |
| 271 | - * @param $needles |
|
| 271 | + * @param string[] $needles |
|
| 272 | 272 | * |
| 273 | 273 | * @return bool|int |
| 274 | 274 | */ |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | $str = ''; |
| 200 | 200 | |
| 201 | 201 | ftsearch_load_ignores(); |
| 202 | - for ($i = count($astr) - 1; $i >= 0; $i --) { |
|
| 202 | + for ($i = count($astr) - 1; $i >= 0; $i--) { |
|
| 203 | 203 | // ignore? |
| 204 | 204 | if (array_search(mb_strtolower($astr[$i]), $ftsearch_ignores) !== false) { |
| 205 | 205 | unset($astr[$i]); |
@@ -254,7 +254,7 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | // doppelte chars ersetzen |
| 256 | 256 | $ordZ = ord('z'); |
| 257 | - for ($c = ord('a'); $c <= $ordZ; $c ++) { |
|
| 257 | + for ($c = ord('a'); $c <= $ordZ; $c++) { |
|
| 258 | 258 | $old_str = ''; |
| 259 | 259 | while ($old_str !== $str) { |
| 260 | 260 | $old_str = $str; |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | /** |
| 283 | - * @param $menuid |
|
| 283 | + * @param integer|null $menuid |
|
| 284 | 284 | * @param $ids |
| 285 | 285 | * @param $items |
| 286 | 286 | */ |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | } |
| 303 | 303 | |
| 304 | 304 | /** |
| 305 | - * @return array |
|
| 305 | + * @return integer[] |
|
| 306 | 306 | */ |
| 307 | 307 | public function GetSelectedMenuIds() |
| 308 | 308 | { |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | 'parent' => MNU_MAP |
| 81 | 81 | ]; |
| 82 | 82 | $menuitem[MNU_MAP]['subitems'][] = $menu_map; |
| 83 | - ++ $menu_map; |
|
| 83 | + ++$menu_map; |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | $rsSubmenu = sqlf("SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC"); |
| 108 | 108 | while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) { |
| 109 | 109 | $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id']; |
| 110 | - $nPos ++; |
|
| 110 | + $nPos++; |
|
| 111 | 111 | } |
| 112 | 112 | sql_free_result($rsSubmenu); |
| 113 | 113 | fwrite($f, "\n"); |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | ); |
| 145 | 145 | while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) { |
| 146 | 146 | $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id']; |
| 147 | - $nPos ++; |
|
| 147 | + $nPos++; |
|
| 148 | 148 | } |
| 149 | 149 | sql_free_result($rsSubmenu); |
| 150 | 150 | } |
@@ -490,7 +490,7 @@ |
||
| 490 | 490 | } |
| 491 | 491 | |
| 492 | 492 | /** |
| 493 | - * @return bool |
|
| 493 | + * @return boolean|null |
|
| 494 | 494 | */ |
| 495 | 495 | public function getAnyChanged() |
| 496 | 496 | { |
@@ -236,8 +236,8 @@ discard block |
||
| 236 | 236 | * import variables for substition from config2/nodetext/ |
| 237 | 237 | * |
| 238 | 238 | * @param $variables |
| 239 | - * @param $file |
|
| 240 | - * @param $language |
|
| 239 | + * @param string $file |
|
| 240 | + * @param string $language |
|
| 241 | 241 | * |
| 242 | 242 | * @return bool |
| 243 | 243 | */ |
@@ -269,7 +269,7 @@ discard block |
||
| 269 | 269 | |
| 270 | 270 | /** |
| 271 | 271 | * @param $variables |
| 272 | - * @param $lang |
|
| 272 | + * @param string $lang |
|
| 273 | 273 | * @param $str |
| 274 | 274 | * |
| 275 | 275 | * @return string |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | /** |
| 66 | - * @param $name |
|
| 66 | + * @param string $name |
|
| 67 | 67 | * @param null $default |
| 68 | 68 | * |
| 69 | 69 | * @return mixed|null |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | /** |
| 77 | - * @param $name |
|
| 77 | + * @param string $name |
|
| 78 | 78 | * |
| 79 | 79 | * @return bool |
| 80 | 80 | */ |
@@ -50,7 +50,7 @@ |
||
| 50 | 50 | // TODO fix the following if statement, seems corrupted |
| 51 | 51 | if (strtolower( |
| 52 | 52 | substr( |
| 53 | - 'http' + strstr($_SERVER['REFERER'], '://'), |
|
| 53 | + 'http' +strstr($_SERVER['REFERER'], '://'), |
|
| 54 | 54 | 0, |
| 55 | 55 | strlen($opt['page']['absolute_http_url']) |
| 56 | 56 | ) |