OpencachingDeutschland / oc-server3

htdocs/okapi/services/caches/formatters/gpxfile.tpl.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
 http://www.gsak.net/xmlv1/5 http://www.gsak.net/xmlv1/5/gsak.xsd
 ">
     <name><?= $vars['installation']['site_name'] ?> Geocache Search Results</name>
-    <desc><?= $vars['installation']['site_name'] ?> Geocache Search Results, downloaded via OKAPI - <?= $vars['installation']['okapi_base_url'] . ($vars['alt_wpts'] && $vars['ns_gsak'] ? ' (HasChildren)' : '') ?></desc>
+    <desc><?= $vars['installation']['site_name'] ?> Geocache Search Results, downloaded via OKAPI - <?= $vars['installation']['okapi_base_url'].($vars['alt_wpts'] && $vars['ns_gsak'] ? ' (HasChildren)' : '') ?></desc>
     <author><?= $vars['installation']['site_name'] ?></author>
     <url><?= $vars['installation']['site_url'] ?></url>
     <urlname><?= $vars['installation']['site_name'] ?></urlname>
@@ -140,7 +140,7 @@ 
                         <?php if ($vars['protection_areas'] == 'desc:text' && count($c['protection_areas'])) { ?>
                             &lt;p&gt;<?= _("The cache probably is located in the following protection areas:") ?>&lt;/p&gt;
                             &lt;ul&gt;
-                            <?php foreach($c['protection_areas'] as $protection_area) { ?>
+                            <?php foreach ($c['protection_areas'] as $protection_area) { ?>
                                 &lt;li&gt;<?= Okapi::xmlescape($protection_area['type'])." - ".Okapi::xmlescape($protection_area['name']) ?>&lt;/li&gt;
                             <?php } ?>
                             &lt;/ul;&gt;
@@ -157,7 +157,7 @@ 
                                     <groundspeak:date><?= $log['date'] ?></groundspeak:date>
                                     <groundspeak:type><?= $log['type'] ?></groundspeak:type>
                                     <groundspeak:finder id="<?= $vars['user_uuid_to_internal_id'][$log['user']['uuid']] ?>"><?= Okapi::xmlescape($log['user']['username']) ?></groundspeak:finder>
-                                    <groundspeak:text encoded="False"><?= $log['was_recommended'] ? "(*) ": "" ?><?= Okapi::xmlescape($log['comment']) ?></groundspeak:text>
+                                    <groundspeak:text encoded="False"><?= $log['was_recommended'] ? "(*) " : "" ?><?= Okapi::xmlescape($log['comment']) ?></groundspeak:text>
                                 </groundspeak:log>
                             <?php } ?>
                         </groundspeak:logs>
@@ -220,7 +220,7 @@ 
                     <?php } ?>
                 </wpt>
                 <?php
