OpencachingDeutschland / oc-server3

htdocs/lib2/db.inc.php

Braces +3 added lines, -2 removed lines

@@ -894,8 +894,9 @@
     }
 
     if ($db['dblink_slave'] !== false) {
-        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false)
-            sql_error();
+        if (mysql_select_db($opt['db']['placeholder']['db'], $db['dblink_slave']) == false) {
+                    sql_error();
+        }
 
         mysql_query("SET NAMES '" . mysql_real_escape_string($opt['charset']['mysql'], $db['dblink_slave']) . "'", $db['dblink_slave']);
 

htdocs/okapi/services/replicate/changelog.php

Braces +9 added lines, -4 removed lines

@@ -29,13 +29,18 @@
         require_once('replicate_common.inc.php');
 
         $since = $request->get_parameter('since');
-        if ($since === null) throw new ParamMissing('since');
-        if ((int)$since != $since) throw new InvalidParam('since');
+        if ($since === null) {
+            throw new ParamMissing('since');
+        }
+        if ((int)$since != $since) {
+            throw new InvalidParam('since');
+        }
 
         # Let's check the $since parameter.
 
-        if (!ReplicateCommon::check_since_param($since))
-            throw new BadRequest("The 'since' parameter is too old. You must update your database more frequently.");
+        if (!ReplicateCommon::check_since_param($since)) {
+                    throw new BadRequest("The 'since' parameter is too old. You must update your database more frequently.");
+        }
 
         # Select a best chunk for the given $since, get the chunk from the database (or cache).
 

htdocs/okapi/services/replicate/replicate_common.inc.php

Braces +74 added lines, -52 removed lines

@@ -40,8 +40,9 @@ 
         if ($cache == null)
         {
             $cache = Db::select_value("select min(id) from okapi_clog");
-            if ($cache === null)
-                $cache = 1;
+            if ($cache === null) {
+                            $cache = 1;
+            }
             $cache -= 1;
         }
         return $cache;
@@ -54,19 +55,22 @@ 
      */
     private static function get_diff($old, $new)
     {
-        if (!$old)
-            return $new;
+        if (!$old) {
+                    return $new;
+        }
         $changed_keys = array();
         foreach ($new as $key => $value)
         {
-            if (!array_key_exists($key, $old))
-                $changed_keys[] = $key;
-            elseif ($old[$key] != $new[$key])
-                $changed_keys[] = $key;
+            if (!array_key_exists($key, $old)) {
+                            $changed_keys[] = $key;
+            } elseif ($old[$key] != $new[$key]) {
+                            $changed_keys[] = $key;
+            }
         }
         $changed = array();
-        foreach ($changed_keys as $key)
-            $changed[$key] = $new[$key];
+        foreach ($changed_keys as $key) {
+                    $changed[$key] = $new[$key];
+        }
         return $changed;
     }
 
