@@ -144,7 +144,7 @@ |
||
| 144 | 144 | |
| 145 | 145 | /* default locale |
| 146 | 146 | */ |
| 147 | -$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 147 | +$opt['template']['default']['locale'] = 'DE'; // can be overwritten by $opt['domain'][<domain>]['locale'] |
|
| 148 | 148 | |
| 149 | 149 | // include all locale settings |
| 150 | 150 | require_once $rootpath . 'config2/locale.inc.php'; |
@@ -239,10 +239,10 @@ discard block |
||
| 239 | 239 | // muss dieses & ersetzt werden, oder ist es escaped? |
| 240 | 240 | $escapesCount = 0; |
| 241 | 241 | while ((($nextarg - $escapesCount - 1) > 0) && (mb_substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) { |
| 242 | - $escapesCount ++; |
|
| 242 | + $escapesCount++; |
|
| 243 | 243 | } |
| 244 | 244 | if (($escapesCount % 2) == 1) { |
| 245 | - $nextarg ++; |
|
| 245 | + $nextarg++; |
|
| 246 | 246 | } else { |
| 247 | 247 | $nextchar = mb_substr($sql, $nextarg + 1, 1); |
| 248 | 248 | if (is_numeric($nextchar)) { |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | while (mb_ereg_match('^[0-9]{1}', $nextchar) == 1) { |
| 254 | 254 | $arg .= $nextchar; |
| 255 | 255 | |
| 256 | - $arglength ++; |
|
| 256 | + $arglength++; |
|
| 257 | 257 | $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1); |
| 258 | 258 | } |
| 259 | 259 | |
@@ -285,13 +285,13 @@ discard block |
||
| 285 | 285 | // Anführungszeichen weg machen und NULL einsetzen |
| 286 | 286 | $filtered_sql = mb_substr($filtered_sql, 0, mb_strlen($filtered_sql) - 1); |
| 287 | 287 | $filtered_sql .= 'NULL'; |
| 288 | - $sqlpos ++; |
|
| 288 | + $sqlpos++; |
|
| 289 | 289 | } else { |
| 290 | 290 | $filtered_sql .= 'NULL'; |
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - $sqlpos ++; |
|
| 294 | + $sqlpos++; |
|
| 295 | 295 | } else { |
| 296 | 296 | $arglength = 0; |
| 297 | 297 | $arg = ''; |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | while (mb_ereg_match('^[a-zA-Z0-9]{1}', $nextchar) == 1) { |
| 301 | 301 | $arg .= $nextchar; |
| 302 | 302 | |
| 303 | - $arglength ++; |
|
| 303 | + $arglength++; |
|
| 304 | 304 | $nextchar = mb_substr($sql, $nextarg + $arglength + 1, 1); |
| 305 | 305 | } |
| 306 | 306 | |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | $escapesCount = 0; |
| 330 | 330 | while ((($nextarg - $escapesCount - 1) > 0) && |
| 331 | 331 | (mb_substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) { |
| 332 | - $escapesCount ++; |
|
| 332 | + $escapesCount++; |
|
| 333 | 333 | } |
| 334 | 334 | if (($escapesCount % 2) == 0) { |
| 335 | 335 | // \& ersetzen durch & |
| 336 | 336 | $filtered_sql = mb_substr($filtered_sql, 0, $nextarg) . '&' . mb_substr($filtered_sql, $nextarg + 2); |
| 337 | - $nextarg --; |
|
| 337 | + $nextarg--; |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | $nextarg = mb_strpos($filtered_sql, '\&', $nextarg + 2); |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | $process = new Process($cmd, $this->rootPath, null, null, 9600); |
| 46 | - $process->run(function ($type, $buffer) { |
|
| 46 | + $process->run(function($type, $buffer) { |
|
| 47 | 47 | echo $buffer; |
| 48 | 48 | }); |
| 49 | 49 | |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | ] |
| 55 | 55 | ); |
| 56 | 56 | |
| 57 | - $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) { |
|
| 57 | + $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) { |
|
| 58 | 58 | $data = $event->getData(); |
| 59 | 59 | $form = $event->getForm(); |
| 60 | 60 | |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | // & escaped? |
| 182 | 182 | $escapesCount = 0; |
| 183 | 183 | while ((($nextarg - $escapesCount - 1) > 0) && (substr($sql, $nextarg - $escapesCount - 1, 1) == '\\')) { |
| 184 | - $escapesCount ++; |
|
| 184 | + $escapesCount++; |
|
| 185 | 185 | } |
| 186 | 186 | if (($escapesCount % 2) === 1) { |
| 187 | 187 | $nextarg++; |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | while (preg_match('/^[0-9]{1}/', $nextchar) === 1) { |
| 196 | 196 | $arg .= $nextchar; |
| 197 | 197 | |
| 198 | - $arglength ++; |
|
| 198 | + $arglength++; |
|
| 199 | 199 | $nextchar = substr($sql, $nextarg + $arglength + 1, 1); |
| 200 | 200 | } |
| 201 | 201 | |
@@ -221,13 +221,13 @@ discard block |
||
| 221 | 221 | // strip apostroph and insert NULL |
| 222 | 222 | $filtered_sql = substr($filtered_sql, 0, strlen($filtered_sql) - 1); |
| 223 | 223 | $filtered_sql .= 'NULL'; |
| 224 | - $sqlpos ++; |
|
| 224 | + $sqlpos++; |
|
| 225 | 225 | } else { |
| 226 | 226 | $filtered_sql .= 'NULL'; |
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - $sqlpos ++; |
|
| 230 | + $sqlpos++; |
|
| 231 | 231 | } else { |
| 232 | 232 | $arglength = 0; |
| 233 | 233 | $arg = ''; |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | while (preg_match('/^[a-zA-Z0-9_]{1}/', $nextchar) == 1) { |
| 238 | 238 | $arg .= $nextchar; |
| 239 | 239 | |
| 240 | - $arglength ++; |
|
| 240 | + $arglength++; |
|
| 241 | 241 | $nextchar = substr($sql, $nextarg + $arglength + 1, 1); |
| 242 | 242 | } |
| 243 | 243 | |
@@ -284,12 +284,12 @@ discard block |
||
| 284 | 284 | $escapesCount = 0; |
| 285 | 285 | while ((($nextarg - $escapesCount - 1) > 0) |
| 286 | 286 | && (substr($filtered_sql, $nextarg - $escapesCount - 1, 1) == '\\')) { |
| 287 | - $escapesCount ++; |
|
| 287 | + $escapesCount++; |
|
| 288 | 288 | } |
| 289 | 289 | if (($escapesCount % 2) == 0) { |
| 290 | 290 | // strip escapes of & |
| 291 | 291 | $filtered_sql = substr($filtered_sql, 0, $nextarg) . '&' . substr($filtered_sql, $nextarg + 2); |
| 292 | - $nextarg --; |
|
| 292 | + $nextarg--; |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | $nextarg = strpos($filtered_sql, '\&', $nextarg + 2); |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | AND `online`= 1 |
| 827 | 827 | AND (TIMESTAMP(NOW())-TIMESTAMP(`last_check`)+`time_diff`<'&1') |
| 828 | 828 | ORDER BY `w` DESC LIMIT 1", |
| 829 | - - 1, |
|
| 829 | + -1, |
|
| 830 | 830 | $nMaxTimeDiff |
| 831 | 831 | ); |
| 832 | 832 | |
@@ -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 | * |
@@ -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; |
@@ -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 | } |
@@ -43,9 +43,9 @@ |
||
| 43 | 43 | mb_regex_encoding('UTF-8'); |
| 44 | 44 | |
| 45 | 45 | // set options |
| 46 | -require_once __DIR__.'/../config2/settings-dist.inc.php'; |
|
| 47 | -require_once __DIR__.'/../config2/settings.inc.php'; |
|
| 48 | -require_once __DIR__.'/../config2/verify-settings.inc.php'; |
|
| 46 | +require_once __DIR__ . '/../config2/settings-dist.inc.php'; |
|
| 47 | +require_once __DIR__ . '/../config2/settings.inc.php'; |
|
| 48 | +require_once __DIR__ . '/../config2/verify-settings.inc.php'; |
|
| 49 | 49 | |
| 50 | 50 | foreach ($opt['page']['banned_user_agents'] as $ua) { |
| 51 | 51 | if (strpos($useragent, $ua) !== false) { |