OpencachingDeutschland / oc-server3

htdocs/okapi/services/logs/images/add.php

Braces +51 added lines, -48 removed lines

@@ -19,7 +19,9 @@ 
  * the Consumer did anything wrong (it's the user who did). This exception shouldn't
  * be used outside of this file.
  */
-class CannotPublishException extends Exception {}
+class CannotPublishException extends Exception
+{
+}
 
 class WebService
 {
@@ -48,8 +50,9 @@ 
         # validate the 'log_uuid' parameter
 
         $log_uuid = $request->get_parameter('log_uuid');
-        if (!$log_uuid)
-            throw new ParamMissing('log_uuid');
+        if (!$log_uuid) {
+                    throw new ParamMissing('log_uuid');
+        }
         $rs = Db::query("
             select id, node, user_id
             from cache_logs
@@ -57,8 +60,9 @@ 
         );
         $row = Db::fetch_assoc($rs);
         Db::free_result($rs);
-        if (!$row)
-            throw new InvalidParam('log_uuid', "There is no log entry with uuid '".$log_uuid."'.");
+        if (!$row) {
+                    throw new InvalidParam('log_uuid', "There is no log entry with uuid '".$log_uuid."'.");
+        }
         if ($row['node'] != Settings::get('OC_NODE_ID')) {
             throw new Exception(
                 "This site's database contains the log entry '$log_uuid' which has been"
@@ -85,21 +89,24 @@ 
         }
 
         $is_spoiler = $request->get_parameter('is_spoiler');
-        if ($is_spoiler === null) $is_spoiler = 'false';
-        if (!in_array($is_spoiler, array('true', 'false')))
-            throw new InvalidParam('is_spoiler');
+        if ($is_spoiler === null) {
+            $is_spoiler = 'false';
+        }
+        if (!in_array($is_spoiler, array('true', 'false'))) {
+                    throw new InvalidParam('is_spoiler');
+        }
 
         $position = LogImagesCommon::validate_position($request);
 
         # validate the 'image' parameter
 
         $base64_image = $request->get_parameter('image');
-        if (!$base64_image)
-            throw new ParamMissing('image');
+        if (!$base64_image) {
+                    throw new ParamMissing('image');
+        }
 
         $estimated_decoded_size = strlen($base64_image) / 4 * 3 - 2;
-        if ($estimated_decoded_size > Settings::get('IMAGE_MAX_UPLOAD_SIZE'))
-        {
+        if ($estimated_decoded_size > Settings::get('IMAGE_MAX_UPLOAD_SIZE')) {
             $estimated_decoded_size_MB = round($estimated_decoded_size / 1024 / 1024, 1);
             $max_upload_size_MB = round(Settings::get('IMAGE_MAX_UPLOAD_SIZE') / 1024 / 1024, 1);
 
@@ -112,20 +119,21 @@ 
         }
 
         $image = base64_decode($base64_image);
-        if (!$image)
-            throw new InvalidParam('image', "bad base64 encoding");
+        if (!$image) {
+                    throw new InvalidParam('image', "bad base64 encoding");
+        }
 
         try {
             $image_properties = getimagesizefromstring($image);  # can throw
-            if (!$image_properties)
-                throw new Exception();
+            if (!$image_properties) {
+                            throw new Exception();
+            }
             list($width, $height, $image_type) = $image_properties;
             if (!in_array($image_type, array(IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_GIF))) {
                 # This will happen e.g. for BMP and XBM images, which are supported by GD.
                 throw new Exception();
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             # Note: There may be *subtypes* which are not accepted by the GD library.
             # About 1 of 2000 JPEGs at OC.de is not readable by the PHP functions,
             # though they can be displayed by web browsers.
@@ -149,9 +157,10 @@ 
         }
         try {
             $image = imagecreatefromstring($image);  # can throw
-            if (!$image) throw new Exception();
-        }
-        catch (Exception $e) {
+            if (!$image) {
+                throw new Exception();
+            }
+        } catch (Exception $e) {
             throw new CannotPublishException(_("The uploaded image file is broken."));
         }
 
@@ -168,8 +177,7 @@ 
 
         $image_uuid = Okapi::create_uuid();
         $imagepath = Settings::get('IMAGES_DIR').'/'.$image_uuid;
-        switch ($image_type)
-        {
+        switch ($image_type) {
             case IMAGETYPE_JPEG:
                 $file_ext = '.jpg';
                 $quality = Settings::get('JPEG_QUALITY');
@@ -190,26 +198,23 @@ 
                 $file_ext = '.???';
                 $result = false;
         }
-        if (!$result)
-            throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+        if (!$result) {
+                    throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+        }
 
         # insert image into database
 
-        try
-        {
+        try {
             $position = self::db_insert_image(
                 $request->consumer->key, $request->token->user_id,
                 $log_internal_id, $image_uuid, $position, $caption, $is_spoiler, $file_ext
             );
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             # TODO: Proper handling of nested exception if the unlink() fails
             # (which is very unlikely, and will just add a bit more of garbage
             # to that which is already present in the images directory).
 
-            try { unlink($imagepath.$file_ext); }
-            catch (Exception $e2) {}
+            try { unlink($imagepath.$file_ext); } catch (Exception $e2) {}
             throw $e;
         }
 
@@ -239,15 +244,15 @@ 
         # and more powerful alternative (e.g. allowing more file types),
         # but that needs additional and sometimes non-trivial installation.
 
-        if (!extension_loaded('gd'))
-            throw new Exception('PHP GD image processing module is disabled');
+        if (!extension_loaded('gd')) {
+                    throw new Exception('PHP GD image processing module is disabled');
+        }
 
         # rescale image if necessary
 
         $scale_factor = sqrt(Settings::get('IMAGE_MAX_PIXEL_COUNT') / ($width * $height));
 
-        if ($scale_factor < 1)
-        {
+        if ($scale_factor < 1) {
             $new_width = $width * $scale_factor;
             $new_height = $height * $scale_factor;
             $scaled_image = imagecreatetruecolor($new_width, $new_height);
@@ -261,18 +266,17 @@ 
         #   - GD cannot save EXIF data anyway, and
         #   - the orientation flag may not be recognized by all image processors.
 
-        if (!extension_loaded('exif'))
-            throw new Exception('PHP Exif module is disabled');
+        if (!extension_loaded('exif')) {
+                    throw new Exception('PHP Exif module is disabled');
+        }
 
-        if ($image_type == IMAGETYPE_JPEG)
-        {
+        if ($image_type == IMAGETYPE_JPEG) {
             # The PHP Exif module can read EXIF data only from files. To avoid
             # disk I/O overhead, we pipe the image string through a pseudo-file:
 
             $exif_data = exif_read_data("data://image/jpeg;base64," . $base64_image);
             if ($exif_data && isset($exif_data['Orientation'])) {
-                switch ($exif_data['Orientation'])
-                {
+                switch ($exif_data['Orientation']) {
                     case 3: $image = imagerotate($image, 180, 0); break;
                     case 6: $image = imagerotate($image, -90, 0); break;
                     case 8: $image = imagerotate($image, 90, 0); break;
@@ -393,11 +397,12 @@ 
         # This is the "real" entry point. A wrapper for the _call method.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         Okapi::gettext_domain_init(explode("|", $langpref));
 
-        try
-        {
+        try {
             list($image_uuid, $position) = self::_call($request);
             $result = array(
                 'success' => true,
@@ -406,9 +411,7 @@ 
                 'position' => $position
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
-        {
+        } catch (CannotPublishException $e) {
             Okapi::gettext_domain_restore();
             $result = array(
                 'success' => false,

htdocs/okapi/services/oauth/request_token.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
     public static function call(OkapiRequest $request)
     {
         $callback = $request->get_parameter('oauth_callback');
-        if (!$callback)
-        {
+        if (!$callback) {
             # We require the 1.0a flow (throw an error when there is no oauth_callback).
             throw new ParamMissing("oauth_callback");
         }

htdocs/okapi/services/oauth/access_token.php

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
     public static function call(OkapiRequest $request)
     {
         $verifier = $request->get_parameter('oauth_verifier');
-        if (!$verifier)
-        {
+        if (!$verifier) {
             # We require the 1.0a flow (throw an error when there is no oauth_verifier).
             throw new ParamMissing("oauth_verifier");
         }

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

Braces +49 added lines, -45 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,36 +107,37 @@ 
         $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 ($images != 'none')
-        {
+        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)
-            {
+            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;
+                foreach ($imgs as $no => $img) {
+                    if ($images == 'spoilers' && (!$img['is_spoiler'])) {
+                                            continue;
+                    }
+                    if ($images == 'nonspoilers' && $img['is_spoiler']) {
+                                            continue;
+                    }
                     $tmp = false;
-                    foreach ($supported_extensions as $ext)
-                    {
-                        if (strtolower(substr($img['url'], strlen($img['url']) - strlen($ext) - 1)) != ".".$ext)
-                        {
+                    foreach ($supported_extensions as $ext) {
+                        if (strtolower(substr($img['url'], strlen($img['url']) - strlen($ext) - 1)) != ".".$ext) {
                             $tmp = true;
                             continue;
                         }
                     }
-                    if (!$tmp)
-                        continue;  # unsupported file extension
+                    if (!$tmp) {
+                                            continue;
+                    }
+                    # unsupported file extension
 
                     if ($img['is_spoiler']) {
                         $zippath = $dir."/Spoilers/".$img['unique_caption'].".jpg";
@@ -142,34 +153,25 @@ 
                     # be accessed locally. But all the files have 'local' set to 1 anyway.
 
                     $syspath = Settings::get('IMAGES_DIR')."/".$img['uuid'].".jpg";
-                    if (file_exists($syspath))
-                    {
+                    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.
 
                         $cache_key = "jpg#".$img['uuid'];
                         $jpeg_contents = Cache::get($cache_key);
-                        if ($jpeg_contents === null)
-                        {
-                            foreach ($supported_extensions as $ext)
-                            {
+                        if ($jpeg_contents === null) {
+                            foreach ($supported_extensions as $ext) {
                                 $syspath_other = Settings::get('IMAGES_DIR')."/".$img['uuid'].".".$ext;
-                                if (file_exists($syspath_other))
-                                {
-                                    try
-                                    {
+                                if (file_exists($syspath_other)) {
+                                    try {
                                         $image = imagecreatefromstring(file_get_contents($syspath_other));
                                         ob_start();
                                         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
                                         # attempt to parse it during the next 24 hours.
@@ -181,8 +183,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/formatters/ggzindex.tpl.php

Braces +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
                 <?php if (isset($c['ratings'])) {
                 ?><ratings>
                     <?php
-                        foreach ($c['ratings'] as $rating_key => $rating_val){
+                        foreach ($c['ratings'] as $rating_key => $rating_val) {
                             echo "<$rating_key>$rating_val</$rating_key>\n";
                         }
                     ?>

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

Braces +113 added lines, -98 removed lines

@@ -89,24 +89,30 @@ 
         # $vars variable which we will use later in the GPS template.
 
         $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');
-        foreach (array('ns_ground', 'ns_gsak', 'ns_ox', 'latest_logs', 'alt_wpts', 'mark_found') as $param)
-        {
+        foreach (array('ns_ground', 'ns_gsak', 'ns_ox', 'latest_logs', 'alt_wpts', 'mark_found') as $param) {
             $val = $request->get_parameter($param);
-            if (!$val) $val = "false";
-            elseif (!in_array($val, array("true", "false")))
-                throw new InvalidParam($param);
+            if (!$val) {
+                $val = "false";
+            } elseif (!in_array($val, array("true", "false"))) {
+                            throw new InvalidParam($param);
+            }
             $vars[$param] = ($val == "true");
         }
-        if ($vars['latest_logs'] && (!$vars['ns_ground']))
-            throw new BadRequest("In order for 'latest_logs' to work you have to also include 'ns_ground' extensions.");
+        if ($vars['latest_logs'] && (!$vars['ns_ground'])) {
+                    throw new BadRequest("In order for 'latest_logs' to work you have to also include 'ns_ground' extensions.");
+        }
 
         $tmp = $request->get_parameter('my_notes');
         $vars['my_notes'] = array();
@@ -134,72 +140,86 @@ 
         }
 
         $images = $request->get_parameter('images');
-        if (!$images) $images = 'descrefs:nonspoilers';
-        if (!in_array($images, array('none', 'descrefs:thumblinks', 'descrefs:nonspoilers', 'descrefs:all', 'ox:all')))
-            throw new InvalidParam('images', "'$images'");
+        if (!$images) {
+            $images = 'descrefs:nonspoilers';
+        }
+        if (!in_array($images, array('none', 'descrefs:thumblinks', 'descrefs:nonspoilers', 'descrefs:all', 'ox:all'))) {
+                    throw new InvalidParam('images', "'$images'");
+        }
         $vars['images'] = $images;
 
         $tmp = $request->get_parameter('attrs');
-        if (!$tmp) $tmp = 'desc:text';
+        if (!$tmp) {
+            $tmp = 'desc:text';
+        }
         $tmp = explode("|", $tmp);
         $vars['attrs'] = array();
-        foreach ($tmp as $elem)
-        {
+        foreach ($tmp as $elem) {
             if ($elem == 'none') {
                 /* pass */
             } elseif (in_array($elem, array('desc:text', 'ox:tags', 'gc:attrs', 'gc_ocde:attrs'))) {
-                if ($elem == 'gc_ocde:attrs' && Settings::get('OC_BRANCH') != 'oc.de')
-                    $vars['attrs'][] = 'gc:attrs';
-                else
-                    $vars['attrs'][] = $elem;
+                if ($elem == 'gc_ocde:attrs' && Settings::get('OC_BRANCH') != 'oc.de') {
+                                    $vars['attrs'][] = 'gc:attrs';
+                } else {
+                                    $vars['attrs'][] = $elem;
+                }
             } else {
                 throw new InvalidParam('attrs', "Invalid list entry: '$elem'");
             }
         }
 
         $protection_areas = $request->get_parameter('protection_areas');
-        if (!$protection_areas || $protection_areas == 'desc:auto')
-        {
-            if (Settings::get('OC_BRANCH') == 'oc.de') $protection_areas = 'desc:text';
-            else $protection_areas = 'none';
+        if (!$protection_areas || $protection_areas == 'desc:auto') {
+            if (Settings::get('OC_BRANCH') == 'oc.de') {
+                $protection_areas = 'desc:text';
+            } else {
+                $protection_areas = 'none';
+            }
+        }
+        if (!in_array($protection_areas, array('none', 'desc:text'))) {
+                    throw new InvalidParam('protection_areas',"'$protection_areas'");
         }
-        if (!in_array($protection_areas, array('none', 'desc:text')))
-            throw new InvalidParam('protection_areas',"'$protection_areas'");
         $vars['protection_areas'] = $protection_areas;
 
         $tmp = $request->get_parameter('trackables');
-        if (!$tmp) $tmp = 'none';
-        if (!in_array($tmp, array('none', 'desc:list', 'desc:count')))
-            throw new InvalidParam('trackables', "'$tmp'");
+        if (!$tmp) {
+            $tmp = 'none';
+        }
+        if (!in_array($tmp, array('none', 'desc:list', 'desc:count'))) {
+                    throw new InvalidParam('trackables', "'$tmp'");
+        }
         $vars['trackables'] = $tmp;
 
         $tmp = $request->get_parameter('recommendations');
-        if (!$tmp) $tmp = 'none';
-        if (!in_array($tmp, array('none', 'desc:count')))
-            throw new InvalidParam('recommendations', "'$tmp'");
+        if (!$tmp) {
+            $tmp = 'none';
+        }
+        if (!in_array($tmp, array('none', 'desc:count'))) {
+                    throw new InvalidParam('recommendations', "'$tmp'");
+        }
         $vars['recommendations'] = $tmp;
 
         $lpc = $request->get_parameter('lpc');
-        if ($lpc === null) $lpc = 10; # will be checked in services/caches/geocaches call
+        if ($lpc === null) {
+            $lpc = 10;
+        }
+        # will be checked in services/caches/geocaches call
 
         $user_uuid = $request->get_parameter('user_uuid');
 
         # location_source (part 1 of 2)
 
         $location_source = $request->get_parameter('location_source');
-        if (!$location_source)
-        {
+        if (!$location_source) {
             $location_source = 'default-coords';
         }
         # Make sure location_source has prefix alt_wpt:
-        if ($location_source != 'default-coords' && strncmp($location_source, 'alt_wpt:', 8) != 0)
-        {
+        if ($location_source != 'default-coords' && strncmp($location_source, 'alt_wpt:', 8) != 0) {
             throw new InvalidParam('location_source', '\''.$location_source.'\'');
         }
 
         # Make sure we have sufficient authorization
-        if ($location_source == 'alt_wpt:user-coords' && $request->token == null)
-        {
+        if ($location_source == 'alt_wpt:user-coords' && $request->token == null) {
             throw new BadRequest("Level 3 Authentication is required to access 'alt_wpt:user-coords'.");
         }
 
@@ -208,24 +228,32 @@ 
         $fields = 'code|name|location|date_created|url|type|status|size|size2|oxsize'.
             '|difficulty|terrain|description|hint2|rating|owner|url|internal_id'.
             '|protection_areas|short_description';
-        if ($vars['images'] != 'none')
-            $fields .= "|images";
-        if (count($vars['attrs']) > 0)
-            $fields .= "|attrnames|attr_acodes|needs_maintenance";
-        if ($vars['trackables'] == 'desc:list')
-            $fields .= "|trackables";
-        elseif ($vars['trackables'] == 'desc:count')
-            $fields .= "|trackables_count";
-        if ($vars['alt_wpts'] == 'true' || $location_source != 'default-coords')
-            $fields .= "|alt_wpts";
-        if ($vars['recommendations'] != 'none')
-            $fields .= "|recommendations|founds";
-        if (count($vars['my_notes']) > 0)
-            $fields .= "|my_notes";
-        if ($vars['latest_logs'])
-            $fields .= "|latest_logs";
-        if ($vars['mark_found'])
-            $fields .= "|is_found";
+        if ($vars['images'] != 'none') {
+                    $fields .= "|images";
+        }
+        if (count($vars['attrs']) > 0) {
+                    $fields .= "|attrnames|attr_acodes|needs_maintenance";
+        }
+        if ($vars['trackables'] == 'desc:list') {
+                    $fields .= "|trackables";
+        } elseif ($vars['trackables'] == 'desc:count') {
+                    $fields .= "|trackables_count";
+        }
+        if ($vars['alt_wpts'] == 'true' || $location_source != 'default-coords') {
+                    $fields .= "|alt_wpts";
+        }
+        if ($vars['recommendations'] != 'none') {
+                    $fields .= "|recommendations|founds";
+        }
+        if (count($vars['my_notes']) > 0) {
+                    $fields .= "|my_notes";
+        }
+        if ($vars['latest_logs']) {
+                    $fields .= "|latest_logs";
+        }
+        if ($vars['mark_found']) {
+                    $fields .= "|is_found";
+        }
 
         $vars['caches'] = OkapiServiceRunner::call(
             'services/caches/geocaches', new OkapiInternalRequest(
@@ -261,8 +289,7 @@ 
         $vars['cache_GPX_types'] = self::$cache_GPX_types;
         $vars['cache_GPX_sizes'] = self::$cache_GPX_sizes;
 
-        if (count($vars['attrs']) > 0)
-        {
+        if (count($vars['attrs']) > 0) {
             /* The user asked for some kind of attribute output. We'll fetch all
              * the data we MAY need. This is often far too much, but thanks to
              * caching, it will work fast. */
@@ -281,10 +308,8 @@ 
 
             $vars['gc_attrs'] = in_array('gc:attrs', $vars['attrs']);
             $vars['gc_ocde_attrs'] = in_array('gc_ocde:attrs', $vars['attrs']);
-            if ($vars['gc_attrs'] || $vars['gc_ocde_attrs'])
-            {
-                if ($vars['gc_ocde_attrs'])
-                {
+            if ($vars['gc_attrs'] || $vars['gc_ocde_attrs']) {
+                if ($vars['gc_ocde_attrs']) {
                     # As this is an OCDE compatibility feature, we use the same Pseudo-GS
                     # attribute names here as OCDE. Note that this code is specific to OCDE
                     # database; OCPL stores attribute names in a different way and may use
@@ -297,14 +322,11 @@ 
                     $attr_dict = AttrHelper::get_attrdict();
                 }
 
-                foreach ($vars['caches'] as &$cache_ref)
-                {
+                foreach ($vars['caches'] as &$cache_ref) {
                     $cache_ref['gc_attrs'] = array();
-                    foreach ($cache_ref['attr_acodes'] as $acode)
-                    {
+                    foreach ($cache_ref['attr_acodes'] as $acode) {
                         $has_gc_equivs = false;
-                        foreach ($vars['attr_index'][$acode]['gc_equivs'] as $gc)
-                        {
+                        foreach ($vars['attr_index'][$acode]['gc_equivs'] as $gc) {
                             # The assignment via GC-ID as array key will prohibit duplicate
                             # GC attributes, which can result from
                             # - assigning the same GC ID to multiple A-Codes,
@@ -313,8 +335,7 @@ 
                             $cache_ref['gc_attrs'][$gc['id']] = $gc;
                             $has_gc_equivs = true;
                         }
-                        if (!$has_gc_equivs && $vars['gc_ocde_attrs'])
-                        {
+                        if (!$has_gc_equivs && $vars['gc_ocde_attrs']) {
                             # Generate an OCDE pseudo-GS attribute;
                             # see https://github.com/opencaching/okapi/issues/190 and
                             # https://github.com/opencaching/okapi/issues/271.
@@ -329,8 +350,7 @@ 
                             );
                         }
                     }
-                    if ($cache_ref['needs_maintenance'])
-                    {
+                    if ($cache_ref['needs_maintenance']) {
                         # export NM cache flag as GC attribute #42
                         $cache_ref['gc_attrs']['42'] = array(
                             'inc' => 1,
@@ -342,12 +362,11 @@ 
 
             # As the 'needs maintenance' flag is usually transported as attribute in
             # GPX files, we add it also to desc:text attribs.
-            if (in_array('desc:text', $vars['attrs']))
-            {
-                foreach ($vars['caches'] as &$cache_ref)
-                {
-                    if ($cache_ref['needs_maintenance'])
-                        $cache_ref['attrnames'][] = 'Needs maintenance';
+            if (in_array('desc:text', $vars['attrs'])) {
+                foreach ($vars['caches'] as &$cache_ref) {
+                    if ($cache_ref['needs_maintenance']) {
+                                            $cache_ref['attrnames'][] = 'Needs maintenance';
+                    }
                 }
             }
         }
@@ -363,38 +382,35 @@ 
          * from the database here. */
 
         $dict = array();
-        foreach ($vars['caches'] as &$cache_ref)
-        {
+        foreach ($vars['caches'] as &$cache_ref) {
             $dict[$cache_ref['owner']['uuid']] = true;
-            if (isset($cache_ref['latest_logs']))
-                foreach ($cache_ref['latest_logs'] as &$log_ref)
+            if (isset($cache_ref['latest_logs'])) {
+                            foreach ($cache_ref['latest_logs'] as &$log_ref)
                     $dict[$log_ref['user']['uuid']] = true;
+            }
         }
         $rs = Db::query("
             select uuid, user_id
             from user
             where uuid in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($dict)))."')
         ");
-        while ($row = Db::fetch_assoc($rs))
-            $dict[$row['uuid']] = $row['user_id'];
+        while ($row = Db::fetch_assoc($rs)) {
+                    $dict[$row['uuid']] = $row['user_id'];
+        }
         $vars['user_uuid_to_internal_id'] = &$dict;
         unset($dict);
 
         # location_source (part 2 of 2)
 
-        if ($location_source != 'default-coords')
-        {
+        if ($location_source != 'default-coords') {
             $location_change_prefix = $request->get_parameter('location_change_prefix');
             if (!$location_change_prefix) {
                 $location_change_prefix = '# ';
             }
             # lets find requested coords
-            foreach ($vars['caches'] as &$cache_ref)
-            {
-                foreach ($cache_ref['alt_wpts'] as $alt_wpt_key => $alt_wpt)
-                {
-                    if ('alt_wpt:'.$alt_wpt['type'] == $location_source)
-                    {
+            foreach ($vars['caches'] as &$cache_ref) {
+                foreach ($cache_ref['alt_wpts'] as $alt_wpt_key => $alt_wpt) {
+                    if ('alt_wpt:'.$alt_wpt['type'] == $location_source) {
                         # Switch locations between primary wpt and alternate wpt.
                         # Also alter the cache name and make sure to append a proper
                         # notice.
@@ -418,8 +434,7 @@ 
                         # remove current alt waypoint
                         unset($cache_ref['alt_wpts'][$alt_wpt_key]);
                         # add original location as alternate
-                        if ($vars['alt_wpts'])
-                        {
+                        if ($vars['alt_wpts']) {
                             $cache_ref['alt_wpts'][] = array(
                                 'name' => $cache_ref['code'].'-DEFAULT-COORDS',
                                 'location' => $original_location,
@@ -444,8 +459,7 @@ 
 
             $ggz_entries = array();
 
-            foreach ($vars['caches'] as &$cache_ref)
-            {
+            foreach ($vars['caches'] as &$cache_ref) {
                 # Every $cache_ref will also be holding a reference to its entry.
                 # Note, that more attributes are added while processing gpsfile.tpl.php!
 
@@ -464,13 +478,14 @@ 
 
                 $ggz_entry['ratings'] = array();
                 $ratings_ref = &$ggz_entry['ratings'];
-                if (isset($cache_ref['rating'])){
+                if (isset($cache_ref['rating'])) {
                    $ratings_ref['awesomeness'] = $cache_ref['rating'];
                 }
                 $ratings_ref['difficulty'] = $cache_ref['difficulty'];
                 if (!isset($cache_ref['size'])) {
                     $ratings_ref['size'] = 0; // Virtual, Event
-                } else if ($cache_ref['oxsize'] !== null) { // is this ox size one-to-one?
+                } else if ($cache_ref['oxsize'] !== null) {
+// is this ox size one-to-one?
                     $ratings_ref['size'] = $cache_ref['oxsize'];
                 }
                 $ratings_ref['terrain'] = $cache_ref['terrain'];

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

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);
+            }
         }
     }
 }