@@ -75,8 +79,9 @@ 
     {
         $now = Db::select_value("select date_add(now(), interval -1 minute)");  # See issue 157.
         $last_update = Okapi::get_var('last_clog_update');
-        if ($last_update === null)
-            $last_update = Db::select_value("select date_add(now(), interval -1 day)");
+        if ($last_update === null) {
+                    $last_update = Db::select_value("select date_add(now(), interval -1 day)");
+        }
 
         # Usually this will be fast. But, for example, if admin changes ALL the
         # caches, this will take forever. But we still want it to finish properly
@@ -117,8 +122,9 @@ 
                 where okapi_syncbase > '".Db::escape_string($last_update)."'
                 limit $offset, 10000;
             ");
-            if (count($log_uuids) == 0)
-                break;
+            if (count($log_uuids) == 0) {
+                            break;
+            }
             $offset += 10000;
             $log_uuid_groups = Okapi::make_groups($log_uuids, 100);
             unset($log_uuids);
@@ -202,8 +208,9 @@ 
             );
             foreach ($entries as $entry)
             {
-                if ($entry['object_type'] != 'geocache')
-                    continue;
+                if ($entry['object_type'] != 'geocache') {
+                                    continue;
+                }
                 $cache_code = $entry['object_key']['code'];
 
                 if (($entry['change_type'] == 'replace') && ($geocache_ignored_fields != null)) {
@@ -227,8 +234,10 @@ 
                 # We will story the first and the last entry in the $two_examples
                 # vars which is to be emailed to OKAPI developers.
 
-                if (count($two_examples) == 0)
-                    $two_examples[0] = $entry;  /* The first entry */
+                if (count($two_examples) == 0) {
+                                    $two_examples[0] = $entry;
+                }
+                /* The first entry */
                 $two_examples[1] = $entry;  /* The last entry */
 
                 Db::execute("
@@ -279,10 +288,12 @@ 
         {
             $cache_keys1 = array();
             $cache_keys2 = array();
-            foreach ($key_values as $key)
-                $cache_keys1[] = 'clog#'.$object_type.'#'.$key;
-            foreach ($key_values as $key)
-                $cache_keys2[] = 'clogmd5#'.$object_type.'#'.$key;
+            foreach ($key_values as $key) {
+                            $cache_keys1[] = 'clog#'.$object_type.'#'.$key;
+            }
+            foreach ($key_values as $key) {
+                            $cache_keys2[] = 'clogmd5#'.$object_type.'#'.$key;
+            }
             $cached_values1 = Cache::get_many($cache_keys1);
             $cached_values2 = Cache::get_many($cache_keys2);
             if (!$fulldump_mode)
@@ -342,8 +353,7 @@ 
                     $cached_values2['clogmd5#'.$object_type.'#'.$key] = $current_md5;
                     $cached_values1['clog#'.$object_type.'#'.$key] = $object;
                 }
-            }
-            else
+            } else
             {
                 # Currently, the object does not exist.
                 if ($use_cache && ($cached_values1['clog#'.$object_type.'#'.$key] === false))
@@ -368,16 +378,16 @@ 
         if ($fulldump_mode)
         {
             return $entries;
-        }
-        else
+        } else
         {
             # Save the entries to the clog table.
 
             if (count($entries) > 0)
             {
                 $data_values = array();
-                foreach ($entries as $entry)
-                    $data_values[] = gzdeflate(serialize($entry));
+                foreach ($entries as $entry) {
+                                    $data_values[] = gzdeflate(serialize($entry));
+                }
                 Db::execute("
                     insert into okapi_clog (data)
                     values ('".implode("'),('", array_map('\okapi\Db::escape_string', $data_values))."');
@@ -403,10 +413,14 @@ 
         $first_id = Db::select_value("
             select id from okapi_clog where id > '".Db::escape_string($since)."' limit 1
         ");
-        if ($first_id === null)
-            return true; # okay, since points to the newest revision
-        if ($first_id == $since + 1)
-            return true; # okay, revision $since + 1 is present
+        if ($first_id === null) {
+                    return true;
+        }
+        # okay, since points to the newest revision
+        if ($first_id == $since + 1) {
+                    return true;
+        }
+        # okay, revision $since + 1 is present
 
         # If we're here, then this means that $first_id > $since + 1.
         # Revision $since + 1 is already deleted, $since must be too old!
@@ -432,10 +446,11 @@ 
             # user wants), then we'll give him 80. If user wants less than half of what we
             # have (ex. 30), then we'll give him only his 30.
 
-            if ($current_revision - $since > $since - $last_chunk_cut)
-                return array($last_chunk_cut + 1, $current_revision);
-            else
-                return array($since + 1, $current_revision);
+            if ($current_revision - $since > $since - $last_chunk_cut) {
+                            return array($last_chunk_cut + 1, $current_revision);
+            } else {
+                            return array($since + 1, $current_revision);
+            }
         }
         $prev_chunk_cut = $since - ($since % self::$chunk_size);
         return array($prev_chunk_cut + 1, $prev_chunk_cut + self::$chunk_size);
@@ -446,10 +461,12 @@ 
      */
     public static function get_chunk($from, $to)
     {
-        if ($to < $from)
-            return array();
-        if ($to - $from > self::$chunk_size)
-            throw new Exception("You should not get chunksize bigger than ".self::$chunk_size." entries at one time.");
+        if ($to < $from) {
+                    return array();
+        }
+        if ($to - $from > self::$chunk_size) {
+                    throw new Exception("You should not get chunksize bigger than ".self::$chunk_size." entries at one time.");
+        }
 
         # Check if we already have this chunk in cache.
 
@@ -475,10 +492,11 @@ 
             # be ever accessed after the next revision appears, so there is not point
             # in storing them that long.
 
-            if (($from % self::$chunk_size === 0) && ($to % self::$chunk_size === 0))
-                $timeout = 10 * 86400;
-            else
-                $timeout = 86400;
+            if (($from % self::$chunk_size === 0) && ($to % self::$chunk_size === 0)) {
+                            $timeout = 10 * 86400;
+            } else {
+                            $timeout = 86400;
+            }
             Cache::set($cache_key, $chunk, $timeout);
         }
 
@@ -518,9 +536,10 @@ 
             $entries = self::generate_changelog_entries('services/caches/geocaches', 'geocache', 'cache_codes',
                 'code', $cache_codes, self::$logged_cache_fields, true, false);
             $filtered = array();
-            foreach ($entries as $entry)
-                if ($entry['change_type'] == 'replace')
+            foreach ($entries as $entry) {
+                            if ($entry['change_type'] == 'replace')
                     $filtered[] = $entry;
+            }
             unset($entries);
             file_put_contents("$dir/$basename.json", json_encode($filtered));
             unset($filtered);
@@ -541,8 +560,9 @@ 
                 order by uuid
                 limit $offset, 10000
             ");
-            if (count($log_uuids) == 0)
-                break;
+            if (count($log_uuids) == 0) {
+                            break;
+            }
             $offset += 10000;
             $log_uuid_groups = Okapi::make_groups($log_uuids, 500);
             unset($log_uuids);
@@ -553,9 +573,10 @@ 
                 $entries = self::generate_changelog_entries('services/logs/entries', 'log', 'log_uuids',
                     'uuid', $log_uuids, self::$logged_log_entry_fields, true, false);
                 $filtered = array();
-                foreach ($entries as $entry)
-                    if ($entry['change_type'] == 'replace')
+                foreach ($entries as $entry) {
+                                    if ($entry['change_type'] == 'replace')
                         $filtered[] = $entry;
+                }
                 unset($entries);
                 file_put_contents("$dir/$basename.json", json_encode($filtered));
                 unset($filtered);
@@ -581,8 +602,9 @@ 
         # Compute uncompressed size.
 
         $size = filesize("$dir/index.json");
-        foreach ($json_files as $filename)
-            $size += filesize("$dir/$filename");
+        foreach ($json_files as $filename) {
+                    $size += filesize("$dir/$filename");
+        }
 
         # Create JSON archive. We use tar options: -j for bzip2, -z for gzip
         # (bzip2 is MUCH slower).

htdocs/okapi/services/replicate/fulldump.php

Braces +10 added lines, -8 removed lines

@@ -49,9 +49,10 @@ 
         require_once('replicate_common.inc.php');
 
         $data = Cache::get("last_fulldump");
-        if ($data == null)
-            throw new BadRequest("No fulldump found. Try again later. If this doesn't help ".
+        if ($data == null) {
+                    throw new BadRequest("No fulldump found. Try again later. If this doesn't help ".
                 "contact site administrator and/or OKAPI developers.");
+        }
 
         # Check consumer's quota
 
@@ -59,14 +60,15 @@ 
         if ($please != 'true')
         {
             $not_good = 3 < self::count_calls($request->consumer->key, 30);
-            if ($not_good)
-                throw new BadRequest("Consumer's monthly quota exceeded. Try later or call with '&pleeaase=true'.");
-        }
-        else
+            if ($not_good) {
+                            throw new BadRequest("Consumer's monthly quota exceeded. Try later or call with '&pleeaase=true'.");
+            }
+        } else
         {
             $not_good = 5 < self::count_calls($request->consumer->key, 1);
-            if ($not_good)
-                throw new BadRequest("No more please. Seriously, dude...");
+            if ($not_good) {
+                            throw new BadRequest("No more please. Seriously, dude...");
+            }
         }
 
         $response = new OkapiHttpResponse();

htdocs/okapi/services/caches/map/tiletree.inc.php

Braces +40 added lines, -22 removed lines

@@ -64,19 +64,23 @@ 
         # (and if it was, was it empty).
 
         $status = self::get_tile_status($zoom, $x, $y);
-        if ($status === null)  # Not yet computed.
+        if ($status === null) {
+            # Not yet computed.
         {
             # Note, that computing the tile does not involve taking any
             # search parameters.
 
             $status = self::compute_tile($zoom, $x, $y);
         }
+        }
 
-        if ($status === 1)  # Computed and empty.
+        if ($status === 1) {
+            # Computed and empty.
         {
             # This tile was already computed and it is empty.
             return null;
         }
+        }
 
         # If we got here, then the tile is computed and not empty (status 2).
 
@@ -121,8 +125,9 @@ 
         # For low-level tiles, this can be expensive.
 
         $status = self::get_tile_status($zoom, $x, $y);
-        if ($status !== null)
-            return $status;
+        if ($status !== null) {
+                    return $status;
+        }
 
         if ($zoom === 0)
         {
@@ -174,8 +179,7 @@ 
                 ");
             }
             $status = 2;
-        }
-        else
+        } else
         {
             # We will use the parent tile to compute the contents of this tile.
 
@@ -184,19 +188,23 @@ 
             $parent_y = $y >> 1;
 
             $status = self::get_tile_status($parent_zoom, $parent_x, $parent_y);
-            if ($status === null)  # Not computed.
+            if ($status === null) {
+                # Not computed.
             {
                 $time_started = microtime(true);
+            }
                 $status = self::compute_tile($parent_zoom, $parent_x, $parent_y);
             }
 
-            if ($status === 1)  # Computed and empty.
+            if ($status === 1) {
+                # Computed and empty.
             {
                 # No need to check.
             }
             else  # Computed, not empty.
             {
                 $scale = 8 + 21 - $zoom;
+            }
                 $parentcenter_z21x = (($parent_x << 1) | 1) << $scale;
                 $parentcenter_z21y = (($parent_y << 1) | 1) << $scale;
                 $margin = 1 << ($scale - 2);
@@ -209,14 +217,20 @@ 
                 # |1 2|
                 # |3 4|
 
-                if ($x & 1)  # 2 or 4
+                if ($x & 1) {
+                    # 2 or 4
                     $left_z21x = $parentcenter_z21x - $margin;
-                else  # 1 or 3
+                } else {
+                    # 1 or 3
                     $right_z21x = $parentcenter_z21x + $margin;
-                if ($y & 1)  # 3 or 4
+                }
+                if ($y & 1) {
+                    # 3 or 4
                     $top_z21y = $parentcenter_z21y - $margin;
-                else  # 1 or 2
+                } else {
+                    # 1 or 2
                     $bottom_z21y = $parentcenter_z21y + $margin;
+                }
 
                 # Cache the result.
 
@@ -256,10 +270,11 @@ 
                         and y = '".Db::escape_string($y)."'
                     limit 1;
                 ");
-                if ($test)
-                    $status = 2;
-                else
-                    $status = 1;
+                if ($test) {
+                                    $status = 2;
+                } else {
+                                    $status = 1;
+                }
             }
         }
 
@@ -294,12 +309,15 @@ 
             return false;
         }
         $flags = 0;
-        if (($cache['founds'] > 6) && (($cache['recommendations'] / $cache['founds']) > 0.3))
-            $flags |= self::$FLAG_STAR;
-        if ($cache['trackables_count'] > 0)
-            $flags |= self::$FLAG_HAS_TRACKABLES;
-        if ($cache['founds'] == 0)
-            $flags |= self::$FLAG_NOT_YET_FOUND;
+        if (($cache['founds'] > 6) && (($cache['recommendations'] / $cache['founds']) > 0.3)) {
+                    $flags |= self::$FLAG_STAR;
+        }
+        if ($cache['trackables_count'] > 0) {
+                    $flags |= self::$FLAG_HAS_TRACKABLES;
+        }
+        if ($cache['founds'] == 0) {
+                    $flags |= self::$FLAG_NOT_YET_FOUND;
+        }
         return array($cache['internal_id'], $z21x, $z21y, Okapi::cache_status_name2id($cache['status']),
             Okapi::cache_type_name2id($cache['type']), $cache['rating'], $flags,
             self::compute_name_crc($cache['name']));

htdocs/okapi/services/caches/map/tile.php

Braces +35 added lines, -22 removed lines

@@ -58,11 +58,13 @@ 
     private static function require_uint($request, $name, $min_value = 0)
     {
         $val = $request->get_parameter($name);
-        if ($val === null)
-            throw new ParamMissing($name);
+        if ($val === null) {
+                    throw new ParamMissing($name);
+        }
         $ret = intval($val);
-        if ($ret < 0 || ("$ret" !== $val))
-            throw new InvalidParam($name, "Expecting non-negative integer.");
+        if ($ret < 0 || ("$ret" !== $val)) {
+                    throw new InvalidParam($name, "Expecting non-negative integer.");
+        }
         return $ret;
     }
 
@@ -84,14 +86,17 @@ 
         # zoom, x, y - required tile-specific parameters.
 
         $zoom = self::require_uint($request, 'z');
-        if ($zoom > 21)
-            throw new InvalidParam('z', "Maximum value for this parameter is 21.");
+        if ($zoom > 21) {
+                    throw new InvalidParam('z', "Maximum value for this parameter is 21.");
+        }
         $x = self::require_uint($request, 'x');
         $y = self::require_uint($request, 'y');
-        if ($x >= 1<<$zoom)
-            throw new InvalidParam('x', "Should be in 0..".((1<<$zoom) - 1).".");
-        if ($y >= 1<<$zoom)
-            throw new InvalidParam('y', "Should be in 0..".((1<<$zoom) - 1).".");
+        if ($x >= 1<<$zoom) {
+                    throw new InvalidParam('x', "Should be in 0..".((1<<$zoom) - 1).".");
+        }
+        if ($y >= 1<<$zoom) {
+                    throw new InvalidParam('y', "Should be in 0..".((1<<$zoom) - 1).".");
+        }
 
         # Now, we will create a search set (or use one previously created).
         # Instead of creating a new OkapiInternalRequest object, we will pass
@@ -114,8 +119,9 @@ 
         $rows = array();
         if ($rs !== null)
         {
-            while ($row = Db::fetch_row($rs))
-                $rows[] = $row;
+            while ($row = Db::fetch_row($rs)) {
+                            $rows[] = $row;
+            }
             unset($row);
         }
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointA", null,
@@ -142,8 +148,9 @@ 
                     where user_id = '".Db::escape_string($request->token->user_id)."'
                 ");
                 $user['ignored'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['ignored'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['ignored'][$cache_id] = true;
+                }
 
                 # Found caches.
 
@@ -156,8 +163,9 @@ 
                         and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
                 ");
                 $user['found'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['found'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['found'][$cache_id] = true;
+                }
 
                 # Own caches.
 
@@ -167,8 +175,9 @@ 
                     where user_id = '".Db::escape_string($request->token->user_id)."'
                 ");
                 $user['own'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['own'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['own'][$cache_id] = true;
+                }
 
                 Cache::set($cache_key, $user, 30);
             }
@@ -181,10 +190,14 @@ 
                 # to be drawn as found) and the "own" flag (to indicate that
                 # the current user is the owner).
 
-                if (isset($user['found'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_FOUND;  # $row[6] is "flags"
-                if (isset($user['own'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_OWN;  # $row[6] is "flags"
+                if (isset($user['found'][$row_ref[0]])) {
+                                    $row_ref[6] |= TileTree::$FLAG_FOUND;
+                }
+                # $row[6] is "flags"
+                if (isset($user['own'][$row_ref[0]])) {
+                                    $row_ref[6] |= TileTree::$FLAG_OWN;
+                }
+                # $row[6] is "flags"
             }
         }
 

htdocs/okapi/services/caches/map/tilerenderer.inc.php

Braces +77 added lines, -53 removed lines

@@ -74,23 +74,28 @@ 
     {
         # Preprocess the rows.
 
-        if ($this->zoom >= 5)
-            $this->decide_which_get_captions();
+        if ($this->zoom >= 5) {
+                    $this->decide_which_get_captions();
+        }
 
         # Make a background.
 
         $this->im = imagecreatetruecolor(256, 256);
         imagealphablending($this->im, false);
-        if ($this->zoom >= 13) $opacity = 15;
-        elseif ($this->zoom <= 12) $opacity = max(0, $this->zoom * 2 - 14);
+        if ($this->zoom >= 13) {
+            $opacity = 15;
+        } elseif ($this->zoom <= 12) {
+            $opacity = max(0, $this->zoom * 2 - 14);
+        }
         $transparent = imagecolorallocatealpha($this->im, 0, 0, 0, 127 - $opacity);
         imagefilledrectangle($this->im, 0, 0, 256, 256, $transparent);
         imagealphablending($this->im, true);
 
         # Draw the caches.
 
-        foreach ($this->rows_ref as &$row_ref)
-            $this->draw_cache($row_ref);
+        foreach ($this->rows_ref as &$row_ref) {
+                    $this->draw_cache($row_ref);
+        }
 
         # Return the result.
 
@@ -118,13 +123,13 @@ 
                 $cache_key = "tilesrc/".Okapi::$git_revision."/".self::$VERSION."/".$key;
                 $gd2_path = self::$USE_STATIC_IMAGE_CACHE
                     ? FileCache::get_file_path($cache_key) : null;
-                if ($gd2_path === null)
-                    throw new Exception("Not in cache");
+                if ($gd2_path === null) {
+                                    throw new Exception("Not in cache");
+                }
                 # File cache hit. GD2 files are much faster to read than PNGs.
                 # This can throw an Exception (see bug#160).
                 $locmem_cache[$key] = imagecreatefromgd2($gd2_path);
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 # Miss again (or error decoding). Read the image from PNG.
 
@@ -132,12 +137,15 @@ 
 
                 # Apply all wanted effects.
 
-                if ($opacity != 1)
-                    self::change_opacity($locmem_cache[$key], $opacity);
-                if ($contrast != 0)
-                    imagefilter($locmem_cache[$key], IMG_FILTER_CONTRAST, $contrast);
-                if ($brightness != 0)
-                    imagefilter($locmem_cache[$key], IMG_FILTER_BRIGHTNESS, $brightness);
+                if ($opacity != 1) {
+                                    self::change_opacity($locmem_cache[$key], $opacity);
+                }
+                if ($contrast != 0) {
+                                    imagefilter($locmem_cache[$key], IMG_FILTER_CONTRAST, $contrast);
+                }
+                if ($brightness != 0) {
+                                    imagefilter($locmem_cache[$key], IMG_FILTER_BRIGHTNESS, $brightness);
+                }
                 if (($r != 0) || ($g != 0) || ($b != 0))
                 {
                     imagefilter($locmem_cache[$key], IMG_FILTER_GRAYSCALE);
@@ -182,12 +190,13 @@ 
     {
         $capt = ($cache_struct[6] & TileTree::$FLAG_DRAW_CAPTION);
 
-        if (($this->zoom <= 8) && (!$capt))
-            $this->draw_cache_tiny($cache_struct);
-        elseif (($this->zoom <= 13) && (!$capt))
-            $this->draw_cache_medium($cache_struct);
-        else
-            $this->draw_cache_large($cache_struct);
+        if (($this->zoom <= 8) && (!$capt)) {
+                    $this->draw_cache_tiny($cache_struct);
+        } elseif (($this->zoom <= 13) && (!$capt)) {
+                    $this->draw_cache_medium($cache_struct);
+        } else {
+                    $this->draw_cache_large($cache_struct);
+        }
 
         # Put caption (this flag is set only when there is plenty of space around).
 
@@ -241,8 +250,9 @@ 
         $markercenter_x = 12;
         $markercenter_y = 12;
 
-        if ($count > 1)
-            imagecopy($this->im, $outer_marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
+        if ($count > 1) {
+                    imagecopy($this->im, $outer_marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
+        }
         imagecopy($this->im, $outer_marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
 
         # Put the inner marker (indicates the type).
@@ -304,8 +314,9 @@ 
         $nextBonus = "";
         for ($i=0; ($i<count($words)) || (mb_strlen($nextBonus)>0); $i++) {
             $word = isset($words[$i])?$words[$i]:"";
-            if (mb_strlen($nextBonus) > 0)
-                $word = $nextBonus." ".$word;
+            if (mb_strlen($nextBonus) > 0) {
+                            $word = $nextBonus." ".$word;
+            }
             $nextBonus = "";
             while (true) {
                 $bbox = imagettfbbox($size, 0, $font, $line.$word);
@@ -324,8 +335,9 @@ 
                 continue;
             }
         }
-        if (mb_strlen($line) > 0)
-            $lines[] = trim($line);
+        if (mb_strlen($line) > 0) {
+                    $lines[] = trim($line);
+        }
         return implode("\n", $lines);
     }
 
@@ -389,9 +401,12 @@ 
             # Draw an outline.
 
             $outline_color = imagecolorallocatealpha($im, 255, 255, 255, 80);
-            for ($x=0; $x<=12; $x+=3)
-                for ($y=$size-3; $y<=$size+9; $y+=3)
-                    $drawer($x, $y, $outline_color);
+            for ($x=0; $x<=12; $x+=3) {
+                            for ($y=$size-3;
+            }
+            $y<=$size+9; $y+=3) {
+                                    $drawer($x, $y, $outline_color);
+                }
 
             # Add a slight shadow effect (on top of the outline).
 
@@ -426,10 +441,11 @@ 
         $found = $flags & TileTree::$FLAG_FOUND;
         $own = $flags & TileTree::$FLAG_OWN;
         $new = $flags & TileTree::$FLAG_NEW;
-        if ($found && (!($flags & TileTree::$FLAG_DRAW_CAPTION)))
-            $a = .35;
-        else
-            $a = 1;
+        if ($found && (!($flags & TileTree::$FLAG_DRAW_CAPTION))) {
+                    $a = .35;
+        } else {
+                    $a = 1;
+        }
 
         # Put the marker (indicates the type).
 
@@ -445,11 +461,12 @@ 
         {
             imagecopy($this->im, $marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($status == 1)  # don't put the marker for unavailable caches (X only)
+        } elseif ($status == 1) {
+            # don't put the marker for unavailable caches (X only)
         {
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
         }
+        }
 
         # If the cache is unavailable, mark it with X.
 
@@ -485,16 +502,14 @@ 
 
             $overlay = self::get_image("medium_overlay_own");
             imagecopy($this->im, $overlay, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($found)
+        } elseif ($found)
         {
             # Mark found caches with V.
 
             $icon = self::get_image("found", 0.7*$a);
             imagecopy($this->im, $icon, $px - ($center_x - $markercenter_x) - 7,
                 $py - ($center_y - $markercenter_y) - 9, 0, 0, 16, 16);
-        }
-        elseif ($new)
+        } elseif ($new)
         {
             # Mark new caches with additional overlay.
 
@@ -546,8 +561,7 @@ 
         {
             imagecopy($this->im, $marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($status == 1)
+        } elseif ($status == 1)
         {
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
         }
@@ -577,25 +591,33 @@ 
         # This is efficient and yields acceptable results.
 
         $matrix = array();
-        for ($i=0; $i<12; $i++)
-            $matrix[] = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        for ($i=0; $i<12; $i++) {
+                    $matrix[] = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        }
 
         foreach ($this->rows_ref as &$row_ref)
         {
             $mx = ($row_ref[1] + 64) >> 5;
             $my = ($row_ref[2] + 64) >> 5;
-            if (($mx >= 12) || ($my >= 12)) continue;
-            if (($matrix[$mx][$my] === 0) && ($row_ref[8] == 1))  # 8 is count
-                $matrix[$mx][$my] = $row_ref[0];  # 0 is cache_id
-            else
-                $matrix[$mx][$my] = -1;
+            if (($mx >= 12) || ($my >= 12)) {
+                continue;
+            }
+            if (($matrix[$mx][$my] === 0) && ($row_ref[8] == 1)) {
+                # 8 is count
+                $matrix[$mx][$my] = $row_ref[0];
+            }
+            # 0 is cache_id
+            else {
+                            $matrix[$mx][$my] = -1;
+            }
         }
         $selected_cache_ids = array();
         for ($mx=1; $mx<11; $mx++)
         {
             for ($my=1; $my<11; $my++)
             {
-                if ($matrix[$mx][$my] > 0)  # cache_id
+                if ($matrix[$mx][$my] > 0) {
+                    # cache_id
                 {
                     # Check all adjacent squares.
 
@@ -610,12 +632,14 @@ 
                     )
                         $selected_cache_ids[] = $matrix[$mx][$my];
                 }
+                }
             }
         }
 
-        foreach ($this->rows_ref as &$row_ref)
-            if (in_array($row_ref[0], $selected_cache_ids))
+        foreach ($this->rows_ref as &$row_ref) {
+                    if (in_array($row_ref[0], $selected_cache_ids))
                 $row_ref[6] |= TileTree::$FLAG_DRAW_CAPTION;
+        }
     }
 
 }
\ No newline at end of file

htdocs/okapi/services/caches/map/replicate_listener.inc.php

Braces +28 added lines, -21 removed lines

@@ -33,10 +33,11 @@ 
         {
             if ($c['object_type'] == 'geocache')
             {
-                if ($c['change_type'] == 'replace')
-                    self::handle_geocache_replace($c);
-                else
-                    self::handle_geocache_delete($c);
+                if ($c['change_type'] == 'replace') {
+                                    self::handle_geocache_replace($c);
+                } else {
+                                    self::handle_geocache_delete($c);
+                }
             }
         }
     }
@@ -95,19 +96,18 @@ 
             # Aaah, a new geocache! How nice... ;)
 
             self::add_geocache_to_cached_tiles($theirs);
-        }
-        elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2]))  # z21x & z21y fields
+        } elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2])) {
+            # z21x & z21y fields
         {
             # Location changed.
 
             self::remove_geocache_from_cached_tiles($ours[0]);
-            self::add_geocache_to_cached_tiles($theirs);
         }
-        elseif ($ours != $theirs)
+            self::add_geocache_to_cached_tiles($theirs);
+        } elseif ($ours != $theirs)
         {
             self::update_geocache_attributes_in_cached_tiles($theirs);
-        }
-        else
+        } else
         {
             # No need to update anything. This is very common (i.e. when the
             # cache was simply found, not actually changed). Replicate module generates
@@ -154,10 +154,13 @@ 
             # go with the simple approach and check all 1+8 bordering tiles.
 
             $tiles_in_this_region = array();
-            for ($x=$ex-1; $x<=$ex+1; $x++)
-                for ($y=$ey-1; $y<=$ey+1; $y++)
-                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
+            for ($x=$ex-1; $x<=$ex+1; $x++) {
+                            for ($y=$ey-1;
+            }
+            $y<=$ey+1; $y++) {
+                                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
                         $tiles_in_this_region[] = array($x, $y);
+                }
 
             foreach ($tiles_in_this_region as $coords)
             {
@@ -171,14 +174,18 @@ 
                 $top_z21y = ($y << $scale) - $margin;
                 $bottom_z21y = (($y + 1) << $scale) + $margin;
 
-                if ($z21x < $left_z21x)
-                    continue;
-                if ($z21x > $right_z21x)
-                    continue;
-                if ($z21y < $top_z21y)
-                    continue;
-                if ($z21y > $bottom_z21y)
-                    continue;
+                if ($z21x < $left_z21x) {
+                                    continue;
+                }
+                if ($z21x > $right_z21x) {
+                                    continue;
+                }
+                if ($z21y < $top_z21y) {
+                                    continue;
+                }
+                if ($z21y > $bottom_z21y) {
+                                    continue;
+                }
 
                 # We found a match. Store it for later.
 

htdocs/okapi/services/caches/geocaches.php

Braces +236 added lines, -171 removed lines

@@ -40,33 +40,42 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_codes = $request->get_parameter('cache_codes');
-        if ($cache_codes === null) throw new ParamMissing('cache_codes');
+        if ($cache_codes === null) {
+            throw new ParamMissing('cache_codes');
+        }
         if ($cache_codes === "")
         {
             # Issue 106 requires us to allow empty list of cache codes to be passed into this method.
             # All of the queries below have to be ready for $cache_codes to be empty!
             $cache_codes = array();
+        } else {
+                    $cache_codes = explode("|", $cache_codes);
         }
-        else
-            $cache_codes = explode("|", $cache_codes);
 
-        if ((count($cache_codes) > 500) && (!$request->skip_limits))
-            throw new InvalidParam('cache_codes', "Maximum allowed number of referenced ".
+        if ((count($cache_codes) > 500) && (!$request->skip_limits)) {
+                    throw new InvalidParam('cache_codes', "Maximum allowed number of referenced ".
                 "caches is 500. You provided ".count($cache_codes)." cache codes.");
-        if (count($cache_codes) != count(array_unique($cache_codes)))
-            throw new InvalidParam('cache_codes', "Duplicate codes detected (make sure each cache is referenced only once).");
+        }
+        if (count($cache_codes) != count(array_unique($cache_codes))) {
+                    throw new InvalidParam('cache_codes', "Duplicate codes detected (make sure each cache is referenced only once).");
+        }
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref .= "|".Settings::get('SITELANG');
         $langpref = explode("|", $langpref);
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "code|name|location|type|status";
+        if (!$fields) {
+            $fields = "code|name|location|type|status";
+        }
         $fields = explode("|", $fields);
-        foreach ($fields as $field)
-            if (!in_array($field, self::$valid_field_names))
+        foreach ($fields as $field) {
+                    if (!in_array($field, self::$valid_field_names))
                 throw new InvalidParam('fields', "'$field' is not a valid field code.");
+        }
 
         # Some fields need to be temporarily included whenever the "description"
         # or "attribution_note" field are included. That's a little ugly, but
@@ -94,60 +103,77 @@ 
         }
 
         $attribution_append = $request->get_parameter('attribution_append');
-        if (!$attribution_append) $attribution_append = 'full';
-        if (!in_array($attribution_append, array('none', 'static', 'full')))
-            throw new InvalidParam('attribution_append');
+        if (!$attribution_append) {
+            $attribution_append = 'full';
+        }
+        if (!in_array($attribution_append, array('none', 'static', 'full'))) {
+                    throw new InvalidParam('attribution_append');
+        }
 
         $log_fields = $request->get_parameter('log_fields');
-        if (!$log_fields) $log_fields = "uuid|date|user|type|comment";  // validation is done on call
+        if (!$log_fields) {
+            $log_fields = "uuid|date|user|type|comment";
+        }
+        // validation is done on call
 
         $user_uuid = $request->get_parameter('user_uuid');
         if ($user_uuid != null)
         {
             $user_id = Db::select_value("select user_id from user where uuid='".Db::escape_string($user_uuid)."'");
-            if ($user_id == null)
-                throw new InvalidParam('user_uuid', "User not found.");
-            if (($request->token != null) && ($request->token->user_id != $user_id))
-                throw new InvalidParam('user_uuid', "User does not match the Access Token used.");
+            if ($user_id == null) {
+                            throw new InvalidParam('user_uuid', "User not found.");
+            }
+            if (($request->token != null) && ($request->token->user_id != $user_id)) {
+                            throw new InvalidParam('user_uuid', "User does not match the Access Token used.");
+            }
+        } elseif (($user_uuid == null) && ($request->token != null)) {
+                    $user_id = $request->token->user_id;
+        } else {
+                    $user_id = null;
         }
-        elseif (($user_uuid == null) && ($request->token != null))
-            $user_id = $request->token->user_id;
-        else
-            $user_id = null;
 
         $lpc = $request->get_parameter('lpc');
-        if ($lpc === null) $lpc = 10;
-        if ($lpc == 'all')
-            $lpc = null;
-        else
+        if ($lpc === null) {
+            $lpc = 10;
+        }
+        if ($lpc == 'all') {
+                    $lpc = null;
+        } else
         {
-            if (!is_numeric($lpc))
-                throw new InvalidParam('lpc', "Invalid number: '$lpc'");
+            if (!is_numeric($lpc)) {
+                            throw new InvalidParam('lpc', "Invalid number: '$lpc'");
+            }
             $lpc = intval($lpc);
-            if ($lpc < 0)
-                throw new InvalidParam('lpc', "Must be a positive value.");
+            if ($lpc < 0) {
+                            throw new InvalidParam('lpc', "Must be a positive value.");
+            }
         }
 
         if (in_array('distance', $fields) || in_array('bearing', $fields) || in_array('bearing2', $fields)
             || in_array('bearing3', $fields))
         {
             $tmp = $request->get_parameter('my_location');
-            if (!$tmp)
-                throw new BadRequest("When using 'distance' or 'bearing' fields, you have to supply 'my_location' parameter.");
+            if (!$tmp) {
+                            throw new BadRequest("When using 'distance' or 'bearing' fields, you have to supply 'my_location' parameter.");
+            }
             $parts = explode('|', $tmp);
-            if (count($parts) != 2)
-                throw new InvalidParam('my_location', "Expecting 2 pipe-separated parts, got ".count($parts).".");
+            if (count($parts) != 2) {
+                            throw new InvalidParam('my_location', "Expecting 2 pipe-separated parts, got ".count($parts).".");
+            }
             foreach ($parts as &$part_ref)
             {
-                if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref))
-                    throw new InvalidParam('my_location', "'$part_ref' is not a valid float number.");
+                if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref)) {
+                                    throw new InvalidParam('my_location', "'$part_ref' is not a valid float number.");
+                }
                 $part_ref = floatval($part_ref);
             }
             list($center_lat, $center_lon) = $parts;
