@@ -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); |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | return false; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | - for ($i = 0; $i < count($parts); $i ++) { |
|
| 87 | + for ($i = 0; $i < count($parts); $i++) { |
|
| 88 | 88 | if (($parts[$i] == '..') || ($parts[$i] == '.')) { |
| 89 | 89 | return false; |
| 90 | 90 | } |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | |
| 28 | 28 | // Sessions verwenden? |
| 29 | 29 | $opt['session'] = 1; |
| 30 | -$opt['zip'] = 'gzip'; // 0; zip; bzip2; gzip |
|
| 30 | +$opt['zip'] = 'gzip'; // 0; zip; bzip2; gzip |
|
| 31 | 31 | |
| 32 | 32 | // Gebietsauswahl nach Land |
| 33 | 33 | $opt['bycountry'] = 0; |
@@ -203,6 +203,9 @@ |
||
| 203 | 203 | return $str; |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | +/** |
|
| 207 | + * @param string $str |
|
| 208 | + */ |
|
| 206 | 209 | function lf2crlf($str) |
| 207 | 210 | { |
| 208 | 211 | return str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $str)); |
@@ -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) { |
@@ -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 | |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | |
| 19 | 19 | // database names |
| 20 | 20 | $dbname = 'opencaching'; |
| 21 | -$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges |
|
| 21 | +$tmpdbname = 'octmp'; // empty db with CREATE and DROP privileges |
|
| 22 | 22 | |
| 23 | 23 | // common developer system settings |
| 24 | 24 | require 'settings-dev.inc.php'; |
@@ -277,7 +277,7 @@ |
||
| 277 | 277 | ) { |
| 278 | 278 | return 'https' . strstr($url, '://'); |
| 279 | 279 | } elseif (strtolower(substr($url, 0, strlen($opt['page']['absolute_https_url']))) |
| 280 | - == $opt['page']['absolute_https_url'] |
|
| 280 | + == $opt['page']['absolute_https_url'] |
|
| 281 | 281 | && !$opt['page']['https']['active'] |
| 282 | 282 | ) { |
| 283 | 283 | return 'http' . strstr($url, '://'); |
@@ -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'; |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching'; |
| 233 | 233 | $opt['locale']['SV']['page']['subtitle2'] = ''; |
| 234 | 234 | $opt['locale']['SV']['mostly_translated'] = false; |
| 235 | -$opt['locale']['SV']['what3words'] = true; // "beta" |
|
| 235 | +$opt['locale']['SV']['what3words'] = true; // "beta" |
|
| 236 | 236 | |
| 237 | 237 | $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y'; |
| 238 | 238 | $opt['locale']['NO']['format']['dm'] = '%d.%m.'; |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | $opt['locale']['RU']['format']['colonspace'] = ''; |
| 280 | 280 | $opt['locale']['RU']['country'] = 'RU'; |
| 281 | 281 | $opt['locale']['RU']['mostly_translated'] = false; |
| 282 | -$opt['locale']['RU']['what3words'] = true; // "beta" |
|
| 282 | +$opt['locale']['RU']['what3words'] = true; // "beta" |
|
| 283 | 283 | |
| 284 | 284 | $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y'; |
| 285 | 285 | $opt['locale']['DA']['format']['dm'] = '%d.%m.'; |