OpencachingDeutschland / oc-server3

htdocs/okapi/services/caches/formatters/garmin.php

Braces +39 added lines, -23 removed lines

@@ -32,22 +32,32 @@ 
     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');
+        }
 
         # 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!
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref .= "|".Settings::get('SITELANG');
         $images = $request->get_parameter('images');
-        if (!$images) $images = "all";
-        if (!in_array($images, array("none", "all", "spoilers", "nonspoilers")))
-            throw new InvalidParam('images');
+        if (!$images) {
+            $images = "all";
+        }
+        if (!in_array($images, array("none", "all", "spoilers", "nonspoilers"))) {
+                    throw new InvalidParam('images');
+        }
         $format = $request->get_parameter('caches_format');
-        if (!$format) $format = "gpx";
-        if (!in_array($format, array("gpx", "ggz")))
-            throw new InvalidParam('caches_format');
+        if (!$format) {
+            $format = "gpx";
+        }
+        if (!in_array($format, array("gpx", "ggz"))) {
+                    throw new InvalidParam('caches_format');
+        }
 
         $location_source = $request->get_parameter('location_source');
         $location_change_prefix = $request->get_parameter('location_change_prefix');
@@ -97,25 +107,29 @@ 
         $caches = OkapiServiceRunner::call('services/caches/geocaches', new OkapiInternalRequest(
             $request->consumer, $request->token, array('cache_codes' => $cache_codes,
             'langpref' => $langpref, 'fields' => "images")));
-        if (count($caches) > 50)
-            throw new InvalidParam('cache_codes', "The maximum number of caches allowed to be downloaded with this method is 50.");
+        if (count($caches) > 50) {
+                    throw new InvalidParam('cache_codes', "The maximum number of caches allowed to be downloaded with this method is 50.");
+        }
         if ($images != 'none')
         {
             $supported_extensions = array('jpg', 'jpeg', 'gif', 'png', 'bmp');
             foreach ($caches as $cache_code => $dict)
             {
                 $imgs = $dict['images'];
-                if (count($imgs) == 0)
-                    continue;
+                if (count($imgs) == 0) {
+                                    continue;
+                }
                 $dir = "Garmin/GeocachePhotos/".$cache_code[strlen($cache_code) - 1];
                 $dir .= "/".$cache_code[strlen($cache_code) - 2];
                 $dir .= "/".$cache_code;
                 foreach ($imgs as $no => $img)
                 {
-                    if ($images == 'spoilers' && (!$img['is_spoiler']))
-                        continue;
-                    if ($images == 'nonspoilers' && $img['is_spoiler'])
-                        continue;
+                    if ($images == 'spoilers' && (!$img['is_spoiler'])) {
+                                            continue;
+                    }
+                    if ($images == 'nonspoilers' && $img['is_spoiler']) {
+                                            continue;
+                    }
                     $tmp = false;
                     foreach ($supported_extensions as $ext)
                     {
@@ -125,8 +139,10 @@ 
                             continue;
                         }
                     }
-                    if (!$tmp)
-                        continue;  # unsupported file extension
+                    if (!$tmp) {
+                                            continue;
+                    }
+                    # unsupported file extension
 
                     if ($img['is_spoiler']) {
                         $zippath = $dir."/Spoilers/".$img['unique_caption'].".jpg";
@@ -145,8 +161,7 @@ 
                     if (file_exists($syspath))
                     {
                         $response->zip->FileAdd($zippath, $syspath, clsTbsZip::TBSZIP_FILE, false);
-                    }
-                    else
+                    } else
                     {
                         # If file exists, but does not end with ".jpg", we will create
                         # JPEG version of it and store it in the cache.
@@ -167,8 +182,7 @@ 
                                         imagejpeg($image);
                                         $jpeg_contents = ob_get_clean();
                                         imagedestroy($image);
-                                    }
-                                    catch (Exception $e)
+                                    } catch (Exception $e)
                                     {
                                         # GD couldn't parse the file. We will skip it, and cache
                                         # the "false" value as the contents. This way, we won't
@@ -181,8 +195,10 @@ 
                                 }
                             }
                         }
-                        if ($jpeg_contents)  # This can be "null" *or* "false"!
+                        if ($jpeg_contents) {
+                            # This can be "null" *or* "false"!
                             $response->zip->FileAdd($zippath, $jpeg_contents, clsTbsZip::TBSZIP_STRING, false);
+                        }
                     }
                 }
             }

htdocs/okapi/services/caches/geocache.php

Braces +27 added lines, -11 removed lines

@@ -24,19 +24,33 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_code = $request->get_parameter('cache_code');
-        if (!$cache_code) throw new ParamMissing('cache_code');
-        if (strpos($cache_code, "|") !== false) throw new InvalidParam('cache_code');
+        if (!$cache_code) {
+            throw new ParamMissing('cache_code');
+        }
+        if (strpos($cache_code, "|") !== false) {
+            throw new InvalidParam('cache_code');
+        }
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref .= "|".Settings::get('SITELANG');
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "code|name|location|type|status";
+        if (!$fields) {
+            $fields = "code|name|location|type|status";
+        }
         $log_fields = $request->get_parameter('log_fields');
-        if (!$log_fields) $log_fields = "uuid|date|user|type|comment";
+        if (!$log_fields) {
+            $log_fields = "uuid|date|user|type|comment";
+        }
         $lpc = $request->get_parameter('lpc');
-        if (!$lpc) $lpc = 10;
+        if (!$lpc) {
+            $lpc = 10;
+        }
         $attribution_append = $request->get_parameter('attribution_append');
-        if (!$attribution_append) $attribution_append = 'full';
+        if (!$attribution_append) {
+            $attribution_append = 'full';
+        }
         $params = array(
             'cache_codes' => $cache_code,
             'langpref' => $langpref,
@@ -46,11 +60,13 @@ 
             'log_fields' => $log_fields
         );
         $my_location = $request->get_parameter('my_location');
-        if ($my_location)
-            $params['my_location'] = $my_location;
+        if ($my_location) {
+                    $params['my_location'] = $my_location;
+        }
         $user_uuid = $request->get_parameter('user_uuid');
-        if ($user_uuid)
-            $params['user_uuid'] = $user_uuid;
+        if ($user_uuid) {
+                    $params['user_uuid'] = $user_uuid;
+        }
 
         # There's no need to validate the fields/lpc parameters as the 'geocaches'
         # method does this (it will raise a proper exception on invalid values).

htdocs/okapi/services/caches/save_personal_notes.php

Braces +16 added lines, -12 removed lines

@@ -29,8 +29,9 @@ 
         # Get current notes, and verify cache_code
 
         $cache_code = $request->get_parameter('cache_code');