-            if ($center_lat > 90 || $center_lat < -90)
-                throw new InvalidParam('current_position', "Latitudes have to be within -90..90 range.");
-            if ($center_lon > 180 || $center_lon < -180)
-                throw new InvalidParam('current_position', "Longitudes have to be within -180..180 range.");
+            if ($center_lat > 90 || $center_lat < -90) {
+                            throw new InvalidParam('current_position', "Latitudes have to be within -90..90 range.");
+            }
+            if ($center_lon > 180 || $center_lon < -180) {
+                            throw new InvalidParam('current_position', "Longitudes have to be within -180..180 range.");
+            }
         }
 
         if (Settings::get('OC_BRANCH') == 'oc.de')
@@ -181,8 +207,7 @@ 
                     wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                     and status in (1,2,3)
             ");
-        }
-        elseif (Settings::get('OC_BRANCH') == 'oc.pl')
+        } elseif (Settings::get('OC_BRANCH') == 'oc.pl')
         {
             # PL branch:
             # - Caches have ratings.
@@ -231,10 +256,11 @@ 
                         $wp_gc = $row['wp_gc_maintained'] ? $row['wp_gc_maintained'] : $row['wp_gc'];
                         // OC software allows entering anything here, and that's what users do.
                         // We do a formal verification so that only a valid GC code is returned:
-                        if (preg_match('/^\s*[Gg][Cc][A-Za-z0-9]+\s*$/', $wp_gc))
-                            $entry['gc_code'] = strtoupper(trim($wp_gc));
-                        else
-                            $entry['gc_code'] = null;
+                        if (preg_match('/^\s*[Gg][Cc][A-Za-z0-9]+\s*$/', $wp_gc)) {
+                                                    $entry['gc_code'] = strtoupper(trim($wp_gc));
+                        } else {
+                                                    $entry['gc_code'] = null;
+                        }
                         unset($wp_gc);
                         break;
                     case 'name': $entry['name'] = $row['name']; break;
@@ -312,12 +338,19 @@ 
                         $entry['trip_distance'] = $row['trip_distance'] === null ? null : round($row['trip_distance'],3); break;
                         break;
                     case 'rating':
-                        if ($row['votes'] < 3) $entry['rating'] = null;
-                        elseif ($row['score'] >= 2.2) $entry['rating'] = 5.0;
-                        elseif ($row['score'] >= 1.4) $entry['rating'] = 4.0;
-                        elseif ($row['score'] >= 0.1) $entry['rating'] = 3.0;
-                        elseif ($row['score'] >= -1.0) $entry['rating'] = 2.0;
-                        else $entry['rating'] = 1.0;
+                        if ($row['votes'] < 3) {
+                            $entry['rating'] = null;
+                        } elseif ($row['score'] >= 2.2) {
+                            $entry['rating'] = 5.0;
+                        } elseif ($row['score'] >= 1.4) {
+                            $entry['rating'] = 4.0;
+                        } elseif ($row['score'] >= 0.1) {
+                            $entry['rating'] = 3.0;
+                        } elseif ($row['score'] >= -1.0) {
+                            $entry['rating'] = 2.0;
+                        } else {
+                            $entry['rating'] = 1.0;
+                        }
                         break;
                     case 'rating_votes': $entry['rating_votes'] = $row['votes'] + 0; break;
                     case 'recommendations': $entry['recommendations'] = $row['topratings'] + 0; break;
@@ -352,8 +385,9 @@ 
                 }
             }
             $results[$row['wp_oc']] = $entry;
