@@ -35,6 +35,6 @@ |
||
| 35 | 35 | |
| 36 | 36 | protected function getValue($value) |
| 37 | 37 | { |
| 38 | - return (int) $value; |
|
| 38 | + return (int)$value; |
|
| 39 | 39 | } |
| 40 | 40 | } |
@@ -355,7 +355,7 @@ |
||
| 355 | 355 | // return array(); |
| 356 | 356 | // Logic Error - log types are still valid when no NEW logs are allowed for the cache. |
| 357 | 357 | // (Would e.g. block admin logs and log-type restoring for locked caches.) |
| 358 | - return get_cache_log_types($this->getCacheId(), $this->getType()); // depends on userid |
|
| 358 | + return get_cache_log_types($this->getCacheId(), $this->getType()); // depends on userid |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | public static function isDuplicate($cacheId, $userId, $logType, $logDate, $logText) |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | // number of points in the polygon |
| 30 | 30 | $n = count($polygon); |
| 31 | 31 | $poly1 = $polygon[0]; |
| 32 | - for ($i = 1; $i <= $n; $i ++) { |
|
| 32 | + for ($i = 1; $i <= $n; $i++) { |
|
| 33 | 33 | $poly1XY = explode(' ', $poly1); |
| 34 | 34 | $poly1x = $poly1XY[0]; |
| 35 | 35 | $poly1y = $poly1XY[1]; |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | if ($poly1y != $poly2y) { |
| 45 | 45 | $xinters = ($py - $poly1y) * ($poly2x - $poly1x) / ($poly2y - $poly1y) + $poly1x; |
| 46 | 46 | if ($poly1x == $poly2x || $px <= $xinters) { |
| 47 | - $counter ++; |
|
| 47 | + $counter++; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | $to_page = min($last_page, max($first_page, $current_page - $lrspan) + $this->max_pages_shown - 1); |
| 60 | 60 | $from_page = max($first_page, $to_page - $this->max_pages_shown + 1); |
| 61 | 61 | |
| 62 | - for ($page = $from_page; $page <= $to_page; $page ++) { |
|
| 62 | + for ($page = $from_page; $page <= $to_page; $page++) { |
|
| 63 | 63 | if ($page == $current_page) { |
| 64 | 64 | $pages[$page] = false; |
| 65 | 65 | } else { |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | break; |
| 75 | 75 | } |
| 76 | 76 | $command['result'][] = $r; |
| 77 | - $c ++; |
|
| 77 | + $c++; |
|
| 78 | 78 | } |
| 79 | 79 | sql_free_result($rs); |
| 80 | 80 | |
@@ -29,12 +29,12 @@ |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | switch ($action) { |
| 32 | - case 'addignore': |
|
| 33 | - sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid); |
|
| 34 | - break; |
|
| 35 | - case 'removeignore': |
|
| 36 | - sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid); |
|
| 37 | - break; |
|
| 32 | + case 'addignore': |
|
| 33 | + sql("INSERT IGNORE INTO `cache_ignore` (`cache_id`, `user_id`) VALUES ('&1', '&2')", $cache_id, $login->userid); |
|
| 34 | + break; |
|
| 35 | + case 'removeignore': |
|
| 36 | + sql("DELETE FROM `cache_ignore` WHERE `cache_id`='&1' AND `user_id`='&2'", $cache_id, $login->userid); |
|
| 37 | + break; |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | // clear cached map result, so that the change directly appears on the map |
@@ -14,8 +14,7 @@ |
||
| 14 | 14 | $tpl->caching = true; |
| 15 | 15 | $tpl->cache_lifetime = 3600; |
| 16 | 16 | |
| 17 | -$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : |
|
| 18 | - (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']); |
|
| 17 | +$country = isset($_REQUEST['usercountry']) ? $_REQUEST['usercountry'] : (isset($_REQUEST['country']) ? $_REQUEST['country'] : $opt['page']['main_country']); |
|
| 19 | 18 | |
| 20 | 19 | if (!$tpl->is_cached()) { |
| 21 | 20 | $newCaches = array(); |
@@ -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.'; |