-        if ($cache_code == null)
-            throw new ParamMissing('cache_code');
+        if ($cache_code == null) {
+                    throw new ParamMissing('cache_code');
+        }
         $geocache = OkapiServiceRunner::call(
             'services/caches/geocache',
             new OkapiInternalRequest($request->consumer, $request->token, array(
@@ -47,14 +48,16 @@ 
         # old_value
 
         $old_value = $request->get_parameter('old_value');
-        if ($old_value === null)
-            $old_value = '';
+        if ($old_value === null) {
+                    $old_value = '';
+        }
 
         # new_value (force "no HTML" policy).
 
         $new_value = $request->get_parameter('new_value');
-        if ($new_value === null)
-            throw new ParamMissing('new_value');
+        if ($new_value === null) {
+                    throw new ParamMissing('new_value');
+        }
 
         # Force "no HTML" policy.
 
@@ -98,10 +101,12 @@ 
 
     private static function str_equals($str1, $str2)
     {
-        if ($str1 == null)
-            $str1 = '';
-        if ($str2 == null)
-            $str2 = '';
+        if ($str1 == null) {
+                    $str1 = '';
+        }
+        if ($str2 == null) {
+                    $str2 = '';
+        }
         $str1 = mb_ereg_replace("[ \t\n\r\x0B]+", '', $str1);
         $str2 = mb_ereg_replace("[ \t\n\r\x0B]+", '', $str2);
 
@@ -151,8 +156,7 @@ 
                         and type = 2
                 ");
             }
-        }
-        else  # oc.pl branch
+        } else  # oc.pl branch
         {
             $rs = Db::query("
                 select max(note_id) as id

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

Braces +21 added lines, -14 removed lines

@@ -30,22 +30,27 @@ 
         # 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).".");
+        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 (!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*
@@ -68,11 +73,13 @@ 
         $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 (!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.

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

Braces +24 added lines, -15 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);
 
@@ -161,8 +171,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.
 

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

Braces +72 added lines, -50 removed lines

@@ -33,45 +33,56 @@ 
         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 ($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']));
+        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 +92,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.
@@ -101,16 +116,18 @@ 
         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.
 
@@ -125,14 +142,16 @@ 
                     and status in (1,2,3)
             ");
             $dict = array();
-            while ($row = Db::fetch_assoc($rs))
-                $dict[$row['cache_id']] = $row['wp_oc'];
+            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;
+                if (isset($dict[$internal_id])) {
+                                    $results[$url] = $dict[$internal_id];
+                } else {
+                                    $results[$url] = null;
+                }
             }
         }
 
@@ -149,27 +168,30 @@ 
                     and status in (1,2,3)
             ");
             $dict = array();
-            while ($row = Db::fetch_assoc($rs))
-                $dict[$row['uuid']] = $row['wp_oc'];
+            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;
+                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/search/bbox.php

Braces +22 added lines, -16 removed lines

@@ -30,26 +30,33 @@ 
         # 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).".");
+        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 (!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.
 
@@ -71,8 +78,7 @@ 
                 $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.

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

Braces +134 added lines, -98 removed lines

@@ -107,8 +107,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).
@@ -146,16 +145,16 @@ 
                 {
                     $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";
+            }
         }
 
         #
@@ -177,8 +176,7 @@ 
                 {
                     $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,15 +189,16 @@ 
         #
 
         $tmp = $this->request->get_parameter('status');
-        if ($tmp == null) $tmp = "Available";
+        if ($tmp == null) {
+            $tmp = "Available";
+        }
         $codes = array();
         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.");
             }
@@ -222,14 +221,14 @@ 
             {
                 $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))."')";
         }
 
@@ -241,8 +240,9 @@ 
         {
             if ($tmp = $this->request->get_parameter($param_name))
             {
-                if (!preg_match("/^[1-5]-[1-5](\|X)?$/", $tmp))
-                    throw new InvalidParam($param_name, "'$tmp'");
+                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)
                 {
@@ -251,13 +251,15 @@ 
                 } else {
                     $allow_null = false;
                 }
-                if ($min > $max)
-                    throw new InvalidParam($param_name, "'$tmp'");
+                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 +267,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 {
@@ -299,8 +302,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.
                         }
@@ -318,17 +320,20 @@ 
             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)."'";
         }
 
@@ -338,8 +343,9 @@ 
 
         if ($tmp = $this->request->get_parameter('min_founds'))
         {
-            if (!is_numeric($tmp))
-                throw new InvalidParam('min_founds', "'$tmp'");
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('min_founds', "'$tmp'");
+            }
             $where_conds[] = "$X_FOUNDS >= '".Db::escape_string($tmp)."'";
         }
 
@@ -350,8 +356,9 @@ 
 
         if (!is_null($tmp = $this->request->get_parameter('max_founds')))
         {
-            if (!is_numeric($tmp))
-                throw new InvalidParam('max_founds', "'$tmp'");
+            if (!is_numeric($tmp)) {
+                            throw new InvalidParam('max_founds', "'$tmp'");
+            }
             $where_conds[] = "$X_FOUNDS <= '".Db::escape_string($tmp)."'";
         }
 