-            if ($row['listing_outdated'] > 0)
-                $outdated_listings[] = $row['wp_oc'];
+            if ($row['listing_outdated'] > 0) {
+                            $outdated_listings[] = $row['wp_oc'];
+            }
         }
         Db::free_result($rs);
 
@@ -367,8 +401,9 @@ 
                 where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_values($owner_ids)))."')
             ");
             $tmp = array();
-            while ($row = Db::fetch_assoc($rs))
-                $tmp[$row['user_id']] = $row;
+            while ($row = Db::fetch_assoc($rs)) {
+                            $tmp[$row['user_id']] = $row;
+            }
             foreach ($results as $cache_code => &$result_ref)
             {
                 $row = $tmp[$owner_ids[$cache_code]];
@@ -384,8 +419,9 @@ 
 
         if (in_array('is_found', $fields))
         {
-            if ($user_id == null)
-                throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_found' field.");
+            if ($user_id == null) {
+                            throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_found' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -401,18 +437,21 @@ 
                     ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_found'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_found'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_not_found
 
         if (in_array('is_not_found', $fields))
         {
-            if ($user_id == null)
-                throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_not_found' field.");
+            if ($user_id == null) {
+                            throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_not_found' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -425,18 +464,21 @@ 
                     ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_not_found'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_not_found'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_watched
 
         if (in_array('is_watched', $fields))
         {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'is_watched' field.");
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'is_watched' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -447,8 +489,9 @@ 
                     and cw.user_id = '".Db::escape_string($request->token->user_id)."'
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
 
             # OCDE caches can also be indirectly watched by watching cache lists:
             if (Settings::get('OC_BRANCH') == 'oc.de')
@@ -464,20 +507,23 @@ 
                       and clw.cache_list_id = cli.cache_list_id
                       and clw.user_id = '".Db::escape_string($request->token->user_id)."'
               ");
-              foreach ($tmp as $cache_code)
-                  $tmp2[$cache_code] = true;
+              foreach ($tmp as $cache_code) {
+                                $tmp2[$cache_code] = true;
+              }
             }
 
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_watched'] = isset($tmp2[$cache_code]);
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_watched'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_ignored
 
         if (in_array('is_ignored', $fields))
         {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'is_ignored' field.");
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'is_ignored' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -488,10 +534,12 @@ 
                     and ci.user_id = '".Db::escape_string($request->token->user_id)."'
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_ignored'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_ignored'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # Descriptions and hints.
@@ -579,27 +627,31 @@ 
             foreach (array(
                 'short_description', 'short_descriptions', 'description', 'descriptions',
                 'hint', 'hints', 'hint2', 'hints2'
-            ) as $field)
-                if (!in_array($field, $fields))
+            ) as $field) {
+                            if (!in_array($field, $fields))
                     foreach ($results as &$result_ref)
                         unset($result_ref[$field]);
+            }
         }
 
         # Images.
 
         if (in_array('images', $fields) || in_array('preview_image', $fields))
         {
-            if (in_array('images', $fields))
-                foreach ($results as &$result_ref)
+            if (in_array('images', $fields)) {
+                            foreach ($results as &$result_ref)
                     $result_ref['images'] = array();
-            if (in_array('preview_image', $fields))
-                foreach ($results as &$result_ref)
+            }
+            if (in_array('preview_image', $fields)) {
+                            foreach ($results as &$result_ref)
                     $result_ref['preview_image'] = null;
+            }
 
-            if (Db::field_exists('pictures', 'mappreview'))
-                $preview_field = "mappreview";
-            else
-                $preview_field = "0";
+            if (Db::field_exists('pictures', 'mappreview')) {
+                            $preview_field = "mappreview";
+            } else {
+                            $preview_field = "0";
+            }
             $rs = Db::query("
                 select object_id, uuid, url, title, spoiler, ".$preview_field." as preview
                 from pictures
@@ -635,10 +687,12 @@ 
                     'unique_caption' => self::get_unique_caption($row['title']),
                     'is_spoiler' => ($row['spoiler'] ? true : false),
                 );
-                if (in_array('images', $fields))
-                    $results[$cache_code]['images'][] = $image;
-                if ($row['preview'] != 0 && in_array('preview_image', $fields))
-                    $results[$cache_code]['preview_image'] = $image;
+                if (in_array('images', $fields)) {
+                                    $results[$cache_code]['images'][] = $image;
+                }
+                if ($row['preview'] != 0 && in_array('preview_image', $fields)) {
+                                    $results[$cache_code]['preview_image'] = $image;
+                }
             }
         }
 
@@ -653,8 +707,9 @@ 
             {
                 $fields_to_remove_later[] = 'attr_acodes';
             }
-            foreach ($results as &$result_ref)
-                $result_ref['attr_acodes'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['attr_acodes'] = array();
+            }
 
             # Load internal_attr_id => acode mapping.
 
@@ -687,8 +742,9 @@ 
                 foreach ($results as &$result_ref)
                 {
                     $result_ref['attrnames'] = array();
-                    foreach ($result_ref['attr_acodes'] as $acode)
-                        $result_ref['attrnames'][] = $acode2bestname[$acode];
+                    foreach ($result_ref['attr_acodes'] as $acode) {
+                                            $result_ref['attrnames'][] = $acode2bestname[$acode];
+                    }
                 }
             }
         }
