OpencachingDeutschland / oc-server3

htdocs/okapi/services/caches/search/bbox.php

Braces +24 added lines, -21 removed lines

@@ -30,26 +30,32 @@ 
         # It's much easier to grasp their meaning this way.
 
         $tmp = $request->get_parameter('bbox');
-        if (!$tmp)
-            throw new ParamMissing('bbox');
+        if (!$tmp) {
+                    throw new ParamMissing('bbox');
+        }
         $parts = explode('|', $tmp);
-        if (count($parts) != 4)
-            throw new InvalidParam('bbox', "Expecting 4 pipe-separated parts, got ".count($parts).".");
-        foreach ($parts as &$part_ref)
-        {
-            if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref))
-                throw new InvalidParam('bbox', "'$part_ref' is not a valid float number.");
+        if (count($parts) != 4) {
+                    throw new InvalidParam('bbox', "Expecting 4 pipe-separated parts, got ".count($parts).".");
+        }
+        foreach ($parts as &$part_ref) {
+            if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref)) {
+                            throw new InvalidParam('bbox', "'$part_ref' is not a valid float number.");
+            }
             $part_ref = floatval($part_ref);
         }
         list($bbsouth, $bbwest, $bbnorth, $bbeast) = $parts;
-        if ($bbnorth <= $bbsouth)
-            throw new InvalidParam('bbox', "Northern edge must be situated to the north of the southern edge.");
-        if ($bbeast == $bbwest)
-            throw new InvalidParam('bbox', "Eastern edge longitude is the same as the western one.");
-        if ($bbnorth > 90 || $bbnorth < -90 || $bbsouth > 90 || $bbsouth < -90)
-            throw new InvalidParam('bbox', "Latitudes have to be within -90..90 range.");
-        if ($bbeast > 180 || $bbeast < -180 || $bbwest > 180 || $bbwest < -180)
-            throw new InvalidParam('bbox', "Longitudes have to be within -180..180 range.");
+        if ($bbnorth <= $bbsouth) {
+                    throw new InvalidParam('bbox', "Northern edge must be situated to the north of the southern edge.");
+        }
+        if ($bbeast == $bbwest) {
+                    throw new InvalidParam('bbox', "Eastern edge longitude is the same as the western one.");
+        }
+        if ($bbnorth > 90 || $bbnorth < -90 || $bbsouth > 90 || $bbsouth < -90) {
+                    throw new InvalidParam('bbox', "Latitudes have to be within -90..90 range.");
+        }
+        if ($bbeast > 180 || $bbeast < -180 || $bbwest > 180 || $bbwest < -180) {
+                    throw new InvalidParam('bbox', "Longitudes have to be within -180..180 range.");
+        }
 
         # Construct SQL conditions for the specified bounding box.
 
@@ -64,16 +70,13 @@ 
             $lat >= '".Db::escape_string($bbsouth)."'
             and $lat < '".Db::escape_string($bbnorth)."'
         )";
