| @@ -228,6 +228,9 @@ | ||
| 228 | 228 | return $str; | 
| 229 | 229 | } | 
| 230 | 230 | |
| 231 | +/** | |
| 232 | + * @param string $str | |
| 233 | + */ | |
| 231 | 234 | function lf2crlf($str) | 
| 232 | 235 |  { | 
| 233 | 236 |      return mb_ereg_replace("\r\r\n", "\r\n", mb_ereg_replace("\n", "\r\n", $str)); | 
| @@ -28,6 +28,9 @@ discard block | ||
| 28 | 28 | $this->translator = $this->initTranslator($translator); | 
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | + /** | |
| 32 | + * @param boolean $request | |
| 33 | + */ | |
| 31 | 34 | private function initRequest($request) | 
| 32 | 35 |      { | 
| 33 | 36 |          if ($request) { | 
| @@ -37,6 +40,9 @@ discard block | ||
| 37 | 40 | return new RequestHttp(); | 
| 38 | 41 | } | 
| 39 | 42 | |
| 43 | + /** | |
| 44 | + * @param boolean $translator | |
| 45 | + */ | |
| 40 | 46 | private function initTranslator($translator) | 
| 41 | 47 |      { | 
| 42 | 48 |          if ($translator) { | 
| @@ -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 { | 
| @@ -21,7 +21,7 @@ discard block | ||
| 21 | 21 |       * Use {page} in link_url als placeholder for the selected page number | 
| 22 | 22 |       * and/or {offset} for the 0-based data offset of the selected page. | 
| 23 | 23 | * | 
| 24 | - * @param $link_url | |
| 24 | + * @param string $link_url | |
| 25 | 25 | * @param int $min_pages_shown | 
| 26 | 26 | * @param int $max_pages_shown | 
| 27 | 27 | */ | 
| @@ -38,8 +38,8 @@ discard block | ||
| 38 | 38 | } | 
| 39 | 39 | |
| 40 | 40 | /** | 
| 41 | - * @param $current_page | |
| 42 | - * @param $total_pages | |
| 41 | + * @param double $current_page | |
| 42 | + * @param double $total_pages | |
| 43 | 43 | * @param bool $page_size | 
| 44 | 44 | */ | 
| 45 | 45 | public function make_from_pagenr($current_page, $total_pages, $page_size = false) | 
| @@ -110,7 +110,7 @@ discard block | ||
| 110 | 110 | |
| 111 | 111 | /** | 
| 112 | 112 | * @param $page | 
| 113 | - * @param $page_size | |
| 113 | + * @param boolean $page_size | |
| 114 | 114 | * | 
| 115 | 115 | * @return string | 
| 116 | 116 | */ | 
| @@ -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 | |
| @@ -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(); | 
| @@ -67,7 +67,7 @@ discard block | ||
| 67 | 67 | $nFileNr = 0; | 
| 68 | 68 |      $rs = sql('SELECT `id`, `url` FROM `pictures` WHERE `local`=0'); | 
| 69 | 69 |      while ($r = sql_fetch_array($rs)) { | 
| 70 | - $nFileNr ++; | |
| 70 | + $nFileNr++; | |
| 71 | 71 |          $fileparts = mb_split('/', $r['url']); | 
| 72 | 72 | $filename = $fileparts[count($fileparts) - 1]; | 
| 73 | 73 | |
| @@ -237,7 +237,7 @@ discard block | ||
| 237 | 237 | exit; | 
| 238 | 238 | } | 
| 239 | 239 | |
| 240 | -        for ($i = 1; $i <= $filescount; $i ++) { | |
| 240 | +        for ($i = 1; $i <= $filescount; $i++) { | |
| 241 | 241 | echo "Download Paket: " . $i . ' von ' . $filescount . "\n"; | 
| 242 | 242 | |
| 243 | 243 | $fileurl = $opt['url_getsession']; | 
| @@ -411,11 +411,11 @@ discard block | ||
| 411 | 411 |                              if ($sSubElement != '') { | 
| 412 | 412 | // vorheriges element zuerst schlißen | 
| 413 | 413 | $sSubElement = ''; | 
| 414 | - $nRecursionLevel --; | |
| 414 | + $nRecursionLevel--; | |
| 415 | 415 | } | 
| 416 | 416 | |
| 417 | 417 | $sSubElement = mb_strtoupper($xmlReader->name); | 
| 418 | - $nRecursionLevel ++; | |
| 418 | + $nRecursionLevel++; | |
| 419 | 419 | |
| 420 | 420 | // attribute auslesen | 
| 421 | 421 |                              if ($xmlReader->moveToFirstAttribute()) { | 
| @@ -432,7 +432,7 @@ discard block | ||
| 432 | 432 |                          } else { | 
| 433 | 433 |                              if ($xmlReader->nodeType == XMLReader::END_ELEMENT) { | 
| 434 | 434 | $sSubElement = ''; | 
| 435 | - $nRecursionLevel --; | |
| 435 | + $nRecursionLevel--; | |
| 436 | 436 | } | 
| 437 | 437 | } | 
| 438 | 438 | } | 
| @@ -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); |