@@ -697,8 +753,9 @@ 
 
         if (in_array('latest_logs', $fields))
         {
-            foreach ($results as &$result_ref)
-                $result_ref['latest_logs'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['latest_logs'] = array();
+            }
 
             # Get all log IDs in proper order, then filter out the latest
             # ones. This should be the fastest technique ...
@@ -732,8 +789,9 @@ 
             {
                 # User wants some of the latest logs.
                 $tmp = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $tmp[$row['cache_id']][] = $row;
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $tmp[$row['cache_id']][] = $row;
+                }
                 foreach ($tmp as $cache_key => &$rowslist_ref)
                 {
                     for ($i = 0; $i < min(count($rowslist_ref), $lpc); $i++)
@@ -742,8 +800,7 @@ 
                         $log2cache_map[$rowslist_ref[$i]['uuid']] = $cacheid2wptcode[$rowslist_ref[$i]['cache_id']];
                     }
                 }
-            }
-            else
+            } else
             {
                 # User wants ALL logs.
                 while ($row = Db::fetch_assoc($rs))
@@ -773,18 +830,17 @@ 
                     );
                     foreach ($subset as $log_uuid)
                     {
-                        if ($entries[$log_uuid])
-                            $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                        if ($entries[$log_uuid]) {
+                                                    $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                        }
                     }
                 }
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 if (($e instanceof InvalidParam) && ($e->paramName == 'fields'))
                 {
                     throw new InvalidParam('log_fields', $e->whats_wrong_about_it);
-                }
-                else
+                } else
                 {
                     /* Something is wrong with OUR code. */
                     throw new Exception($e);
@@ -796,10 +852,12 @@ 
 
         if (in_array('my_notes', $fields))
         {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'my_notes' field.");
-            foreach ($results as &$result_ref)
-                $result_ref['my_notes'] = null;
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'my_notes' field.");
+            }
+            foreach ($results as &$result_ref) {
+                            $result_ref['my_notes'] = null;
+            }
             if (Settings::get('OC_BRANCH') == 'oc.pl')
             {
                 # OCPL uses cache_notes table to store notes.
@@ -812,8 +870,7 @@ 
                         and user_id = '".Db::escape_string($request->token->user_id)."'
                     group by cache_id
                 ");
-            }
-            else
+            } else
             {
                 # OCDE uses coordinates table (with type == 2) to store notes (this is somewhat weird).
 
@@ -852,13 +909,15 @@ 
                     and gkiw.wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
             ");
             $trs = array();
-            while ($row = Db::fetch_assoc($rs))
-                $trs[$row['cache_code']][] = $row;
+            while ($row = Db::fetch_assoc($rs)) {
+                            $trs[$row['cache_code']][] = $row;
+            }
             foreach ($results as $cache_code => &$result_ref)
             {
                 $result_ref['trackables'] = array();
-                if (!isset($trs[$cache_code]))
-                    continue;
+                if (!isset($trs[$cache_code])) {
+                                    continue;
+                }
                 foreach ($trs[$cache_code] as $t)
                 {
                     $result_ref['trackables'][] = array(
@@ -875,10 +934,10 @@ 
             if (in_array('trackables', $fields))
             {
                 # We already got all trackables data, no need to query database again.
-                foreach ($results as $cache_code => &$result_ref)
-                    $result_ref['trackables_count'] = count($result_ref['trackables']);
-            }
-            else
+                foreach ($results as $cache_code => &$result_ref) {
+                                    $result_ref['trackables_count'] = count($result_ref['trackables']);
+                }
+            } else
             {
                 $rs = Db::query("
                     select wp as cache_code, count(*) as count
@@ -887,14 +946,16 @@ 
                     group by wp
                 ");
                 $tr_counts = new ArrayObject();
-                while ($row = Db::fetch_assoc($rs))
-                    $tr_counts[$row['cache_code']] = $row['count'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $tr_counts[$row['cache_code']] = $row['count'];
+                }
                 foreach ($results as $cache_code => &$result_ref)
                 {
-                    if (isset($tr_counts[$cache_code]))
-                        $result_ref['trackables_count'] = $tr_counts[$cache_code] + 0;
-                    else
-                        $result_ref['trackables_count'] = 0;
+                    if (isset($tr_counts[$cache_code])) {
+                                            $result_ref['trackables_count'] = $tr_counts[$cache_code] + 0;
+                    } else {
+                                            $result_ref['trackables_count'] = 0;
+                    }
                 }
                 unset($tr_counts);
             }
@@ -916,11 +977,11 @@ 
                         coordinates_type ct
                         left join sys_trans_text stt on stt.trans_id = ct.trans_id
                 ");
-                while ($row = Db::fetch_assoc($rs))
-                    $internal_wpt_type_id2names[$row['id']][$row['language']] = $row['text'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $internal_wpt_type_id2names[$row['id']][$row['language']] = $row['text'];
+                }
                 Db::free_result($rs);
-            }
-            else
+            } else
             {
                 $rs = Db::query("
                     select id, pl, en
@@ -934,8 +995,9 @@ 
                 }
             }
 
-            foreach ($results as &$result_ref)
-                $result_ref['alt_wpts'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['alt_wpts'] = array();
+            }
             $cache_codes_escaped_and_imploded = "'".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."'";
 
             if (Settings::get('OC_BRANCH') == 'oc.pl')
@@ -970,8 +1032,7 @@ 
                         and status = 1
                     order by cache_id, stage, `desc`
                 ");
-            }
-            else
+            } else
             {
                 # OCDE uses 'coordinates' table (with type=1) to store additional waypoints
                 # and defines waypoint types in 'coordinates_type' table.
@@ -1117,8 +1178,9 @@ 
                         c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                 ");
                 $country_codes2names = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $country_codes2names[$row['country']][$row['language']] = $row['text'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $country_codes2names[$row['country']][$row['language']] = $row['text'];
+                }
                 Db::free_result($rs);
 
                 # get geocache countries and states
@@ -1135,15 +1197,15 @@ 
                 ");
                 while ($row = Db::fetch_assoc($rs))
                 {
-                    if (!isset($country_codes2names[$row['country_code']]))
-                        $countries[$row['cache_code']] = '';
-                    else
-                        $countries[$row['cache_code']] = Okapi::pick_best_language($country_codes2names[$row['country_code']], $langpref);
+                    if (!isset($country_codes2names[$row['country_code']])) {
+                                            $countries[$row['cache_code']] = '';
+                    } else {
+                                            $countries[$row['cache_code']] = Okapi::pick_best_language($country_codes2names[$row['country_code']], $langpref);
+                    }
                     $states[$row['cache_code']] = $row['state'];
                 }
                 Db::free_result($rs);
-            }
-            else
+            } else
             {
                 # OCPL:
                 #  - cache_location data is entered by the user.
@@ -1172,13 +1234,15 @@ 
 
             if (in_array('country', $fields))
             {
-                foreach ($results as $cache_code => &$row_ref)
-                    $row_ref['country'] = isset($countries[$cache_code]) ? $countries[$cache_code] : null;
+                foreach ($results as $cache_code => &$row_ref) {
+                                    $row_ref['country'] = isset($countries[$cache_code]) ? $countries[$cache_code] : null;
+                }
             }
             if (in_array('state', $fields))
             {
-                foreach ($results as $cache_code => &$row_ref)
-                    $row_ref['state'] = isset($states[$cache_code]) ? $states[$cache_code] : null;
+                foreach ($results as $cache_code => &$row_ref) {
+                                    $row_ref['state'] = isset($states[$cache_code]) ? $states[$cache_code] : null;
+                }
             }
             unset($countries);
             unset($states);
@@ -1191,12 +1255,13 @@ 
             /* Note, that the "owner" and "internal_id" fields are automatically included,
              * whenever the attribution_note is included. */
 
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['attribution_note'] =
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['attribution_note'] =
                     self::get_cache_attribution_note(
                         $result_ref['internal_id'], $langpref[0], $langpref,
                         $results[$cache_code]['owner'], 'full'
                     );
+            }
         }
 
         # Protection areas