-        if ($bbeast > $bbwest)
-        {
+        if ($bbeast > $bbwest) {
             # Easy one.
             $where_conds[] = "(
                 $lon >= '".Db::escape_string($bbwest)."'
                 and $lon < '".Db::escape_string($bbeast)."'
             )";
-        }
-        else
-        {
+        } else {
             # We'll have to assume that this bbox goes through the 180-degree meridian.
             # For example, $bbwest = 179 and $bbeast = -179.
             $where_conds[] = "(

htdocs/okapi/services/caches/search/searching.inc.php

Braces +191 added lines, -211 removed lines

@@ -95,8 +95,7 @@ 
         # At the beginning we have to set up some "magic e$Xpressions".
         # We will use them to make our query run on both OCPL and OCDE databases.
 
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # OCPL's 'caches' table contains some fields which OCDE's does not
             # (topratings, founds, notfounds, last_found, votes, score). If
             # we're being run on OCPL installation, we will simply use them.
@@ -107,9 +106,7 @@ 
             $X_LAST_FOUND = 'caches.last_found';
             $X_VOTES = 'caches.votes';
             $X_SCORE = 'caches.score';
-        }
-        else
-        {
+        } else {
             # OCDE holds this data in a separate table. Additionally, OCDE
             # does not provide a rating system (votes and score fields).
             # If we're being run on OCDE database, we will include this
@@ -131,55 +128,44 @@ 
         # type
         #
 
-        if ($tmp = $this->request->get_parameter('type'))
-        {
+        if ($tmp = $this->request->get_parameter('type')) {
             $operator = "in";
-            if ($tmp[0] == '-')
-            {
+            if ($tmp[0] == '-') {
                 $tmp = substr($tmp, 1);
                 $operator = "not in";
             }
             $types = array();
-            foreach (explode("|", $tmp) as $name)
-            {
-                try
-                {
+            foreach (explode("|", $tmp) as $name) {
+                try {
                     $id = Okapi::cache_type_name2id($name);
                     $types[] = $id;
-                }
-                catch (Exception $e)
-                {
+                } catch (Exception $e) {
                     throw new InvalidParam('type', "'$name' is not a valid cache type.");
                 }
             }
-            if (count($types) > 0)
-                $where_conds[] = "caches.type $operator ('".implode("','", array_map('\okapi\Db::escape_string', $types))."')";
-            else if ($operator == "in")
-                $where_conds[] = "false";
+            if (count($types) > 0) {
+                            $where_conds[] = "caches.type $operator ('".implode("','", array_map('\okapi\Db::escape_string', $types))."')";
+            } else if ($operator == "in") {
+                            $where_conds[] = "false";
+            }
         }
 
         #
         # size2
         #
 
-        if ($tmp = $this->request->get_parameter('size2'))
-        {
+        if ($tmp = $this->request->get_parameter('size2')) {
             $operator = "in";
-            if ($tmp[0] == '-')
-            {
+            if ($tmp[0] == '-') {
                 $tmp = substr($tmp, 1);
                 $operator = "not in";
             }
             $types = array();
-            foreach (explode("|", $tmp) as $name)
-            {
-                try
-                {
+            foreach (explode("|", $tmp) as $name) {
+                try {
                     $id = Okapi::cache_size2_to_sizeid($name);
                     $types[] = $id;
-                }
-                catch (Exception $e)
-                {
+                } catch (Exception $e) {
                     throw new InvalidParam('size2', "'$name' is not a valid cache size.");
                 }
             }
@@ -191,16 +177,14 @@ 
         #
 
         $tmp = $this->request->get_parameter('status');
-        if ($tmp == null) $tmp = "Available";
+        if ($tmp == null) {
+            $tmp = "Available";
+        }
         $codes = array();
-        foreach (explode("|", $tmp) as $name)
-        {
-            try
-            {
+        foreach (explode("|", $tmp) as $name) {
+            try {
                 $codes[] = Okapi::cache_status_name2id($name);
-            }
-            catch (Exception $e)
-            {
+            } catch (Exception $e) {
                 throw new InvalidParam('status', "'$name' is not a valid cache status.");
             }
         }
@@ -210,26 +194,23 @@ 
         # owner_uuid
         #
 
-        if ($tmp = $this->request->get_parameter('owner_uuid'))
-        {
+        if ($tmp = $this->request->get_parameter('owner_uuid')) {
             $operator = "in";
-            if ($tmp[0] == '-')
-            {
+            if ($tmp[0] == '-') {
                 $tmp = substr($tmp, 1);
                 $operator = "not in";
             }
-            try
-            {
+            try {
                 $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
                     $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
-            }
-            catch (InvalidParam $e) # invalid uuid
+            } catch (InvalidParam $e) # invalid uuid
             {
                 throw new InvalidParam('owner_uuid', $e->whats_wrong_about_it);
             }
             $user_ids = array();
-            foreach ($users as $user)
-                $user_ids[] = $user['internal_id'];
+            foreach ($users as $user) {
+                            $user_ids[] = $user['internal_id'];
+            }
             $where_conds[] = "caches.user_id $operator ('".implode("','", array_map('\okapi\Db::escape_string', $user_ids))."')";
         }
 
@@ -237,27 +218,26 @@ 
         # terrain, difficulty, size, rating - these are similar, we'll do them in a loop
         #
 
-        foreach (array('terrain', 'difficulty', 'size', 'rating') as $param_name)
-        {
-            if ($tmp = $this->request->get_parameter($param_name))
-            {
-                if (!preg_match("/^[1-5]-[1-5](\|X)?$/", $tmp))
-                    throw new InvalidParam($param_name, "'$tmp'");
+        foreach (array('terrain', 'difficulty', 'size', 'rating') as $param_name) {
+            if ($tmp = $this->request->get_parameter($param_name)) {
+                if (!preg_match("/^[1-5]-[1-5](\|X)?$/", $tmp)) {
+                                    throw new InvalidParam($param_name, "'$tmp'");
+                }
                 list($min, $max) = explode("-", $tmp);
-                if (strpos($max, "|X") !== false)
-                {
+                if (strpos($max, "|X") !== false) {
                     $max = $max[0];
                     $allow_null = true;
                 } else {
                     $allow_null = false;
                 }
-                if ($min > $max)
-                    throw new InvalidParam($param_name, "'$tmp'");
-                switch ($param_name)
-                {
+                if ($min > $max) {
+                                    throw new InvalidParam($param_name, "'$tmp'");
+                }
+                switch ($param_name) {
                     case 'terrain':
-                        if ($allow_null)
-                            throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        if ($allow_null) {
+                                                    throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        }
                         if (($min == 1) && ($max == 5)) {
                             /* no extra condition necessary */
                         } else {
@@ -265,8 +245,9 @@ 
                         }
                         break;
                     case 'difficulty':
-                        if ($allow_null)
-                            throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        if ($allow_null) {
+                                                    throw new InvalidParam($param_name, "The '|X' suffix is not allowed here.");
+                        }
                         if (($min == 1) && ($max == 5)) {
                             /* no extra condition necessary */
                         } else {
@@ -288,8 +269,7 @@ 
                         }
                         break;
                     case 'rating':
-                        if (Settings::get('OC_BRANCH') == 'oc.pl')
-                        {
+                        if (Settings::get('OC_BRANCH') == 'oc.pl') {
                             if (($min == 1) && ($max == 5) && $allow_null) {
                                 /* no extra condition necessary */
                             } else {
@@ -299,9 +279,7 @@ 
                                 $where_conds[] = "($X_SCORE >= $min and $X_SCORE < $max and $X_VOTES >= 3)".
                                     ($allow_null ? " or ($X_VOTES < 3)" : "");
                             }
-                        }
-                        else
-                        {
+                        } else {
                             # OCDE does not support rating. We will ignore this parameter.
                         }
                         break;
@@ -313,22 +291,23 @@ 
         # min_rcmds
         #
 
-        if ($tmp = $this->request->get_parameter('min_rcmds'))
-        {
-            if ($tmp[strlen($tmp) - 1] == '%')
-            {
+        if ($tmp = $this->request->get_parameter('min_rcmds')) {
+            if ($tmp[strlen($tmp) - 1] == '%') {
                 $tmp = substr($tmp, 0, strlen($tmp) - 1);
-                if (!is_numeric($tmp))
-                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                if (!is_numeric($tmp)) {
+                                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                }
                 $tmp = intval($tmp);
-                if ($tmp > 100 || $tmp < 0)
-                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                if ($tmp > 100 || $tmp < 0) {
+                                    throw new InvalidParam('min_rcmds', "'$tmp'");
+                }
                 $tmp = floatval($tmp) / 100.0;
                 $where_conds[] = "$X_TOPRATINGS >= $X_FOUNDS * '".Db::escape_string($tmp)."'";
                 $where_conds[] = "$X_FOUNDS > 0";
             }
-            if (!is_numeric($tmp))
-                throw new InvalidParam('min_rcmds', "'$tmp'");
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('min_rcmds', "'$tmp'");
+            }
             $where_conds[] = "$X_TOPRATINGS >= '".Db::escape_string($tmp)."'";
         }
 
@@ -336,10 +315,10 @@ 
         # min_founds
         #
 
-        if ($tmp = $this->request->get_parameter('min_founds'))
-        {
-            if (!is_numeric($tmp))
-                throw new InvalidParam('min_founds', "'$tmp'");
+        if ($tmp = $this->request->get_parameter('min_founds')) {
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('min_founds', "'$tmp'");
+            }
             $where_conds[] = "$X_FOUNDS >= '".Db::escape_string($tmp)."'";
         }
 
@@ -348,10 +327,10 @@ 
         # may be '0' for FTF hunts
         #
 
-        if (!is_null($tmp = $this->request->get_parameter('max_founds')))
-        {
-            if (!is_numeric($tmp))
-                throw new InvalidParam('max_founds', "'$tmp'");
+        if (!is_null($tmp = $this->request->get_parameter('max_founds'))) {
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('max_founds', "'$tmp'");
+            }
             $where_conds[] = "$X_FOUNDS <= '".Db::escape_string($tmp)."'";
         }
 
@@ -359,27 +338,27 @@ 
         # modified_since
         #
 
-        if ($tmp = $this->request->get_parameter('modified_since'))
-        {
+        if ($tmp = $this->request->get_parameter('modified_since')) {
             $timestamp = strtotime($tmp);
-            if ($timestamp)
-                $where_conds[] = "unix_timestamp(caches.last_modified) > '".Db::escape_string($timestamp)."'";
-            else
-                throw new InvalidParam('modified_since', "'$tmp' is not in a valid format or is not a valid date.");
+            if ($timestamp) {
+                            $where_conds[] = "unix_timestamp(caches.last_modified) > '".Db::escape_string($timestamp)."'";
+            } else {
+                            throw new InvalidParam('modified_since', "'$tmp' is not in a valid format or is not a valid date.");
+            }
         }
 
         #
         # found_status
         #
 
-        if ($tmp = $this->request->get_parameter('found_status'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('found_status', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('found_only', 'notfound_only', 'either')))
-                throw new InvalidParam('found_status', "'$tmp'");
-            if ($tmp != 'either')
-            {
+        if ($tmp = $this->request->get_parameter('found_status')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('found_status', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('found_only', 'notfound_only', 'either'))) {
+                            throw new InvalidParam('found_status', "'$tmp'");
+            }
+            if ($tmp != 'either') {
                 $found_cache_ids = self::get_found_cache_ids(array($this->request->token->user_id));
                 $operator = ($tmp == 'found_only') ? "in" : "not in";
                 $where_conds[] = "caches.cache_id $operator ('".implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids))."')";
@@ -390,12 +369,12 @@ 
         # found_by
         #
 
-        if ($tmp = $this->request->get_parameter('found_by'))
-        {
+        if ($tmp = $this->request->get_parameter('found_by')) {
             try {
                 $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
                     $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
-            } catch (InvalidParam $e) { # invalid uuid
+            } catch (InvalidParam $e) {
+# invalid uuid
                 throw new InvalidParam('found_by', $e->whats_wrong_about_it);
             }
             $internal_user_ids = array_map(create_function('$user', 'return $user["internal_id"];'), $users);
@@ -407,12 +386,12 @@ 
         # not_found_by
         #
 
-        if ($tmp = $this->request->get_parameter('not_found_by'))
-        {
+        if ($tmp = $this->request->get_parameter('not_found_by')) {
             try {
                 $users = OkapiServiceRunner::call("services/users/users", new OkapiInternalRequest(
                     $this->request->consumer, null, array('user_uuids' => $tmp, 'fields' => 'internal_id')));
-            } catch (InvalidParam $e) { # invalid uuid
+            } catch (InvalidParam $e) {
+# invalid uuid
                 throw new InvalidParam('not_found_by', $e->whats_wrong_about_it);
             }
             $internal_user_ids = array_map(create_function('$user', 'return $user["internal_id"];'), $users);
@@ -424,21 +403,20 @@ 
         # watched_only
         #
 
-        if ($tmp = $this->request->get_parameter('watched_only'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('watched_only', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('true', 'false')))
-                throw new InvalidParam('watched_only', "'$tmp'");
-            if ($tmp == 'true')
-            {
+        if ($tmp = $this->request->get_parameter('watched_only')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('watched_only', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('true', 'false'))) {
+                            throw new InvalidParam('watched_only', "'$tmp'");
+            }
+            if ($tmp == 'true') {
                 $watched_cache_ids = Db::select_column("
                     select cache_id
                     from cache_watches
                     where user_id = '".Db::escape_string($this->request->token->user_id)."'
                 ");
-                if (Settings::get('OC_BRANCH') == 'oc.de')
-                {
+                if (Settings::get('OC_BRANCH') == 'oc.de') {
                     $watched_cache_ids = array_merge($watched_cache_ids, Db::select_column("
                         select cache_id
                         from cache_list_items cli, cache_list_watches clw
@@ -455,33 +433,35 @@ 
         #
 
         $ignored_status = 'either';
-        if ($tmp = $this->request->get_parameter('exclude_ignored'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('exclude_ignored', "Might be used only for requests signed with an Access Token.");
-            if ($tmp == 'true')
-                $ignored_status = 'notignored_only';
-            elseif ($tmp != 'false')
-                throw new InvalidParam('exclude_ignored', "'$tmp'");
-        }
-        if ($tmp = $this->request->get_parameter('ignored_status'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('ignored_status', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('ignored_only', 'notignored_only', 'either')))
-                throw new InvalidParam('ignored_status', "'$tmp'");
+        if ($tmp = $this->request->get_parameter('exclude_ignored')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('exclude_ignored', "Might be used only for requests signed with an Access Token.");
+            }
+            if ($tmp == 'true') {
+                            $ignored_status = 'notignored_only';
+            } elseif ($tmp != 'false') {
+                            throw new InvalidParam('exclude_ignored', "'$tmp'");
+            }
+        }
+        if ($tmp = $this->request->get_parameter('ignored_status')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('ignored_status', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('ignored_only', 'notignored_only', 'either'))) {
+                            throw new InvalidParam('ignored_status', "'$tmp'");
+            }
             if ($tmp != 'either') {
-                if ($tmp == 'ignored_only' && $ignored_status == 'notignored_only')
-                    $ignored_status = 'none';
-                else
-                    $ignored_status = $tmp;
+                if ($tmp == 'ignored_only' && $ignored_status == 'notignored_only') {
+                                    $ignored_status = 'none';
+                } else {
+                                    $ignored_status = $tmp;
+                }
                 }
         }
 
-        if ($ignored_status == 'none')
-            $where_conds[] = 'false';
-        elseif ($ignored_status != 'either')
-        {
+        if ($ignored_status == 'none') {
+                    $where_conds[] = 'false';
+        } elseif ($ignored_status != 'either') {
             $ignored_cache_ids = Db::select_column("
                 select cache_id
                 from cache_ignore
@@ -495,27 +475,29 @@ 
         # exclude_my_own
         #
 
-        if ($tmp = $this->request->get_parameter('exclude_my_own'))
-        {
-            if ($this->request->token == null)
-                throw new InvalidParam('exclude_my_own', "Might be used only for requests signed with an Access Token.");
-            if (!in_array($tmp, array('true', 'false')))
-                throw new InvalidParam('exclude_my_own', "'$tmp'");
-            if ($tmp == 'true')
-                $where_conds[] = "caches.user_id != '".Db::escape_string($this->request->token->user_id)."'";
+        if ($tmp = $this->request->get_parameter('exclude_my_own')) {
+            if ($this->request->token == null) {
+                            throw new InvalidParam('exclude_my_own', "Might be used only for requests signed with an Access Token.");
+            }
+            if (!in_array($tmp, array('true', 'false'))) {
+                            throw new InvalidParam('exclude_my_own', "'$tmp'");
+            }
+            if ($tmp == 'true') {
+                            $where_conds[] = "caches.user_id != '".Db::escape_string($this->request->token->user_id)."'";
+            }
         }
 
         #
         # name
         #
 
-        if ($tmp = $this->request->get_parameter('name'))
-        {
+        if ($tmp = $this->request->get_parameter('name')) {
             # WRTODO: Make this more user-friendly. See:
             # https://github.com/opencaching/okapi/issues/121
 
-            if (strlen($tmp) > 100)
-                throw new InvalidParam('name', "Maximum length of 'name' parameter is 100 characters");
+            if (strlen($tmp) > 100) {
+                            throw new InvalidParam('name', "Maximum length of 'name' parameter is 100 characters");
+            }
             $tmp = str_replace("*", "%", str_replace("%", "%%", $tmp));
             $where_conds[] = "caches.name LIKE '".Db::escape_string($tmp)."'";
         }
@@ -524,12 +506,11 @@ 
         # with_trackables_only
         #
 
-        if ($tmp = $this->request->get_parameter('with_trackables_only'))
-        {
-            if (!in_array($tmp, array('true', 'false'), 1))
-                throw new InvalidParam('with_trackables_only', "'$tmp'");
-            if ($tmp == 'true')
-            {
+        if ($tmp = $this->request->get_parameter('with_trackables_only')) {
+            if (!in_array($tmp, array('true', 'false'), 1)) {
+                            throw new InvalidParam('with_trackables_only', "'$tmp'");
+            }
+            if ($tmp == 'true') {
                 $where_conds[] = "
                     caches.wp_oc in (
                         select distinct wp
@@ -543,12 +524,11 @@ 
         # ftf_hunter
         #
 
-        if ($tmp = $this->request->get_parameter('ftf_hunter'))
-        {
-            if (!in_array($tmp, array('true', 'false'), 1))
-                throw new InvalidParam('ftf_hunter', "'$tmp'");
-            if ($tmp == 'true')
-            {
+        if ($tmp = $this->request->get_parameter('ftf_hunter')) {
+            if (!in_array($tmp, array('true', 'false'), 1)) {
+                            throw new InvalidParam('ftf_hunter', "'$tmp'");
+            }
+            if ($tmp == 'true') {
                 $where_conds[] = "$X_FOUNDS = 0";
             }
         }
@@ -558,8 +538,7 @@ 
         #
 
         $join_powertrails = false;
-        if ($tmp = $this->request->get_parameter('powertrail_only'))
-        {
+        if ($tmp = $this->request->get_parameter('powertrail_only')) {
             if ($tmp === 'true') {
                 $join_powertrails = true;
             } elseif ($tmp === 'false') {
@@ -594,8 +573,7 @@ 
         # set_and
         #
 
-        if ($tmp = $this->request->get_parameter('set_and'))
-        {
+        if ($tmp = $this->request->get_parameter('set_and')) {
             # Check if the set exists.
 
             $exists = Db::select_value("
@@ -603,8 +581,9 @@ 
                 from okapi_search_sets
                 where id = '".Db::escape_string($tmp)."'
             ");
-            if (!$exists)
-                throw new InvalidParam('set_and', "Couldn't find a set by given ID.");
+            if (!$exists) {
+                            throw new InvalidParam('set_and', "Couldn't find a set by given ID.");
+            }
             $extra_tables[] = "okapi_search_results osr_and";
             $where_conds[] = "osr_and.cache_id = caches.cache_id";
             $where_conds[] = "osr_and.set_id = '".Db::escape_string($tmp)."'";
@@ -615,34 +594,43 @@ 
         #
 
         $limit = $this->request->get_parameter('limit');
-        if ($limit == null) $limit = "100";
-        if (!is_numeric($limit))
-            throw new InvalidParam('limit', "'$limit'");
-        if ($limit < 1 || (($limit > 500) && (!$this->request->skip_limits)))
-            throw new InvalidParam(
+        if ($limit == null) {
+            $limit = "100";
+        }
+        if (!is_numeric($limit)) {
+                    throw new InvalidParam('limit', "'$limit'");
+        }
+        if ($limit < 1 || (($limit > 500) && (!$this->request->skip_limits))) {
+                    throw new InvalidParam(
                 'limit',
                 $this->request->skip_limits
                     ? "Cannot be lower than 1."
                     : "Has to be between 1 and 500."
             );
+        }
 
         #
         # offset
         #
 
         $offset = $this->request->get_parameter('offset');
-        if ($offset == null) $offset = "0";
-        if (!is_numeric($offset))
-            throw new InvalidParam('offset', "'$offset'");
-        if (($offset + $limit > 500) && (!$this->request->skip_limits))
-            throw new BadRequest("The sum of offset and limit may not exceed 500.");
-        if ($offset < 0 || (($offset > 499) && (!$this->request->skip_limits)))
-            throw new InvalidParam(
+        if ($offset == null) {
+            $offset = "0";
+        }
+        if (!is_numeric($offset)) {
+                    throw new InvalidParam('offset', "'$offset'");
+        }
+        if (($offset + $limit > 500) && (!$this->request->skip_limits)) {
+                    throw new BadRequest("The sum of offset and limit may not exceed 500.");
+        }
+        if ($offset < 0 || (($offset > 499) && (!$this->request->skip_limits))) {
+                    throw new InvalidParam(
                 'offset',
                 $this->request->skip_limits
                     ? "Cannot be lower than 0."
                     : "Has to be between 0 and 499."
             );
+        }
 
         #
         # order_by
@@ -650,21 +638,18 @@ 
 
         $order_clauses = array();
         $order_by = $this->request->get_parameter('order_by');
-        if ($order_by != null)
-        {
+        if ($order_by != null) {
             $order_by = explode('|', $order_by);
-            foreach ($order_by as $field)
-            {
+            foreach ($order_by as $field) {
                 $dir = 'asc';
-                if ($field[0] == '-')
-                {
+                if ($field[0] == '-') {
                     $dir = 'desc';
                     $field = substr($field, 1);
+                } elseif ($field[0] == '+') {
+                                    $field = substr($field, 1);
                 }
-                elseif ($field[0] == '+')
-                    $field = substr($field, 1); # ignore leading "+"
-                switch ($field)
-                {
+                # ignore leading "+"
+                switch ($field) {
                     case 'code': $cl = "caches.wp_oc"; break;
                     case 'name': $cl = "caches.name"; break;
                     case 'founds': $cl = "$X_FOUNDS"; break;
@@ -682,8 +667,9 @@ 
         # To avoid join errors, put each of the $where_conds in extra paranthesis.
 
         $tmp = array();
-        foreach($where_conds as $cond)
-            $tmp[] = "(".$cond.")";
+        foreach($where_conds as $cond) {
+                    $tmp[] = "(".$cond.")";
+        }
         $where_conds = $tmp;
         unset($tmp);
 
@@ -697,8 +683,7 @@ 
             'extra_joins' => $extra_joins,
         );
 
-        if ($this->search_params === NULL)
-        {
+        if ($this->search_params === NULL) {
             $this->search_params = $ret_array;
         } else {
             $this->search_params = array_merge_recursive($this->search_params, $ret_array);
@@ -738,8 +723,7 @@ 
             limit ".($this->search_params['offset']).", ".($this->search_params['limit'] + 1).";
         ");
 
-        if (count($cache_codes) > $this->search_params['limit'])
-        {
+        if (count($cache_codes) > $this->search_params['limit']) {
             $more = true;
             array_pop($cache_codes); # get rid of the one above the limit
         } else {
@@ -767,18 +751,17 @@ 
     public function prepare_location_search_params()
     {
         $location_source = $this->request->get_parameter('location_source');
-        if (!$location_source)
-            $location_source = 'default-coords';
+        if (!$location_source) {
+                    $location_source = 'default-coords';
+        }
 
         # Make sure location_source has prefix alt_wpt:
-        if ($location_source != 'default-coords' && strncmp($location_source, 'alt_wpt:', 8) != 0)
-        {
+        if ($location_source != 'default-coords' && strncmp($location_source, 'alt_wpt:', 8) != 0) {
             throw new InvalidParam('location_source', '\''.$location_source.'\'');
         }
 
         # Make sure we have sufficient authorization
-        if ($location_source == 'alt_wpt:user-coords' && $this->request->token == null)
-        {
+        if ($location_source == 'alt_wpt:user-coords' && $this->request->token == null) {
             throw new BadRequest("Level 3 Authentication is required to access 'alt_wpt:user-coords'.");
         }
 
@@ -787,14 +770,12 @@ 
             $location_source = 'default-coords';
         }
 
-        if ($location_source == 'default-coords')
-        {
+        if ($location_source == 'default-coords') {
             $this->longitude_expr = 'caches.longitude';
             $this->latitude_expr = 'caches.latitude';
         } else {
             $extra_joins = null;
-            if (Settings::get('OC_BRANCH') == 'oc.pl')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.pl') {
                 $this->longitude_expr = 'ifnull(cache_mod_cords.longitude, caches.longitude)';
                 $this->latitude_expr = 'ifnull(cache_mod_cords.latitude, caches.latitude)';
                 $extra_joins = array("
@@ -818,8 +799,7 @@ 
             $location_extra_sql = array(
                 'extra_joins' => $extra_joins
             );
-            if ($this->search_params === NULL)
-            {
+            if ($this->search_params === NULL) {
                 $this->search_params = $location_extra_sql;
             } else {
                 $this->search_params = array_merge_recursive($this->search_params, $location_extra_sql);

htdocs/okapi/services/caches/search/save.php

Braces +28 added lines, -24 removed lines

@@ -39,8 +39,9 @@ 
             order by id desc
             limit 1
         ");
-        if ($tmp === null)
-            return array(null, null, null);
+        if ($tmp === null) {
+                    return array(null, null, null);
+        }
         return array($tmp['id'], $tmp['date_created'], $tmp['expires']);
     }
 
@@ -49,17 +50,25 @@ 
         # "Cache control" parameters.
 
         $tmp = $request->get_parameter('min_store');
-        if ($tmp === null) $tmp = "300";
+        if ($tmp === null) {
+            $tmp = "300";
+        }
         $min_store = intval($tmp);
-        if (("$min_store" !== $tmp) ||($min_store < 0) || ($min_store > 64800))
-            throw new InvalidParam('min_store', "Has to be in the 0..64800 range.");
+        if (("$min_store" !== $tmp) ||($min_store < 0) || ($min_store > 64800)) {
+                    throw new InvalidParam('min_store', "Has to be in the 0..64800 range.");
+        }
 
         $tmp = $request->get_parameter('ref_max_age');
-        if ($tmp === null) $tmp = "300";
-        if ($tmp == "nolimit") $tmp = "9999999";
+        if ($tmp === null) {
+            $tmp = "300";
+        }
+        if ($tmp == "nolimit") {
+            $tmp = "9999999";
+        }
         $ref_max_age = intval($tmp);
-        if (("$ref_max_age" !== $tmp) || ($ref_max_age < 300))
-            throw new InvalidParam('ref_max_age', "Has to be >=300.");
+        if (("$ref_max_age" !== $tmp) || ($ref_max_age < 300)) {
+                    throw new InvalidParam('ref_max_age', "Has to be >=300.");
+        }
 
         # Search params.
 
@@ -75,10 +84,11 @@ 
             $search_params['where_conds']
         );
 
-        if (isset($search_params['extra_joins']) && is_array($search_params['extra_joins']))
-            $joins = $search_params['extra_joins'];
-        else
-            $joins = array();
+        if (isset($search_params['extra_joins']) && is_array($search_params['extra_joins'])) {
+                    $joins = $search_params['extra_joins'];
+        } else {
+                    $joins = array();
+        }
 
         unset($search_params);
 
@@ -103,8 +113,7 @@ 
         # given freshness criteria.
 
         list($set_id, $date_created, $expires) = self::find_param_set($params_hash, $ref_max_age);
-        if ($set_id === null)
-        {
+        if ($set_id === null) {
             # To avoid generating the same results by multiple threads at once
             # (the "tile" method uses the "save" method, so the problem is
             # quite real!), we will acquire a write-lock here.
@@ -112,13 +121,11 @@ 
             $lock = OkapiLock::get("search-results-writer");
             $lock->acquire();
 
-            try
-            {
+            try {
                 # Make sure we were the first to acquire the lock.
 
                 list($set_id, $date_created, $expires) = self::find_param_set($params_hash, $ref_max_age);
-                if ($set_id === null)
-                {
+                if ($set_id === null) {
                     # We are in the first thread which have acquired the lock.
                     # We will proceed with result-set creation. Other threads
                     # will be waiting until we finish.
@@ -161,9 +168,7 @@ 
                     # generated the result set. We don't need to do anything.
                 }
                 $lock->release();
-            }
-            catch (Exception $e)
-            {
+            } catch (Exception $e) {
                 # SQL error? Make sure the lock is released and rethrow.
 
                 $lock->release();
@@ -174,8 +179,7 @@ 
         # If we got an old set, we may need to expand its lifetime in order to
         # meet user's "min_store" criterium.
 
-        if (time() + $min_store > $expires)
-        {
+        if (time() + $min_store > $expires) {
             Db::execute("
                 update okapi_search_sets
                 set expires = date_add(now(), interval '".Db::escape_string($min_store + 60)."' second)

htdocs/okapi/services/caches/search/nearest.php

Braces +25 added lines, -22 removed lines

@@ -30,22 +30,26 @@ 
         # It's much easier to grasp their meaning this way.
 
         $tmp = $request->get_parameter('center');
-        if (!$tmp)
-            throw new ParamMissing('center');
+        if (!$tmp) {
+                    throw new ParamMissing('center');
+        }
         $parts = explode('|', $tmp);
-        if (count($parts) != 2)
-            throw new InvalidParam('center', "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('center', "'$part_ref' is not a valid float number.");
+        if (count($parts) != 2) {
+                    throw new InvalidParam('center', "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('center', "'$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('center', "Latitudes have to be within -90..90 range.");
-        if ($center_lon > 180 || $center_lon < -180)
-            throw new InvalidParam('center', "Longitudes have to be within -180..180 range.");
+        if ($center_lat > 90 || $center_lat < -90) {
+                    throw new InvalidParam('center', "Latitudes have to be within -90..90 range.");
+        }
+        if ($center_lon > 180 || $center_lon < -180) {
+                    throw new InvalidParam('center', "Longitudes have to be within -180..180 range.");
+        }
 
         #
         # In the method description, we promised to return caches ordered by the *rough*
@@ -66,13 +70,14 @@ 
 
         $where_conds = array();
         $radius = null;
-        if ($tmp = $request->get_parameter('radius'))
-        {
-            if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $tmp))
-                throw new InvalidParam('radius', "'$tmp' is not a valid float number.");
+        if ($tmp = $request->get_parameter('radius')) {
+            if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $tmp)) {
+                            throw new InvalidParam('radius', "'$tmp' is not a valid float number.");
+            }
             $radius = floatval($tmp);  # is given in kilometers
-            if ($radius <= 0)
-                throw new InvalidParam('radius', "Has to be a positive number.");
+            if ($radius <= 0) {
+                            throw new InvalidParam('radius', "Has to be a positive number.");
+            }
 
             # Apply a latitude-range prefilter if it looks promising.
             # See https://github.com/opencaching/okapi/issues/363 for more info.
@@ -80,8 +85,7 @@ 
             $optimization_radius = 100;  # in kilometers, optimized for Opencaching.de
             $km2degrees_upper_estimate_factor = 0.01;
 
-            if ($radius <= $optimization_radius)
-            {
+            if ($radius <= $optimization_radius) {
                 $radius_degrees = $radius * $km2degrees_upper_estimate_factor;
                 $where_conds[] = "
                     caches.latitude >= '".Db::escape_string($center_lat - $radius_degrees)."'
@@ -100,8 +104,7 @@ 
         $search_assistant->set_search_params($search_params);
 
         $result = $search_assistant->get_common_search_result();
-        if ($radius == null)
-        {
+        if ($radius == null) {
             # 'more' is meaningless in this case, we'll remove it.
             unset($result['more']);
         }

htdocs/okapi/services/caches/search/by_urls.php

Braces +80 added lines, -67 removed lines

@@ -30,48 +30,56 @@ 
 
         static $host = null;
         static $length = null;
-        if ($host == null)
-        {
+        if ($host == null) {
             $host = parse_url(Settings::get('SITE_URL'), PHP_URL_HOST);
-            if (strpos($host, "www.") === 0)
-                $host = substr($host, 4);
+            if (strpos($host, "www.") === 0) {
+                            $host = substr($host, 4);
+            }
             $length = strlen($host);
         }
 
         # Parse the URL
 
         $uri = parse_url($url);
-        if ($uri == false)
-            return null;
-        if ((!isset($uri['scheme'])) || (!in_array($uri['scheme'], array('http', 'https'))))
-            return null;
-        if ((!isset($uri['host'])) || (substr($uri['host'], -$length) != $host))
-            return null;
-        if (!isset($uri['path']))
-            return null;
-        if (preg_match("#^/(O[A-Z][A-Z0-9]{4,5})$#", $uri['path'], $matches))
-        {
+        if ($uri == false) {
+                    return null;
+        }
+        if ((!isset($uri['scheme'])) || (!in_array($uri['scheme'], array('http', 'https')))) {
+                    return null;
+        }
+        if ((!isset($uri['host'])) || (substr($uri['host'], -$length) != $host)) {
+                    return null;
+        }
+        if (!isset($uri['path'])) {
+                    return null;
+        }
+        if (preg_match("#^/(O[A-Z][A-Z0-9]{4,5})$#", $uri['path'], $matches)) {
             # Some servers allow "http://oc.xx/<cache_code>" shortcut.
             return array('cache_code', $matches[1]);
         }
         $parts = array();
-        if (isset($uri['query']))
-            $parts = array_merge($parts, explode('&', $uri['query']));
-        if (isset($uri['fragment']))
-            $parts = array_merge($parts, explode('&', $uri['fragment']));
-        foreach ($parts as $param)
-        {
+        if (isset($uri['query'])) {
+                    $parts = array_merge($parts, explode('&', $uri['query']));
+        }
+        if (isset($uri['fragment'])) {
+                    $parts = array_merge($parts, explode('&', $uri['fragment']));
+        }
+        foreach ($parts as $param) {
             $item = explode('=', $param, 2);
-            if (count($item) != 2)
-                continue;
+            if (count($item) != 2) {
+                            continue;
+            }
             $key = $item[0];
             $value = $item[1];
-            if ($key == 'wp')
-                return array('cache_code', $value);
-            if ($key == 'cacheid')
-                return array('internal_id', $value);
-            if ($key == 'uuid')
-                return array('uuid', $value);
+            if ($key == 'wp') {
+                            return array('cache_code', $value);
+            }
+            if ($key == 'cacheid') {
+                            return array('internal_id', $value);
+            }
+            if ($key == 'uuid') {
+                            return array('uuid', $value);
+            }
         }
         return null;
     }
@@ -81,13 +89,17 @@ 
         # Retrieve the list of URLs to check.
 
         $tmp = $request->get_parameter('urls');
-        if (!$tmp)
-            throw new ParamMissing('urls');
+        if (!$tmp) {
+                    throw new ParamMissing('urls');
+        }
         $urls = explode('|', $tmp);
         $as_dict = $request->get_parameter('as_dict');
-        if (!$as_dict) $as_dict = 'false';
-        if (!in_array($as_dict, array('true', 'false')))
-            throw new InvalidParam('as_dict');
+        if (!$as_dict) {
+            $as_dict = 'false';
+        }
+        if (!in_array($as_dict, array('true', 'false'))) {
+                    throw new InvalidParam('as_dict');
+        }
         $as_dict = ($as_dict == 'true');
 
         # Generate the lists of keys.
@@ -98,25 +110,25 @@ 
             'internal_id' => array(),
             'uuid' => array()
         );
-        foreach ($urls as &$url_ref)
-        {
+        foreach ($urls as &$url_ref) {
             $key = self::get_cache_key($url_ref);
-            if ($key != null)
-                $urls_with[$key[0]][$url_ref] = $key[1];
-            else
-                $results[$url_ref] = null;
+            if ($key != null) {
+                            $urls_with[$key[0]][$url_ref] = $key[1];
+            } else {
+                            $results[$url_ref] = null;
+            }
         }
 
         # Include 'cache_code' references.
 
-        foreach ($urls_with['cache_code'] as $url => $cache_code)
-            $results[$url] = $cache_code;
+        foreach ($urls_with['cache_code'] as $url => $cache_code) {
+                    $results[$url] = $cache_code;
+        }
 
         # Include 'internal_id' references.
 
         $internal_ids = array_values($urls_with['internal_id']);
-        if (count($internal_ids) > 0)
-        {
+        if (count($internal_ids) > 0) {
             $rs = Db::query("
                 select cache_id, wp_oc
                 from caches
@@ -125,22 +137,22 @@ 
                     and status in (1,2,3)
             ");
             $dict = array();
-            while ($row = Db::fetch_assoc($rs))
-                $dict[$row['cache_id']] = $row['wp_oc'];
-            foreach ($urls_with['internal_id'] as $url => $internal_id)
-            {
-                if (isset($dict[$internal_id]))
-                    $results[$url] = $dict[$internal_id];
-                else
-                    $results[$url] = null;
+            while ($row = Db::fetch_assoc($rs)) {
+                            $dict[$row['cache_id']] = $row['wp_oc'];
+            }
+            foreach ($urls_with['internal_id'] as $url => $internal_id) {
+                if (isset($dict[$internal_id])) {
+                                    $results[$url] = $dict[$internal_id];
+                } else {
+                                    $results[$url] = null;
+                }
             }
         }
 
         # Include 'uuid' references.
 
         $uuids = array_values($urls_with['uuid']);
-        if (count($uuids) > 0)
-        {
+        if (count($uuids) > 0) {
             $rs = Db::query("
                 select uuid, wp_oc
                 from caches
@@ -149,27 +161,28 @@ 
                     and status in (1,2,3)
             ");
             $dict = array();
-            while ($row = Db::fetch_assoc($rs))
-                $dict[$row['uuid']] = $row['wp_oc'];
-            foreach ($urls_with['uuid'] as $url => $uuid)
-            {
-                if (isset($dict[$uuid]))
-                    $results[$url] = $dict[$uuid];
-                else
-                    $results[$url] = null;
+            while ($row = Db::fetch_assoc($rs)) {
+                            $dict[$row['uuid']] = $row['wp_oc'];
+            }
+            foreach ($urls_with['uuid'] as $url => $uuid) {
+                if (isset($dict[$uuid])) {
+                                    $results[$url] = $dict[$uuid];
+                } else {
+                                    $results[$url] = null;
+                }
             }
         }
 
         # Format the results according to the 'as_dict' parameter.
 
-        if ($as_dict)
-            return Okapi::formatted_response($request, $results);
-        else
-        {
+        if ($as_dict) {
+                    return Okapi::formatted_response($request, $results);
+        } else {
             $cache_codes = array();
-            foreach ($results as $url => $cache_code)
-                if ($cache_code != null)
+            foreach ($results as $url => $cache_code) {
+                            if ($cache_code != null)
                     $cache_codes[$cache_code] = true;
+            }
             $flattened = array('results' => array_keys($cache_codes));
             return Okapi::formatted_response($request, $flattened);
         }

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

Braces +102 added lines, -107 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.
 
@@ -109,37 +114,36 @@ 
         # Check locmem cache.
 
         $key = "$name/$opacity/$brightness/$contrast/$r/$g/$b";
-        if (!isset($locmem_cache[$key]))
-        {
+        if (!isset($locmem_cache[$key])) {
             # Miss. Check default cache.  WRTODO: upgrade to normal Cache?
 
-            try
-            {
+            try {
                 $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.
 
                 $locmem_cache[$key] = imagecreatefrompng($GLOBALS['rootpath']."okapi/static/tilemap/$name.png");
 
                 # 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 (($r != 0) || ($g != 0) || ($b != 0))
-                {
+                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);
                     imagefilter($locmem_cache[$key], IMG_FILTER_COLORIZE, $r, $g, $b);
                 }
@@ -165,10 +169,8 @@ 
         $w = imagesx($im);
         $h = imagesy($im);
 
-        for($x = 0; $x < $w; $x++)
-        {
-            for($y = 0; $y < $h; $y++)
-            {
+        for($x = 0; $x < $w; $x++) {
+            for($y = 0; $y < $h; $y++) {
                 $color = imagecolorat($im, $x, $y);
                 $new_color = ((max(0, floor(127 - ((127 - (($color >> 24) & 0x7f)) * $ratio))) & 0x7f) << 24) | ($color & 0x80ffffff);
                 imagesetpixel($im, $x, $y, $new_color);
@@ -182,17 +184,17 @@ 
     {
         $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).
 
-        if ($capt)
-        {
+        if ($capt) {
             $caption = $this->get_caption($cache_struct[0], $cache_struct[7]);
             imagecopy($this->im, $caption, $cache_struct[1] - 32, $cache_struct[2] + 6, 0, 0, 64, 26);
         }
@@ -241,8 +243,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).
@@ -253,8 +256,7 @@ 
 
         # If the cache is unavailable, mark it with X.
 
-        if (($status != 1) && ($count == 1))
-        {
+        if (($status != 1) && ($count == 1)) {
             $icon = self::get_image(($status == 2) ? "status_unavailable"
                 : "status_archived", $a);
             imagecopy($this->im, $icon, $px - 1, $py - $center_y - 4, 0, 0, 16, 16);
@@ -262,10 +264,8 @@ 
 
         # Put the rating smile. :)
 
-        if ($status == 1)
-        {
-            if ($rating >= 4.2)
-            {
+        if ($status == 1) {
+            if ($rating >= 4.2) {
                 if ($flags & TileTree::$FLAG_STAR) {
                     $icon = self::get_image("rating_grin", $a, $br, $c, $r, $g, $b);
                     imagecopy($this->im, $icon, $px - 7 - 6, $py - $center_y - 8, 0, 0, 16, 16);
@@ -285,8 +285,7 @@ 
 
         # Mark found caches with V.
 
-        if ($found)
-        {
+        if ($found) {
             $icon = self::get_image("found", 0.7*$a, $br, $c, $r, $g, $b);
             imagecopy($this->im, $icon, $px - 2, $py - $center_y - 3, 0, 0, 16, 16);
         }
@@ -304,8 +303,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 +324,9 @@ 
                 continue;
             }
         }
-        if (mb_strlen($line) > 0)
-            $lines[] = trim($line);
+        if (mb_strlen($line) > 0) {
+                    $lines[] = trim($line);
+        }
         return implode("\n", $lines);
     }
 
@@ -338,8 +339,7 @@ 
 
         $cache_key = "tilecaption/".self::$VERSION."/".$cache_id."/".$name_crc;
         $gd2 = self::$USE_CAPTIONS_CACHE ? Cache::get($cache_key) : null;
-        if ($gd2 === null)
-        {
+        if ($gd2 === null) {
             # We'll work with 16x bigger image to get smoother interpolation.
 
             $im = imagecreatetruecolor(64*4, 26*4);
@@ -367,19 +367,16 @@ 
 
             $y = 0;
             $positions = array();
-            foreach ($lines as $line)
-            {
+            foreach ($lines as $line) {
                 $bbox = imagettfbbox($size, 0, $font, $line);
                 $width = $bbox[2]-$bbox[0];
                 $x = 128 - ($width >> 1);
                 $positions[] = array($x, $y);
                 $y += 36;
             }
-            $drawer = function($x, $y, $color) use (&$lines, &$positions, &$im, &$size, &$font)
-            {
+            $drawer = function($x, $y, $color) use (&$lines, &$positions, &$im, &$size, &$font) {
                 $len = count($lines);
-                for ($i=0; $i<$len; $i++)
-                {
+                for ($i=0; $i<$len; $i++) {
                     $line = $lines[$i];
                     list($offset_x, $offset_y) = $positions[$i];
                     imagettftext($im, $size, 0, $offset_x + $x, $offset_y + $y, $color, $font, $line);
@@ -389,9 +386,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 +426,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).
 
@@ -441,20 +442,19 @@ 
         $markercenter_x = 7;
         $markercenter_y = 8;
 
-        if ($count > 1)
-        {
+        if ($count > 1) {
             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.
 
-        if (($status != 1) && ($count == 1))
-        {
+        if (($status != 1) && ($count == 1)) {
             $icon = self::get_image(($status == 2) ? "status_unavailable"
                 : "status_archived");
             imagecopy($this->im, $icon, $px - ($center_x - $markercenter_x) - 6,
@@ -463,10 +463,8 @@ 
 
         # Put small versions of rating icons.
 
-        if ($status == 1)
-        {
-            if ($rating >= 4.2)
-            {
+        if ($status == 1) {
+            if ($rating >= 4.2) {
                 if ($flags & TileTree::$FLAG_STAR) {
                     $icon = self::get_image("rating_grin_small", max(0.6, $a));
                     imagecopy($this->im, $icon, $px - 5, $py - $center_y - 1, 0, 0, 6, 6);
@@ -479,23 +477,18 @@ 
             }
         }
 
-        if ($own)
-        {
+        if ($own) {
             # Mark own caches with additional overlay.
 
             $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.
 
             $overlay = self::get_image("medium_overlay_new");
@@ -513,8 +506,7 @@ 
             case 4: return 'virtual';
             case 1: return 'unknown';
         }
-        if ($extended_set)
-        {
+        if ($extended_set) {
             switch ($type) {
                 case 10: return 'own';
                 case 8: return 'moving';
@@ -542,20 +534,16 @@ 
 
         # Put the marker. If cache covers more caches, then put two markers instead of one.
 
-        if ($count > 1)
-        {
+        if ($count > 1) {
             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);
         }
 
         # If the cache is unavailable, mark it with X.
 
-        if (($status != 1) && ($count == 1))
-        {
+        if (($status != 1) && ($count == 1)) {
             $icon = self::get_image(($status == 2) ? "status_unavailable"
                 : "status_archived");
             imagecopy($this->im, $icon, $px - ($center_x - $markercenter_x) - 6,
@@ -577,25 +565,30 @@ 
         # 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)
-        {
+        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
+        for ($mx=1; $mx<11; $mx++) {
+            for ($my=1; $my<11; $my++) {
+                if ($matrix[$mx][$my] > 0) {
+                    # cache_id
                 {
                     # Check all adjacent squares.
 
@@ -610,12 +603,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/tiletree.inc.php

Braces +42 added lines, -27 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,11 +125,11 @@ 
         # 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)
-        {
+        if ($zoom === 0) {
             # When computing zoom zero, we don't have a parent to speed up
             # the computation. We need to use the caches table. Note, that
             # zoom level 0 contains *entire world*, so we don't have to use
@@ -150,8 +154,7 @@ 
             $internal_request->skip_limits = true;
             $caches = OkapiServiceRunner::call("services/caches/geocaches", $internal_request);
 
-            foreach ($caches as $cache)
-            {
+            foreach ($caches as $cache) {
                 $row = self::generate_short_row($cache);
                 if (!$row) {
                     /* Some caches cannot be included, e.g. the ones near the poles. */
@@ -174,9 +177,7 @@ 
                 ");
             }
             $status = 2;
-        }
-        else
-        {
+        } else {
             # We will use the parent tile to compute the contents of this tile.
 
             $parent_zoom = $zoom - 1;
@@ -184,19 +185,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 +214,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 +267,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 +306,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/replicate_listener.inc.php

Braces +35 added lines, -37 removed lines

@@ -29,14 +29,13 @@ 
         # changelog. The format of $changelog is described in the replicate module
         # (NOT the entire response, just the "changelog" key).
 
-        foreach ($changelog as $c)
-        {
-            if ($c['object_type'] == 'geocache')
-            {
-                if ($c['change_type'] == 'replace')
-                    self::handle_geocache_replace($c);
-                else
-                    self::handle_geocache_delete($c);
+        foreach ($changelog as $c) {
+            if ($c['object_type'] == 'geocache') {
+                if ($c['change_type'] == 'replace') {
+                                    self::handle_geocache_replace($c);
+                } else {
+                                    self::handle_geocache_delete($c);
+                }
             }
         }
     }
@@ -90,25 +89,21 @@ 
         # Compute the new row for okapi_tile_caches. Compare with the old one.
 
         $theirs = TileTree::generate_short_row($cache);
-        if (!$ours)
-        {
+        if (!$ours) {
             # 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
             # many updates which do not influence our cache.
@@ -147,20 +142,21 @@ 
         $z21y = $row[2];
         $ex = $z21x >> 8;  # initially, z21x / <tile width>
         $ey = $z21y >> 8;  # initially, z21y / <tile height>
-        for ($zoom = 21; $zoom >= 0; $zoom--, $ex >>= 1, $ey >>= 1)
-        {
+        for ($zoom = 21; $zoom >= 0; $zoom--, $ex >>= 1, $ey >>= 1) {
             # ($ex, $ey) points to the "exact match" tile. We need to determine
             # tile-range to check for "just outside the border" tiles. We will
             # 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)
-            {
+            foreach ($tiles_in_this_region as $coords) {
                 list($x, $y) = $coords;
 
                 $scale = 8 + 21 - $zoom;
@@ -171,14 +167,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.
 
@@ -191,8 +191,7 @@ 
         # only the cached ones.
 
         $alternatives_escaped = array();
-        foreach ($tiles_to_update as $coords)
-        {
+        foreach ($tiles_to_update as $coords) {
             list($z, $x, $y) = $coords;
             $alternatives_escaped[] = "(
                 z = '".Db::escape_string($z)."'
@@ -200,8 +199,7 @@ 
                 and y = '".Db::escape_string($y)."'
             )";
         }
-        if (count($alternatives_escaped) > 0)
-        {
+        if (count($alternatives_escaped) > 0) {
             Db::execute("
                 replace into okapi_tile_caches (
                     z, x, y, cache_id, z21x, z21y, status, type, rating, flags, name_crc

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

Braces +41 added lines, -34 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
@@ -112,10 +117,10 @@ 
 
         $rs = TileTree::query_fast($zoom, $x, $y, $set_id);
         $rows = array();
-        if ($rs !== null)
-        {
-            while ($row = Db::fetch_row($rs))
-                $rows[] = $row;
+        if ($rs !== null) {
+            while ($row = Db::fetch_row($rs)) {
+                            $rows[] = $row;
+            }
             unset($row);
         }
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointA", null,
@@ -124,14 +129,12 @@ 
 
         # Add dynamic, user-related flags.
 
-        if (count($rows) > 0)
-        {
+        if (count($rows) > 0) {
             # Load user-related cache ids.
 
             $cache_key = "tileuser/".$request->token->user_id;
             $user = self::$USE_OTHER_CACHE ? Cache::get($cache_key) : null;
-            if ($user === null)
-            {
+            if ($user === null) {
                 $user = array();
 
                 # Ignored caches.
@@ -142,8 +145,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 +160,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,24 +172,28 @@ 
                     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);
             }
 
             # Add extra flags to geocaches.
 
-            foreach ($rows as &$row_ref)
-            {
+            foreach ($rows as &$row_ref) {
                 # Add the "found" flag (to indicate that this cache needs
                 # 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"
             }
         }
 
@@ -207,8 +216,7 @@ 
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointB", null,
             microtime(true) - $checkpointB_started);
         $checkpointC_started = microtime(true);
-        if (self::$USE_ETAGS_CACHE && ($request->etag == $response->etag))
-        {
+        if (self::$USE_ETAGS_CACHE && ($request->etag == $response->etag)) {
             # Hit. Report the content was unmodified.
 
             $response->etag = null;
@@ -223,8 +231,7 @@ 
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointC", null,
             microtime(true) - $checkpointC_started);
         $checkpointD_started = microtime(true);
-        if ($response->body !== null)
-        {
+        if ($response->body !== null) {
             # Hit. We will use the cached version of the image.
 
             return $response;