@@ -362,10 +369,11 @@ 
         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.");
+            }
         }
 
         #
@@ -374,10 +382,12 @@ 
 
         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 ($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));
@@ -426,10 +436,12 @@ 
 
         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 ($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("
@@ -457,30 +469,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 ($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 ($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
@@ -497,12 +514,15 @@ 
 
         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 ($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)."'";
+            }
         }
 
         #
@@ -514,8 +534,9 @@ 
             # 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)."'";
         }
@@ -526,8 +547,9 @@ 
 
         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 (!in_array($tmp, array('true', 'false'), 1)) {
+                            throw new InvalidParam('with_trackables_only', "'$tmp'");
+            }
             if ($tmp == 'true')
             {
                 $where_conds[] = "
@@ -545,8 +567,9 @@ 
 
         if ($tmp = $this->request->get_parameter('ftf_hunter'))
         {
-            if (!in_array($tmp, array('true', 'false'), 1))
-                throw new InvalidParam('ftf_hunter', "'$tmp'");
+            if (!in_array($tmp, array('true', 'false'), 1)) {
+                            throw new InvalidParam('ftf_hunter', "'$tmp'");
+            }
             if ($tmp == 'true')
             {
                 $where_conds[] = "$X_FOUNDS = 0";
@@ -603,8 +626,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 +639,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
@@ -660,9 +693,10 @@ 
                 {
                     $dir = 'desc';
                     $field = substr($field, 1);
+                } elseif ($field[0] == '+') {
+                                    $field = substr($field, 1);
                 }
-                elseif ($field[0] == '+')
-                    $field = substr($field, 1); # ignore leading "+"
+                # ignore leading "+"
                 switch ($field)
                 {
                     case 'code': $cl = "caches.wp_oc"; break;
@@ -682,8 +716,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);
 
@@ -767,8 +802,9 @@ 
     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)

htdocs/okapi/services/caches/shortcuts/search_and_retrieve.php

Braces +54 added lines, -41 removed lines

@@ -24,40 +24,52 @@ 
     {
         # Check search method
         $search_method = $request->get_parameter('search_method');
-        if (!$search_method)
-            throw new ParamMissing('search_method');
-        if (strpos($search_method, "services/caches/search/") !== 0)
-            throw new InvalidParam('search_method', "Should begin with 'services/caches/search/'.");
-        if (!OkapiServiceRunner::exists($search_method))
-            throw new InvalidParam('search_method', "Method does not exist: '$search_method'");
+        if (!$search_method) {
+                    throw new ParamMissing('search_method');
+        }
+        if (strpos($search_method, "services/caches/search/") !== 0) {
+                    throw new InvalidParam('search_method', "Should begin with 'services/caches/search/'.");
+        }
+        if (!OkapiServiceRunner::exists($search_method)) {
+                    throw new InvalidParam('search_method', "Method does not exist: '$search_method'");
+        }
         $search_params = $request->get_parameter('search_params');
-        if (!$search_params)
-            throw new ParamMissing('search_params');
+        if (!$search_params) {
+                    throw new ParamMissing('search_params');
+        }
         $search_params = json_decode($search_params, true);
-        if (!is_array($search_params))
-            throw new InvalidParam('search_params', "Should be a JSON-encoded dictionary");
+        if (!is_array($search_params)) {
+                    throw new InvalidParam('search_params', "Should be a JSON-encoded dictionary");
+        }
 
         # Check retrieval method
         $retr_method = $request->get_parameter('retr_method');
-        if (!$retr_method)
-            throw new ParamMissing('retr_method');
-        if (!OkapiServiceRunner::exists($retr_method))
-            throw new InvalidParam('retr_method', "Method does not exist: '$retr_method'");
+        if (!$retr_method) {
+                    throw new ParamMissing('retr_method');
+        }
+        if (!OkapiServiceRunner::exists($retr_method)) {
+                    throw new InvalidParam('retr_method', "Method does not exist: '$retr_method'");
+        }
         $retr_params = $request->get_parameter('retr_params');
-        if (!$retr_params)
-            throw new ParamMissing('retr_params');
+        if (!$retr_params) {
+                    throw new ParamMissing('retr_params');
+        }
         $retr_params = json_decode($retr_params, true);
-        if (!is_array($retr_params))
-            throw new InvalidParam('retr_params', "Should be a JSON-encoded dictionary");
+        if (!is_array($retr_params)) {
+                    throw new InvalidParam('retr_params', "Should be a JSON-encoded dictionary");
+        }
 
         self::map_values_to_strings($search_params);
         self::map_values_to_strings($retr_params);
 
         # Wrapped?
         $wrap = $request->get_parameter('wrap');
-        if ($wrap == null) throw new ParamMissing('wrap');
-        if (!in_array($wrap, array('true', 'false')))
-            throw new InvalidParam('wrap');
+        if ($wrap == null) {
+            throw new ParamMissing('wrap');
+        }
+        if (!in_array($wrap, array('true', 'false'))) {
+                    throw new InvalidParam('wrap');
+        }
         $wrap = ($wrap == 'true');
 
         # Run search method
@@ -65,8 +77,7 @@ 
         {
             $search_result = OkapiServiceRunner::call($search_method, new OkapiInternalRequest(
                 $request->consumer, $request->token, $search_params));
-        }
-        catch (BadRequest $e)
+        } catch (BadRequest $e)
         {
             throw new InvalidParam('search_params', "Search method responded with the ".
                 "following error message: ".$e->getMessage());
@@ -78,8 +89,7 @@ 
             $retr_result = OkapiServiceRunner::call($retr_method, new OkapiInternalRequest(
                 $request->consumer, $request->token, array_merge($retr_params,
                 array('cache_codes' => implode("|", $search_result['results'])))));
-        }
-        catch (BadRequest $e)
+        } catch (BadRequest $e)
         {
             throw new InvalidParam('retr_params', "Retrieval method responded with the ".
                 "following error message: ".$e->getMessage());
@@ -89,21 +99,23 @@ 
         {
             # $retr_result might be a PHP object, but also might be a binary response
             # (e.g. a GPX file).
-            if ($retr_result instanceof OkapiHttpResponse)
-                $result = array('results' => $retr_result->get_body());
-            else
-                $result = array('results' => $retr_result);
-            foreach ($search_result as $key => &$value_ref)
-                if ($key != 'results')
+            if ($retr_result instanceof OkapiHttpResponse) {
+                            $result = array('results' => $retr_result->get_body());
+            } else {
+                            $result = array('results' => $retr_result);
+            }
+            foreach ($search_result as $key => &$value_ref) {
+                            if ($key != 'results')
                     $result[$key] = $value_ref;
+            }
             return Okapi::formatted_response($request, $result);
-        }
-        else
+        } else
         {
-            if ($retr_result instanceof OkapiHttpResponse)
-                return $retr_result;
-            else
-                return Okapi::formatted_response($request, $retr_result);
+            if ($retr_result instanceof OkapiHttpResponse) {
+                            return $retr_result;
+            } else {
+                            return Okapi::formatted_response($request, $retr_result);
+            }
         }
     }
 
@@ -112,10 +124,11 @@ 
         foreach (array_keys($dict) as $key)
         {
             $val = $dict[$key];
-            if (is_numeric($val) || is_string($val))
-                $dict[$key] = (string)$val;
-            else
-                throw new BadRequest("Invalid value format for key: ".$key);
+            if (is_numeric($val) || is_string($val)) {
+                            $dict[$key] = (string)$val;
+            } else {
+                            throw new BadRequest("Invalid value format for key: ".$key);
+            }
         }
     }
 }