@@ -35,6 +35,9 @@ discard block |
||
35 | 35 | $this->init(0, 0); |
36 | 36 | } |
37 | 37 | |
38 | + /** |
|
39 | + * @param boolean $request |
|
40 | + */ |
|
38 | 41 | private function initRequest($request) |
39 | 42 | { |
40 | 43 | if ($request) { |
@@ -44,6 +47,9 @@ discard block |
||
44 | 47 | return new RequestHttp(); |
45 | 48 | } |
46 | 49 | |
50 | + /** |
|
51 | + * @param boolean $translator |
|
52 | + */ |
|
47 | 53 | private function initTranslator($translator) |
48 | 54 | { |
49 | 55 | if ($translator) { |
@@ -22,7 +22,7 @@ |
||
22 | 22 | |
23 | 23 | public $compile_id = null; |
24 | 24 | |
25 | - public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id. |
|
25 | + public $cache_id = null; // This is a smarty caching ID, not a caches.cache_id. |
|
26 | 26 | |
27 | 27 | public $title = ''; |
28 | 28 |
@@ -20,13 +20,13 @@ |
||
20 | 20 | * |
21 | 21 | ***************************************************************************/ |
22 | 22 | |
23 | -define('LOGIN_UNKNOWN_ERROR', -1); // unkown error occured |
|
24 | -define('LOGIN_OK', 0); // login succeeded |
|
25 | -define('LOGIN_BADUSERPW', 1); // bad username or password |
|
26 | -define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time |
|
27 | -define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked |
|
23 | +define('LOGIN_UNKNOWN_ERROR', -1); // unkown error occured |
|
24 | +define('LOGIN_OK', 0); // login succeeded |
|
25 | +define('LOGIN_BADUSERPW', 1); // bad username or password |
|
26 | +define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time |
|
27 | +define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked |
|
28 | 28 | define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty |
29 | -define('LOGIN_LOGOUT_OK', 5); // logout was successfull |
|
29 | +define('LOGIN_LOGOUT_OK', 5); // logout was successfull |
|
30 | 30 | |
31 | 31 | // login times in seconds |
32 | 32 | define('LOGIN_TIME', 60 * 60); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | $year = substr($cache['date_created'], 0, 4); |
27 | 27 | if ($year >= 2005 && $year <= date('Y') && ($lat != 0 || $long != 0)) { |
28 | 28 | $years[$year] = true; |
29 | - $liste[$lat][$long]['caches'][$year] ++; |
|
29 | + $liste[$lat][$long]['caches'][$year]++; |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | mysql_free_result($rs); |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | $year = substr($cache['date'], 0, 4); |
51 | 51 | if ($year >= 2005 && $year <= date('Y') && ($lat != 0 || $long != 0)) { |
52 | 52 | $years[$year] = true; |
53 | - $liste[$lat][$long]['logs'][$year] ++; |
|
53 | + $liste[$lat][$long]['logs'][$year]++; |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | mysql_free_result($rs); |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | while ($cache = sql_fetch_assoc($rs)) { |
68 | 68 | $lat = floor($cache['latitude'] / $grid); |
69 | 69 | $long = floor($cache['longitude'] / $grid); |
70 | - $liste[$lat][$long]['caches']['all'] ++; |
|
70 | + $liste[$lat][$long]['caches']['all']++; |
|
71 | 71 | $liste[$lat][$long]['logs']['all'] += $cache['logs']; |
72 | 72 | } |
73 | 73 | mysql_free_result($rs); |
@@ -17,9 +17,9 @@ discard block |
||
17 | 17 | * $opt['locale'] |
18 | 18 | ***************************************************************************/ |
19 | 19 | |
20 | -define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line |
|
21 | -define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line |
|
22 | -define('OC_LOCALE_DISABLED', 0); // disable language |
|
20 | +define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line |
|
21 | +define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line |
|
22 | +define('OC_LOCALE_DISABLED', 0); // disable language |
|
23 | 23 | |
24 | 24 | $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE; |
25 | 25 | $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png'; |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>'; |
132 | 132 | $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/'; |
133 | 133 | $opt['locale']['DE']['mostly_translated'] = true; |
134 | -$opt['locale']['DE']['what3words'] = true; // "beta" |
|
134 | +$opt['locale']['DE']['what3words'] = true; // "beta" |
|
135 | 135 | |
136 | 136 | $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y'; |
137 | 137 | $opt['locale']['IT']['format']['dm'] = '%d/%m'; |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching'; |
234 | 234 | $opt['locale']['SV']['page']['subtitle2'] = ''; |
235 | 235 | $opt['locale']['SV']['mostly_translated'] = false; |
236 | -$opt['locale']['SV']['what3words'] = true; // "beta" |
|
236 | +$opt['locale']['SV']['what3words'] = true; // "beta" |
|
237 | 237 | |
238 | 238 | $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y'; |
239 | 239 | $opt['locale']['NO']['format']['dm'] = '%d.%m.'; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | $opt['locale']['RU']['country'] = 'RU'; |
284 | 284 | $opt['locale']['RU']['primary_lang_of'] = ['RU']; |
285 | 285 | $opt['locale']['RU']['mostly_translated'] = false; |
286 | -$opt['locale']['RU']['what3words'] = true; // "beta" |
|
286 | +$opt['locale']['RU']['what3words'] = true; // "beta" |
|
287 | 287 | |
288 | 288 | $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y'; |
289 | 289 | $opt['locale']['DA']['format']['dm'] = '%d.%m.'; |
@@ -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'; |
@@ -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 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | 'DATA_LICENSE_URL' => $opt['page']['absolute_url'] . $opt['logic']['license']['terms'], |
34 | 34 | 'DEBUG' => ($opt['debug'] & DEBUG_DEVELOPER != 0), |
35 | 35 | 'DEBUG_PREVENT_SEMAPHORES' |
36 | - => !$opt['php']['semaphores'], # not available on old developer system |
|
36 | + => !$opt['php']['semaphores'], # not available on old developer system |
|
37 | 37 | 'DB_SERVER' => $opt['db']['servername'], |
38 | 38 | 'DB_NAME' => $opt['db']['placeholder']['db'], |
39 | 39 | 'DB_USERNAME' => $opt['db']['username'], |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | 'OC_NODE_ID' => $opt['logic']['node']['id'], |
55 | 55 | 'OC_COOKIE_NAME' => $opt['session']['cookiename'] . 'data', |
56 | 56 | 'OCDE_HTML_PURIFIER_SETTINGS' |
57 | - => $opt['html_purifier'], |
|
57 | + => $opt['html_purifier'], |
|
58 | 58 | 'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'], |
59 | 59 | ); |
60 | 60 | } |