@@ -1222,8 +1287,7 @@ 
                     group by npa_areas.type_id, npa_areas.name
                     order by npa_types.ordinal
                 ");
-            }
-            else if (in_array(Okapi::get_oc_schema_code(), array("OCPL", "OCNL")))
+            } else if (in_array(Okapi::get_oc_schema_code(), array("OCPL", "OCNL")))
             {
                 # Current OCPL table definitions use collation 'latin1' for parkipl
                 # and 'utf8' for np_areas. Union needs identical collations.
@@ -1255,8 +1319,7 @@ 
                         c.cache_id in (".$cache_ids_escaped_and_imploded.")
                         and cache_npa_areas.npa_id != 0
                 ");
-            }
-            else
+            } else
             {
                 # OC.US and .UK do not have a 'parkipl' table.
                 # OC.US has a 'us_parks' table instead.
@@ -1264,8 +1327,9 @@ 
                 $rs = null;
             }
 
-            foreach ($results as &$result_ref)
-                $result_ref['protection_areas'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['protection_areas'] = array();
+            }
             if ($rs)
             {
                 while ($row = Db::fetch_assoc($rs))
@@ -1280,18 +1344,20 @@ 
         }
 
         # Check which cache codes were not found and mark them with null.
-        foreach ($cache_codes as $cache_code)
-            if (!isset($results[$cache_code]))
+        foreach ($cache_codes as $cache_code) {
+                    if (!isset($results[$cache_code]))
                 $results[$cache_code] = null;
+        }
 
         if (count($fields_to_remove_later) > 0)
         {
             # Some of the fields in $results were added only temporarily
             # (the Consumer did not ask for them). We will remove these fields now.
 
-            foreach ($results as &$result_ref)
-                foreach ($fields_to_remove_later as $field)
+            foreach ($results as &$result_ref) {
+                            foreach ($fields_to_remove_later as $field)
                     unset($result_ref[$field]);
+            }
         }
 
         # Order the results in the same order as the input codes were given.
@@ -1301,8 +1367,9 @@ 
         # so we just have to rewrite it (sequentially).
 
         $ordered_results = new ArrayObject();
-        foreach ($cache_codes as $cache_code)
-            $ordered_results[$cache_code] = $results[$cache_code];
+        foreach ($cache_codes as $cache_code) {
+                    $ordered_results[$cache_code] = $results[$cache_code];
+        }
 
         /* Handle OCPL's "access logs" feature. */
 
@@ -1415,8 +1482,7 @@ 
                 _("This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</a> site."),
                 $cache_url, $site_url, $site_name
             );
-        }
-        else
+        } else
         {
             # OC.de wants the tld in lowercase here
             $site_name = ucfirst(strtolower($site_name));
@@ -1430,8 +1496,7 @@ 
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name, strftime('%x')
                 );
-            }
-            elseif ($type == 'static')
+            } elseif ($type == 'static')
             {
                 $note = sprintf(
                     _(