-                    if (isset($wpt_ref['ggz_entry'])){
+                    if (isset($wpt_ref['ggz_entry'])) {
                         $wpt_ref['ggz_entry']['file_len'] = ob_get_length() - $wpt_ref['ggz_entry']['file_pos'];
                     }
                 ?>

Braces +35 added lines, -18 removed lines

@@ -40,14 +40,16 @@ 
             <urlname><?= Okapi::xmlescape($c['name']) ?></urlname>
             <sym><?= ($vars['mark_found'] && $c['is_found']) ? "Geocache Found" : "Geocache" ?></sym>
             <type>Geocache|<?= $vars['cache_GPX_types'][$c['type']] ?></type>
-            <?php if ($vars['ns_ground']) { /* Does user want us to include Groundspeak's <cache> element? */ ?>
+            <?php if ($vars['ns_ground']) {
+/* Does user want us to include Groundspeak's <cache> element? */ ?>
                 <groundspeak:cache archived="<?= ($c['status'] == 'Archived') ? "True" : "False" ?>" available="<?= ($c['status'] == 'Available') ? "True" : "False" ?>" id="<?= $c['internal_id'] ?>" xmlns:groundspeak="http://www.groundspeak.com/cache/1/0/1">
                     <groundspeak:name><?= Okapi::xmlescape(isset($c['name_2']) ? $c['name_2'] : $c['name']) ?></groundspeak:name>
                     <groundspeak:placed_by><?= Okapi::xmlescape($c['owner']['username']) ?></groundspeak:placed_by>
                     <groundspeak:owner id="<?= $vars['user_uuid_to_internal_id'][$c['owner']['uuid']] ?>"><?= Okapi::xmlescape($c['owner']['username']) ?></groundspeak:owner>
                     <groundspeak:type><?= $vars['cache_GPX_types'][$c['type']] ?></groundspeak:type>
                     <groundspeak:container><?= $vars['cache_GPX_sizes'][$c['size2']] ?></groundspeak:container>
-                    <?php if ($vars['gc_attrs'] || $vars['gc_ocde_attrs']) { /* Does user want us to include groundspeak:attributes? */ ?>
+                    <?php if ($vars['gc_attrs'] || $vars['gc_ocde_attrs']) {
+/* Does user want us to include groundspeak:attributes? */ ?>
                         <groundspeak:attributes>
                             <?php
                                 foreach ($c['gc_attrs'] as $gc_id => $gc_attr) {
@@ -71,23 +73,28 @@ 
                         &lt;p&gt;
                             &lt;a href="<?= $c['url'] ?>"&gt;<?= Okapi::xmlescape($c['name']) ?>&lt;/a&gt;
                             <?= _("hidden by") ?> &lt;a href='<?= $c['owner']['profile_url'] ?>'&gt;<?= Okapi::xmlescape($c['owner']['username']) ?>&lt;/a&gt;&lt;br/&gt;
-                            <?php if ($vars['recommendations'] == 'desc:count') { /* Does user want us to include recommendations count? */ ?>
+                            <?php if ($vars['recommendations'] == 'desc:count') {
+/* Does user want us to include recommendations count? */ ?>
                                 <?= sprintf(ngettext("%d recommendation", "%d recommendations", $c['recommendations']), $c['recommendations']) ?>
                                 (<?= sprintf(ngettext("found %d time", "found %d times", $c['founds']), $c['founds']) ?>).
                             <?php } ?>
-                            <?php if ($vars['trackables'] == 'desc:count') { /* Does user want us to include trackables count? */ ?>
+                            <?php if ($vars['trackables'] == 'desc:count') {
+/* Does user want us to include trackables count? */ ?>
                                 <?= sprintf(ngettext("%d trackable", "%d trackables", $c['trackables_count']), $c['trackables_count']) ?>.
                             <?php } ?>
                         &lt;/p&gt;
-                        <?php if ((in_array('desc:text', $vars['my_notes'])) && ($c['my_notes'] != null)) { /* Does user want us to include personal notes? */ ?>
+                        <?php if ((in_array('desc:text', $vars['my_notes'])) && ($c['my_notes'] != null)) {
+/* Does user want us to include personal notes? */ ?>
                             &lt;p&gt;&lt;b&gt;<?= _("Personal notes") ?>:&lt;/b&gt;&lt;br&gt;<?= Okapi::xmlescape(nl2br($c['my_notes'])) ?>&lt;/p&gt;
                         <?php } ?>
 
-                        <?php if (in_array('desc:text', $vars['attrs']) && count($c['attrnames']) > 0) { /* Does user want us to include attributes? */ ?>
+                        <?php if (in_array('desc:text', $vars['attrs']) && count($c['attrnames']) > 0) {
+/* Does user want us to include attributes? */ ?>
                             &lt;p&gt;<?= _("Attributes") ?>:&lt;/p&gt;
                             &lt;ul&gt;&lt;li&gt;<?= implode("&lt;/li&gt;&lt;li&gt;", $c['attrnames']) ?>&lt;/li&gt;&lt;/ul&gt;
                         <?php } ?>
-                        <?php if ($vars['trackables'] == 'desc:list' && count($c['trackables']) > 0) { /* Does user want us to include trackables list? */ ?>
+                        <?php if ($vars['trackables'] == 'desc:list' && count($c['trackables']) > 0) {
+/* Does user want us to include trackables list? */ ?>
                             &lt;p&gt;<?= _("Trackables") ?>:&lt;/p&gt;
                             &lt;ul&gt;
                             <?php foreach ($c['trackables'] as $t) { ?>
@@ -96,7 +103,8 @@ 
                             &lt;/ul&gt;
                         <?php } ?>
                         <?= Okapi::xmlescape($c['description']) ?>
-                        <?php if ((strpos($vars['images'], "descrefs:") === 0) && count($c['images']) > 0) { /* Does user want us to include <img> references in cache descriptions? */
+                        <?php if ((strpos($vars['images'], "descrefs:") === 0) && count($c['images']) > 0) {
+/* Does user want us to include <img> references in cache descriptions? */
                             if ($vars['images'] == "descrefs:thumblinks") { ?>
                                 &lt;h2&gt;<?= _("Images") ?> (<?= count($c['images']) ?>)&lt;/h2&gt;
                                 &lt;div&gt;
@@ -109,9 +117,12 @@ 
                                 # We will split images into two subcategories: spoilers and nonspoilers.
                                 $spoilers = array();
                                 $nonspoilers = array();
-                                foreach ($c['images'] as $img)
-                                    if ($img['is_spoiler']) $spoilers[] = $img;
-                                    else $nonspoilers[] = $img;
+                                foreach ($c['images'] as $img) {
+                                                                    if ($img['is_spoiler']) $spoilers[] = $img;
+                                }
+                                    else {
+                                        $nonspoilers[] = $img;
+                                    }
                                 ?>
                                 <?php if (count($nonspoilers) > 0) { ?>
                                     &lt;h2&gt;<?= _("Images") ?> (<?= count($nonspoilers) ?>)&lt;/h2&gt;
@@ -129,7 +140,8 @@ 
                                 <?php } ?>
                             <?php } ?>
                         <?php } ?>
-                        <?php if ((strpos($vars['images'], "ox:") === 0) && count($c['images']) > 0) { /* Include image descriptions (for ox:image numbers)? */ ?>
+                        <?php if ((strpos($vars['images'], "ox:") === 0) && count($c['images']) > 0) {
+/* Include image descriptions (for ox:image numbers)? */ ?>
                             &lt;p&gt;<?= _("Image descriptions") ?>:&lt;/p&gt;
                             &lt;ul&gt;
                                 <?php foreach ($c['images'] as $no => $img) { ?>
@@ -147,10 +159,12 @@ 
                         <?php } ?>
                     </groundspeak:long_description>
                     <groundspeak:encoded_hints><?= Okapi::xmlescape($c['hint2']) ?></groundspeak:encoded_hints>
-                    <?php if ((in_array('gc:personal_note', $vars['my_notes'])) && ($c['my_notes'] != null)) { /* Does user want us to include personal notes? -> Issue 294 */ ?>
+                    <?php if ((in_array('gc:personal_note', $vars['my_notes'])) && ($c['my_notes'] != null)) {
+/* Does user want us to include personal notes? -> Issue 294 */ ?>
                         <groundspeak:personal_note><?= Okapi::xmlescape($c['my_notes']) ?></groundspeak:personal_note>
                     <?php } ?>
-                    <?php if ($vars['latest_logs']) { /* Does user want us to include latest log entries? */ ?>
+                    <?php if ($vars['latest_logs']) {
+/* Does user want us to include latest log entries? */ ?>
                         <groundspeak:logs>
                             <?php foreach ($c['latest_logs'] as $log) { ?>
                                 <groundspeak:log id="<?= $log['internal_id'] ?>">
@@ -164,7 +178,8 @@ 
                     <?php } ?>
                 </groundspeak:cache>
             <?php } ?>
-            <?php if ($vars['ns_ox']) { /* Does user want us to include Garmin's <opencaching> element? */ ?>
+            <?php if ($vars['ns_ox']) {
+/* Does user want us to include Garmin's <opencaching> element? */ ?>
                 <ox:opencaching xmlns:ox="http://www.opencaching.com/xmlschemas/opencaching/1/0">
                     <ox:ratings>
                         <?php if ($c['rating'] !== null) { ?><ox:awesomeness><?= $c['rating'] ?></ox:awesomeness><?php } ?>
@@ -172,10 +187,12 @@ 
                         <?php if ($c['oxsize'] !== null) { ?><ox:size><?= $c['oxsize'] ?></ox:size><?php } ?>
                         <ox:terrain><?= $c['terrain'] ?></ox:terrain>
                     </ox:ratings>
-                    <?php if (in_array('ox:tags', $vars['attrs']) && count($c['attrnames']) > 0) { /* Does user want us to include ox:tags? */ ?>
+                    <?php if (in_array('ox:tags', $vars['attrs']) && count($c['attrnames']) > 0) {
+/* Does user want us to include ox:tags? */ ?>
                         <ox:tags><ox:tag><?= implode("</ox:tag><ox:tag>", $c['attrnames']) ?></ox:tag></ox:tags>
                     <?php } ?>
-                    <?php if ((strpos($vars['images'], "ox:") === 0) && count($c['images']) > 0) { /* Does user want us to include ox:image references? */ ?>
+                    <?php if ((strpos($vars['images'], "ox:") === 0) && count($c['images']) > 0) {
+/* Does user want us to include ox:image references? */ ?>
                         <ox:images>
                             <?php foreach ($c['images'] as $no => $img) { ?>
                                 <ox:image>
@@ -220,7 +237,7 @@ 
                     <?php } ?>
                 </wpt>
                 <?php
-                    if (isset($wpt_ref['ggz_entry'])){
+                    if (isset($wpt_ref['ggz_entry'])) {
                         $wpt_ref['ggz_entry']['file_len'] = ob_get_length() - $wpt_ref['ggz_entry']['file_pos'];
                     }
                 ?>

htdocs/okapi/services/caches/geocache.php

Braces +28 added lines, -13 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).
@@ -58,8 +74,7 @@ 
         $results = OkapiServiceRunner::call('services/caches/geocaches', new OkapiInternalRequest(
             $request->consumer, $request->token, $params));
         $result = $results[$cache_code];
-        if ($result === null)
-        {
+        if ($result === null) {
             # Two errors messages (for OCDE). Makeshift solution for issue #350.
 
             $exists = Db::select_value("

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

Braces +58 added lines, -52 removed lines

@@ -24,98 +24,104 @@
     {
         # 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
-        try
-        {
+        try {
             $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());
         }
 
         # Run retrieval method
-        try
-        {
+        try {
             $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());
         }
 
-        if ($wrap)
-        {
+        if ($wrap) {
             # $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
-        {
-            if ($retr_result instanceof OkapiHttpResponse)
-                return $retr_result;
-            else
-                return Okapi::formatted_response($request, $retr_result);
+        } else {
+            if ($retr_result instanceof OkapiHttpResponse) {
+                            return $retr_result;
+            } else {
+                            return Okapi::formatted_response($request, $retr_result);
+            }
         }
     }
 
     private static function map_values_to_strings(&$dict)
     {
-        foreach (array_keys($dict) as $key)
-        {
+        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);
+            }
         }
     }
 }

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/nearest.php

Spacing +3 added lines, -3 removed lines

@@ -70,14 +70,14 @@ 
         {
             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
+            $radius = floatval($tmp); # is given in kilometers
             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.
 
-            $optimization_radius = 100;  # in kilometers, optimized for Opencaching.de
+            $optimization_radius = 100; # in kilometers, optimized for Opencaching.de
             $km2degrees_upper_estimate_factor = 0.01;
 
             if ($radius <= $optimization_radius)
@@ -89,7 +89,7 @@ 
                     ";
             }
 
-            $radius *= 1000;  # convert from kilometers to meters
+            $radius *= 1000; # convert from kilometers to meters
             $where_conds[] = "$distance_formula <= '".Db::escape_string($radius)."'";
         }
 

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/mark.php

Braces +21 added lines, -18 removed lines

@@ -31,55 +31,58 @@
         # on it - this will also throw a proper exception if it doesn't exist.
 
         $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('cache_code' => $cache_code, 'fields' => 'internal_id')));
 
         # watched
 
-        if ($tmp = $request->get_parameter('watched'))
-        {
-            if (!in_array($tmp, array('true', 'false', 'unchanged')))
-                throw new InvalidParam('watched', $tmp);
-            if ($tmp == 'true')
-                Db::execute("
+        if ($tmp = $request->get_parameter('watched')) {
+            if (!in_array($tmp, array('true', 'false', 'unchanged'))) {
+                            throw new InvalidParam('watched', $tmp);
+            }
+            if ($tmp == 'true') {
+                            Db::execute("
                     insert ignore into cache_watches (cache_id, user_id)
                     values (
                         '".Db::escape_string($geocache['internal_id'])."',
                         '".Db::escape_string($request->token->user_id)."'
                     );
                 ");
-            elseif ($tmp == 'false')
-                Db::execute("
+            } elseif ($tmp == 'false') {
+                            Db::execute("
                     delete from cache_watches
                     where
                         cache_id = '".Db::escape_string($geocache['internal_id'])."'
                         and user_id = '".Db::escape_string($request->token->user_id)."';
                 ");
+            }
         }
 
         # ignored
 
-        if ($tmp = $request->get_parameter('ignored'))
-        {
-            if (!in_array($tmp, array('true', 'false', 'unchanged')))
-                throw new InvalidParam('ignored', $tmp);
-            if ($tmp == 'true')
-                Db::execute("
+        if ($tmp = $request->get_parameter('ignored')) {
+            if (!in_array($tmp, array('true', 'false', 'unchanged'))) {
+                            throw new InvalidParam('ignored', $tmp);
+            }
+            if ($tmp == 'true') {
+                            Db::execute("
                     insert ignore into cache_ignore (cache_id, user_id)
                     values (
                         '".Db::escape_string($geocache['internal_id'])."',
                         '".Db::escape_string($request->token->user_id)."'
                     );
                 ");
-            elseif ($tmp == 'false')
-                Db::execute("
+            } elseif ($tmp == 'false') {
+                            Db::execute("
                     delete from cache_ignore
                     where
                         cache_id = '".Db::escape_string($geocache['internal_id'])."'
                         and user_id = '".Db::escape_string($request->token->user_id)."'
                 ");
+            }
         }
 
         $result = array(

htdocs/okapi/services/users/by_internal_ids.php

Braces +16 added lines, -13 removed lines

@@ -23,14 +23,18 @@ 
     public static function call(OkapiRequest $request)
     {
         $internal_ids = $request->get_parameter('internal_ids');
-        if (!$internal_ids) throw new ParamMissing('internal_ids');
+        if (!$internal_ids) {
+            throw new ParamMissing('internal_ids');
+        }
         $internal_ids = explode("|", $internal_ids);
-        if (count($internal_ids) > 500)
-            throw new InvalidParam('internal_ids', "Maximum allowed number of referenced users ".
+        if (count($internal_ids) > 500) {
+                    throw new InvalidParam('internal_ids', "Maximum allowed number of referenced users ".
                 "is 500. You provided ".count($internal_ids)." references.");
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields)
-            throw new ParamMissing('fields');
+        if (!$fields) {
+                    throw new ParamMissing('fields');
+        }
 
         # There's no need to validate the fields parameter as the 'users'
         # method does this (it will raise a proper exception on invalid values).
@@ -41,8 +45,7 @@ 
             where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_ids))."')
         ");
         $internalid2useruuid = array();
-        while ($row = Db::fetch_assoc($rs))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $internalid2useruuid[$row['user_id']] = $row['uuid'];
         }
         Db::free_result($rs);
@@ -55,12 +58,12 @@ 
         # Map user_uuids to internal_ids. Also check which internal_ids were not found
         # and mark them with null.
         $results = array();
-        foreach ($internal_ids as $internal_id)
-        {
-            if (!isset($internalid2useruuid[$internal_id]))
-                $results[$internal_id] = null;
-            else
-                $results[$internal_id] = $id_results[$internalid2useruuid[$internal_id]];
+        foreach ($internal_ids as $internal_id) {
+            if (!isset($internalid2useruuid[$internal_id])) {
+                            $results[$internal_id] = null;
+            } else {
+                            $results[$internal_id] = $id_results[$internalid2useruuid[$internal_id]];
+            }
         }
 
         return Okapi::formatted_response($request, $results);

htdocs/okapi/services/users/user.php

Braces +6 added lines, -9 removed lines

@@ -26,16 +26,12 @@ 
     public static function call(OkapiRequest $request)
     {
         $user_uuid = $request->get_parameter('user_uuid');
-        if (!$user_uuid)
-        {
-            if ($request->token)
-            {
+        if (!$user_uuid) {
+            if ($request->token) {
                 $tmp = OkapiServiceRunner::call('services/users/by_internal_id', new OkapiInternalRequest(
                     $request->consumer, null, array('internal_id' => $request->token->user_id, 'fields' => 'uuid')));
                 $user_uuid = $tmp['uuid'];
-            }
-            else
-            {
+            } else {
                 throw new BadRequest("You must either: 1. supply the user_uuid argument, or "
                     ."2. sign your request with an Access Token.");
             }
@@ -49,8 +45,9 @@ 
             $request->consumer, $request->token, array('user_uuids' => $user_uuid,
             'fields' => $fields)));
         $result = $results[$user_uuid];
-        if ($result == null)
-            throw new InvalidParam('user_uuid', "There is no user by this ID.");
+        if ($result == null) {
+                    throw new InvalidParam('user_uuid', "There is no user by this ID.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }