OpencachingDeutschland / oc-server3

htdocs/lib2/logic/cracklib.inc.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 
     // min. 4 different chars
     $chars = array();
-    for ($i = 0; $i < mb_strlen($pw); $i ++) {
+    for ($i = 0; $i < mb_strlen($pw); $i++) {
         $chars[mb_substr($pw, $i, 1)] = true;
     }
 

Braces +2 added lines, -1 removed lines

@@ -75,7 +75,8 @@
 
     // $pw may not contain one of $addwords[]
     foreach ($wordlist as $v) {
-        if (mb_stripos($pw_lc, $v) !== false) {// mb_stripos needs PHP 5.2
+        if (mb_stripos($pw_lc, $v) !== false) {
+// mb_stripos needs PHP 5.2
             return false;
         }
     }

htdocs/lib2/error.inc.php

Indentation +27 added lines, -27 removed lines

@@ -7,34 +7,34 @@
  *  Common error messages
  ***************************************************************************/
 
- define('ERROR_UNKNOWN', 1000);
- define('ERROR_TEMPLATE_NOT_FOUND', 1001);
- define('ERROR_COMPILATION_FAILED', 1002);
- define('ERROR_NO_ACCESS', 1003);
- define('ERROR_INVALID_OPERATION', 1004);
- define('ERROR_LOGIN_REQUIRED', 1005);
- define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
- define('ERROR_NO_COOKIES', 1007);
- define('ERROR_ALREADY_LOGGEDIN', 1008);
- define('ERROR_USER_NOT_ACTIVE', 1009);
- define('ERROR_USER_NO_EMAIL', 1010);
- define('ERROR_CACHE_NOT_PUBLISHED', 1011);
- define('ERROR_CACHE_LOCKED', 1012);
+    define('ERROR_UNKNOWN', 1000);
+    define('ERROR_TEMPLATE_NOT_FOUND', 1001);
+    define('ERROR_COMPILATION_FAILED', 1002);
+    define('ERROR_NO_ACCESS', 1003);
+    define('ERROR_INVALID_OPERATION', 1004);
+    define('ERROR_LOGIN_REQUIRED', 1005);
+    define('ERROR_MAIL_TEMPLATE_NOT_FOUND', 1006);
+    define('ERROR_NO_COOKIES', 1007);
+    define('ERROR_ALREADY_LOGGEDIN', 1008);
+    define('ERROR_USER_NOT_ACTIVE', 1009);
+    define('ERROR_USER_NO_EMAIL', 1010);
+    define('ERROR_CACHE_NOT_PUBLISHED', 1011);
+    define('ERROR_CACHE_LOCKED', 1012);
 
- define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
- define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_FORMAT', 1013);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_MANY', 1014);
+    define('ERROR_SEARCHPLUGIN_WAYPOINT_NOTFOUND', 1015);
  
- define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
- define('ERROR_DB_NO_ROOT', 1017);
+    define('ERROR_DB_COULD_NOT_RECONNECT', 1016);
+    define('ERROR_DB_NO_ROOT', 1017);
 
- define('ERROR_USER_NOT_EXISTS', 1018);
- define('ERROR_CACHE_NOT_EXISTS', 1019);
- define('ERROR_CACHELOG_NOT_EXISTS', 1020);
- define('ERROR_PICTURE_NOT_EXISTS', 1021);
+    define('ERROR_USER_NOT_EXISTS', 1018);
+    define('ERROR_CACHE_NOT_EXISTS', 1019);
+    define('ERROR_CACHELOG_NOT_EXISTS', 1020);
+    define('ERROR_PICTURE_NOT_EXISTS', 1021);
 
- define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
- define('ERROR_UPLOAD_ERR_SIZE', 1023);
- define('ERROR_UPLOAD_ERR_TYPE', 1024);
- define('ERROR_UPLOAD_UNKNOWN', 1025);
- define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);
+    define('ERROR_UPLOAD_ERR_NO_FILE', 1022);
+    define('ERROR_UPLOAD_ERR_SIZE', 1023);
+    define('ERROR_UPLOAD_ERR_TYPE', 1024);
+    define('ERROR_UPLOAD_UNKNOWN', 1025);
+    define('ERROR_UPLOAD_ERR_BAD_FORMAT', 1026);

htdocs/lib2/login.class.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@
  *
  ***************************************************************************/
 
-define('LOGIN_UNKNOWN_ERROR', - 1);     // unkown error occured
-define('LOGIN_OK', 0);                 // login succeeded
-define('LOGIN_BADUSERPW', 1);          // bad username or password
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
-define('LOGIN_USERNOTACTIVE', 3);      // the useraccount locked
+define('LOGIN_UNKNOWN_ERROR', - 1); // unkown error occured
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
+define('LOGIN_USERNOTACTIVE', 3); // the useraccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successfull
+define('LOGIN_LOGOUT_OK', 5); // logout was successfull
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);

htdocs/okapi/services/replicate/changelog.php

Braces +9 added lines, -4 removed lines

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

htdocs/okapi/services/caches/geocaches.php

Indentation +3 added lines, -3 removed lines

@@ -453,7 +453,7 @@ 
             # OCDE caches can also be indirectly watched by watching cache lists:
             if (Settings::get('OC_BRANCH') == 'oc.de')
             {
-              $tmp = Db::select_column("
+                $tmp = Db::select_column("
                   select c.wp_oc
                   from
                       caches c,
@@ -464,8 +464,8 @@ 
                       and clw.cache_list_id = cli.cache_list_id
                       and clw.user_id = '".Db::escape_string($request->token->user_id)."'
               ");
-              foreach ($tmp as $cache_code)
-                  $tmp2[$cache_code] = true;
+                foreach ($tmp as $cache_code)
+                    $tmp2[$cache_code] = true;
             }
 
             foreach ($results as $cache_code => &$result_ref)

Unused Use Statements +6 added lines, -8 removed lines

@@ -2,19 +2,17 @@
 
 namespace okapi\services\caches\geocaches;
 
-use Exception;
 use ArrayObject;
-use okapi\Okapi;
+use Exception;
+use okapi\BadRequest;
 use okapi\Db;
-use okapi\Settings;
-use okapi\OkapiRequest;
-use okapi\ParamMissing;
 use okapi\InvalidParam;
-use okapi\BadRequest;
+use okapi\Okapi;
 use okapi\OkapiInternalRequest;
+use okapi\OkapiRequest;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiAccessToken;
-use okapi\services\caches\search\SearchAssistant;
+use okapi\ParamMissing;
+use okapi\Settings;
 use okapi\services\attrs\AttrHelper;
 
 class WebService

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
         'my_notes', 'trackables_count', 'trackables', 'alt_wpts', 'last_found',
         'last_modified', 'date_created', 'date_hidden', 'internal_id', 'is_watched',
         'is_ignored', 'willattends', 'country', 'state', 'preview_image',
-        'trip_time', 'trip_distance', 'attribution_note','gc_code', 'hint2', 'hints2',
+        'trip_time', 'trip_distance', 'attribution_note', 'gc_code', 'hint2', 'hints2',
         'protection_areas', 'short_description', 'short_descriptions', 'needs_maintenance');
 
     public static function call(OkapiRequest $request)
@@ -99,7 +99,7 @@ 
             throw new InvalidParam('attribution_append');
 
         $log_fields = $request->get_parameter('log_fields');
-        if (!$log_fields) $log_fields = "uuid|date|user|type|comment";  // validation is done on call
+        if (!$log_fields) $log_fields = "uuid|date|user|type|comment"; // validation is done on call
 
         $user_uuid = $request->get_parameter('user_uuid');
         if ($user_uuid != null)
@@ -253,7 +253,7 @@ 
                         break;
                     case 'bearing':
                         $tmp = Okapi::get_bearing($center_lat, $center_lon, $row['latitude'], $row['longitude']);
-                        $entry['bearing'] = ($tmp !== null) ? ((int)(10*$tmp)) / 10.0 : null;
+                        $entry['bearing'] = ($tmp !== null) ? ((int)(10 * $tmp)) / 10.0 : null;
                         break;
                     case 'bearing2':
                         $tmp = Okapi::get_bearing($center_lat, $center_lon, $row['latitude'], $row['longitude']);
@@ -287,13 +287,13 @@ 
                         switch (Okapi::cache_sizeid_to_size2($row['size']))
                         {
                             case 'none': $entry['size'] = null; break;
-                            case 'nano': $entry['size'] = 1.0; break;  # same as micro
+                            case 'nano': $entry['size'] = 1.0; break; # same as micro
                             case 'micro': $entry['size'] = 1.0; break;
                             case 'small': $entry['size'] = 2.0; break;
                             case 'regular': $entry['size'] = 3.0; break;
                             case 'large': $entry['size'] = 4.0; break;
                             case 'xlarge': $entry['size'] = 5.0; break;
-                            case 'other': $entry['size'] = null; break;  # same as none
+                            case 'other': $entry['size'] = null; break; # same as none
                             default: throw new Exception();
                         }
                         break;
@@ -304,12 +304,12 @@ 
                     case 'trip_time':
                         # search time is entered in hours:minutes and converted to decimal hours,
                         # which can produce lots of unneeded decimal places; 2 of them are sufficient here
-                        $entry['trip_time'] = $row['trip_time'] === null ? null : round($row['trip_time'],2); break;
+                        $entry['trip_time'] = $row['trip_time'] === null ? null : round($row['trip_time'], 2); break;
                         break;
                     case 'trip_distance':
                         # way length is entered in km as decimal fraction, but number conversions can
                         # create fake digits which should be stripped; meter precision is sufficient here
-                        $entry['trip_distance'] = $row['trip_distance'] === null ? null : round($row['trip_distance'],3); break;
+                        $entry['trip_distance'] = $row['trip_distance'] === null ? null : round($row['trip_distance'], 3); break;
                         break;
                     case 'rating':
                         if ($row['votes'] < 3) $entry['rating'] = null;
@@ -563,7 +563,7 @@ 
                 {
                     $results[$cache_code]['hints'][strtolower($row['language'])] = $row['hint'];
                     $results[$cache_code]['hints2'][strtolower($row['language'])]
-                        = htmlspecialchars_decode(mb_ereg_replace("<br />", "" , $row['hint']), ENT_COMPAT);
+                        = htmlspecialchars_decode(mb_ereg_replace("<br />", "", $row['hint']), ENT_COMPAT);
                 }
             }
             foreach ($results as &$result_ref)
@@ -630,7 +630,7 @@ 
                 $image = array(
                     'uuid' => $row['uuid'],
                     'url' => $row['url'],
-                    'thumb_url' => Settings::get('SITE_URL') . 'thumbs.php?'.$object_type_param.'uuid=' . $row['uuid'],
+                    'thumb_url' => Settings::get('SITE_URL').'thumbs.php?'.$object_type_param.'uuid='.$row['uuid'],
                     'caption' => $row['title'],
                     'unique_caption' => self::get_unique_caption($row['title']),
                     'is_spoiler' => ($row['spoiler'] ? true : false),

Braces +324 added lines, -349 removed lines

@@ -40,33 +40,41 @@ 
     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 === "")
-        {
+        if ($cache_codes === null) {
+            throw new ParamMissing('cache_codes');
+        }
+        if ($cache_codes === "") {
             # Issue 106 requires us to allow empty list of cache codes to be passed into this method.
             # All of the queries below have to be ready for $cache_codes to be empty!
             $cache_codes = array();
+        } else {
+                    $cache_codes = explode("|", $cache_codes);
         }
-        else
-            $cache_codes = explode("|", $cache_codes);
 
-        if ((count($cache_codes) > 500) && (!$request->skip_limits))
-            throw new InvalidParam('cache_codes', "Maximum allowed number of referenced ".
+        if ((count($cache_codes) > 500) && (!$request->skip_limits)) {
+                    throw new InvalidParam('cache_codes', "Maximum allowed number of referenced ".
                 "caches is 500. You provided ".count($cache_codes)." cache codes.");
-        if (count($cache_codes) != count(array_unique($cache_codes)))
-            throw new InvalidParam('cache_codes', "Duplicate codes detected (make sure each cache is referenced only once).");
+        }
+        if (count($cache_codes) != count(array_unique($cache_codes))) {
+                    throw new InvalidParam('cache_codes', "Duplicate codes detected (make sure each cache is referenced only once).");
+        }
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref .= "|".Settings::get('SITELANG');
         $langpref = explode("|", $langpref);
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "code|name|location|type|status";
+        if (!$fields) {
+            $fields = "code|name|location|type|status";
+        }
         $fields = explode("|", $fields);
-        foreach ($fields as $field)
-            if (!in_array($field, self::$valid_field_names))
+        foreach ($fields as $field) {
+                    if (!in_array($field, self::$valid_field_names))
                 throw new InvalidParam('fields', "'$field' is not a valid field code.");
+        }
 
         # Some fields need to be temporarily included whenever the "description"
         # or "attribution_note" field are included. That's a little ugly, but
@@ -79,79 +87,88 @@ 
             || in_array('hint', $fields) || in_array('hints', $fields)
             || in_array('hint2', $fields) || in_array('hints2', $fields)
             || in_array('attribution_note', $fields)
-        )
-        {
-            if (!in_array('owner', $fields))
-            {
+        ) {
+            if (!in_array('owner', $fields)) {
                 $fields[] = "owner";
                 $fields_to_remove_later[] = "owner";
             }
-            if (!in_array('internal_id', $fields))
-            {
+            if (!in_array('internal_id', $fields)) {
                 $fields[] = "internal_id";
                 $fields_to_remove_later[] = "internal_id";
             }
         }
 
         $attribution_append = $request->get_parameter('attribution_append');
-        if (!$attribution_append) $attribution_append = 'full';
-        if (!in_array($attribution_append, array('none', 'static', 'full')))
-            throw new InvalidParam('attribution_append');
+        if (!$attribution_append) {
+            $attribution_append = 'full';
+        }
+        if (!in_array($attribution_append, array('none', 'static', 'full'))) {
+                    throw new InvalidParam('attribution_append');
+        }
 
         $log_fields = $request->get_parameter('log_fields');
-        if (!$log_fields) $log_fields = "uuid|date|user|type|comment";  // validation is done on call
+        if (!$log_fields) {
+            $log_fields = "uuid|date|user|type|comment";
+        }
+        // validation is done on call
 
         $user_uuid = $request->get_parameter('user_uuid');
-        if ($user_uuid != null)
-        {
+        if ($user_uuid != null) {
             $user_id = Db::select_value("select user_id from user where uuid='".Db::escape_string($user_uuid)."'");
-            if ($user_id == null)
-                throw new InvalidParam('user_uuid', "User not found.");
-            if (($request->token != null) && ($request->token->user_id != $user_id))
-                throw new InvalidParam('user_uuid', "User does not match the Access Token used.");
+            if ($user_id == null) {
+                            throw new InvalidParam('user_uuid', "User not found.");
+            }
+            if (($request->token != null) && ($request->token->user_id != $user_id)) {
+                            throw new InvalidParam('user_uuid', "User does not match the Access Token used.");
+            }
+        } elseif (($user_uuid == null) && ($request->token != null)) {
+                    $user_id = $request->token->user_id;
+        } else {
+                    $user_id = null;
         }
-        elseif (($user_uuid == null) && ($request->token != null))
-            $user_id = $request->token->user_id;
-        else
-            $user_id = null;
 
         $lpc = $request->get_parameter('lpc');
-        if ($lpc === null) $lpc = 10;
-        if ($lpc == 'all')
-            $lpc = null;
-        else
-        {
-            if (!is_numeric($lpc))
-                throw new InvalidParam('lpc', "Invalid number: '$lpc'");
+        if ($lpc === null) {
+            $lpc = 10;
+        }
+        if ($lpc == 'all') {
+                    $lpc = null;
+        } else {
+            if (!is_numeric($lpc)) {
+                            throw new InvalidParam('lpc', "Invalid number: '$lpc'");
+            }
             $lpc = intval($lpc);
-            if ($lpc < 0)
-                throw new InvalidParam('lpc', "Must be a positive value.");
+            if ($lpc < 0) {
+                            throw new InvalidParam('lpc', "Must be a positive value.");
+            }
         }
 
         if (in_array('distance', $fields) || in_array('bearing', $fields) || in_array('bearing2', $fields)
-            || in_array('bearing3', $fields))
-        {
+            || in_array('bearing3', $fields)) {
             $tmp = $request->get_parameter('my_location');
-            if (!$tmp)
-                throw new BadRequest("When using 'distance' or 'bearing' fields, you have to supply 'my_location' parameter.");
+            if (!$tmp) {
+                            throw new BadRequest("When using 'distance' or 'bearing' fields, you have to supply 'my_location' parameter.");
+            }
             $parts = explode('|', $tmp);
-            if (count($parts) != 2)
-                throw new InvalidParam('my_location', "Expecting 2 pipe-separated parts, got ".count($parts).".");
-            foreach ($parts as &$part_ref)
-            {
-                if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref))
-                    throw new InvalidParam('my_location', "'$part_ref' is not a valid float number.");
+            if (count($parts) != 2) {
+                            throw new InvalidParam('my_location', "Expecting 2 pipe-separated parts, got ".count($parts).".");
+            }
+            foreach ($parts as &$part_ref) {
+                if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref)) {
+                                    throw new InvalidParam('my_location', "'$part_ref' is not a valid float number.");
+                }
                 $part_ref = floatval($part_ref);
             }
             list($center_lat, $center_lon) = $parts;
-            if ($center_lat > 90 || $center_lat < -90)
-                throw new InvalidParam('current_position', "Latitudes have to be within -90..90 range.");
-            if ($center_lon > 180 || $center_lon < -180)
-                throw new InvalidParam('current_position', "Longitudes have to be within -180..180 range.");
+            if ($center_lat > 90 || $center_lat < -90) {
+                            throw new InvalidParam('current_position', "Latitudes have to be within -90..90 range.");
+            }
+            if ($center_lon > 180 || $center_lon < -180) {
+                            throw new InvalidParam('current_position', "Longitudes have to be within -180..180 range.");
+            }
         }
 
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de') {
             # DE branch:
             # - Caches do not have ratings.
             # - Total numbers of founds and notfounds are kept in the "stat_caches" table.
@@ -181,9 +198,7 @@ 
                     wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                     and status in (1,2,3)
             ");
-        }
-        elseif (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        } elseif (Settings::get('OC_BRANCH') == 'oc.pl') {
             # PL branch:
             # - Caches have ratings.
             # - Total numbers of found and notfounds are kept in the "caches" table.
@@ -218,23 +233,21 @@ 
         $cacheid2wptcode = array();
         $owner_ids = array();
         $outdated_listings = array();
-        while ($row = Db::fetch_assoc($rs))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $entry = array();
             $cacheid2wptcode[$row['cache_id']] = $row['wp_oc'];
-            foreach ($fields as $field)
-            {
-                switch ($field)
-                {
+            foreach ($fields as $field) {
+                switch ($field) {
                     case 'code': $entry['code'] = $row['wp_oc']; break;
                     case 'gc_code':
                         $wp_gc = $row['wp_gc_maintained'] ? $row['wp_gc_maintained'] : $row['wp_gc'];
                         // OC software allows entering anything here, and that's what users do.
                         // We do a formal verification so that only a valid GC code is returned:
-                        if (preg_match('/^\s*[Gg][Cc][A-Za-z0-9]+\s*$/', $wp_gc))
-                            $entry['gc_code'] = strtoupper(trim($wp_gc));
-                        else
-                            $entry['gc_code'] = null;
+                        if (preg_match('/^\s*[Gg][Cc][A-Za-z0-9]+\s*$/', $wp_gc)) {
+                                                    $entry['gc_code'] = strtoupper(trim($wp_gc));
+                        } else {
+                                                    $entry['gc_code'] = null;
+                        }
                         unset($wp_gc);
                         break;
                     case 'name': $entry['name'] = $row['name']; break;
@@ -269,23 +282,26 @@ 
                     case 'is_ignored': /* handled separately */ break;
                     case 'founds': $entry['founds'] = $row['founds'] + 0; break;
                     case 'notfounds':
-                        if ($row['type'] != 6) {  # non-event
+                        if ($row['type'] != 6) {
+# non-event
                             $entry['notfounds'] = $row['notfounds'] + 0;
-                        } else {  # event
+                        } else {
+# event
                             $entry['notfounds'] = 0;
                         }
                         break;
                     case 'willattends':
-                        if ($row['type'] == 6) {  # event
+                        if ($row['type'] == 6) {
+# event
                             $entry['willattends'] = $row['willattends'] + 0;
-                        } else {  # non-event
+                        } else {
+# non-event
                             $entry['willattends'] = 0;
                         }
                         break;
                     case 'size':
                         # Deprecated. Leave it for backward-compatibility. See issue 155.
-                        switch (Okapi::cache_sizeid_to_size2($row['size']))
-                        {
+                        switch (Okapi::cache_sizeid_to_size2($row['size'])) {
                             case 'none': $entry['size'] = null; break;
                             case 'nano': $entry['size'] = 1.0; break;  # same as micro
                             case 'micro': $entry['size'] = 1.0; break;
@@ -312,12 +328,19 @@ 
                         $entry['trip_distance'] = $row['trip_distance'] === null ? null : round($row['trip_distance'],3); break;
                         break;
                     case 'rating':
-                        if ($row['votes'] < 3) $entry['rating'] = null;
-                        elseif ($row['score'] >= 2.2) $entry['rating'] = 5.0;
-                        elseif ($row['score'] >= 1.4) $entry['rating'] = 4.0;
-                        elseif ($row['score'] >= 0.1) $entry['rating'] = 3.0;
-                        elseif ($row['score'] >= -1.0) $entry['rating'] = 2.0;
-                        else $entry['rating'] = 1.0;
+                        if ($row['votes'] < 3) {
+                            $entry['rating'] = null;
+                        } elseif ($row['score'] >= 2.2) {
+                            $entry['rating'] = 5.0;
+                        } elseif ($row['score'] >= 1.4) {
+                            $entry['rating'] = 4.0;
+                        } elseif ($row['score'] >= 0.1) {
+                            $entry['rating'] = 3.0;
+                        } elseif ($row['score'] >= -1.0) {
+                            $entry['rating'] = 2.0;
+                        } else {
+                            $entry['rating'] = 1.0;
+                        }
                         break;
                     case 'rating_votes': $entry['rating_votes'] = $row['votes'] + 0; break;
                     case 'recommendations': $entry['recommendations'] = $row['topratings'] + 0; break;
@@ -352,25 +375,25 @@ 
                 }
             }
             $results[$row['wp_oc']] = $entry;
-            if ($row['listing_outdated'] > 0)
-                $outdated_listings[] = $row['wp_oc'];
+            if ($row['listing_outdated'] > 0) {
+                            $outdated_listings[] = $row['wp_oc'];
+            }
         }
         Db::free_result($rs);
 
         # owner
 
-        if (in_array('owner', $fields) && (count($results) > 0))
-        {
+        if (in_array('owner', $fields) && (count($results) > 0)) {
             $rs = Db::query("
                 select user_id, uuid, username
                 from user
                 where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_values($owner_ids)))."')
             ");
             $tmp = array();
-            while ($row = Db::fetch_assoc($rs))
-                $tmp[$row['user_id']] = $row;
-            foreach ($results as $cache_code => &$result_ref)
-            {
+            while ($row = Db::fetch_assoc($rs)) {
+                            $tmp[$row['user_id']] = $row;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
                 $row = $tmp[$owner_ids[$cache_code]];
                 $result_ref['owner'] = array(
                     'uuid' => $row['uuid'],
@@ -382,10 +405,10 @@ 
 
         # is_found
 
-        if (in_array('is_found', $fields))
-        {
-            if ($user_id == null)
-                throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_found' field.");
+        if (in_array('is_found', $fields)) {
+            if ($user_id == null) {
+                            throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_found' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -401,18 +424,20 @@ 
                     ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_found'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_found'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_not_found
 
-        if (in_array('is_not_found', $fields))
-        {
-            if ($user_id == null)
-                throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_not_found' field.");
+        if (in_array('is_not_found', $fields)) {
+            if ($user_id == null) {
+                            throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_not_found' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -425,18 +450,20 @@ 
                     ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_not_found'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_not_found'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_watched
 
-        if (in_array('is_watched', $fields))
-        {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'is_watched' field.");
+        if (in_array('is_watched', $fields)) {
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'is_watched' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -447,12 +474,12 @@ 
                     and cw.user_id = '".Db::escape_string($request->token->user_id)."'
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
 
             # OCDE caches can also be indirectly watched by watching cache lists:
-            if (Settings::get('OC_BRANCH') == 'oc.de')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.de') {
               $tmp = Db::select_column("
                   select c.wp_oc
                   from
@@ -464,20 +491,22 @@ 
                       and clw.cache_list_id = cli.cache_list_id
                       and clw.user_id = '".Db::escape_string($request->token->user_id)."'
               ");
-              foreach ($tmp as $cache_code)
-                  $tmp2[$cache_code] = true;
+              foreach ($tmp as $cache_code) {
+                                $tmp2[$cache_code] = true;
+              }
             }
 
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_watched'] = isset($tmp2[$cache_code]);
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_watched'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_ignored
 
-        if (in_array('is_ignored', $fields))
-        {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'is_ignored' field.");
+        if (in_array('is_ignored', $fields)) {
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'is_ignored' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -488,10 +517,12 @@ 
                     and ci.user_id = '".Db::escape_string($request->token->user_id)."'
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_ignored'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_ignored'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # Descriptions and hints.
@@ -499,13 +530,11 @@ 
         if (in_array('description', $fields) || in_array('descriptions', $fields)
             || in_array('short_description', $fields) || in_array('short_descriptions', $fields)
             || in_array('hint', $fields) || in_array('hints', $fields)
-            || in_array('hint2', $fields) || in_array('hints2', $fields))
-        {
+            || in_array('hint2', $fields) || in_array('hints2', $fields)) {
             # At first, we will fill all those fields, even if user requested just one
             # of them. We will chop off the unwanted ones at the end.
 
-            foreach ($results as &$result_ref)
-            {
+            foreach ($results as &$result_ref) {
                 $result_ref['short_descriptions'] = new ArrayObject();
                 $result_ref['descriptions'] = new ArrayObject();
                 $result_ref['hints'] = new ArrayObject();
@@ -519,19 +548,16 @@ 
                 from cache_desc
                 where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
             ");
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 $cache_code = $cacheid2wptcode[$row['cache_id']];
                 // strtolower - ISO 639-1 codes are lowercase
-                if ($row['desc'])
-                {
+                if ($row['desc']) {
                     /* Note, that the "owner" and "internal_id" fields are automatically included,
                      * whenever the cache description is included. */
 
                     $tmp = Okapi::fix_oc_html($row['desc'], Okapi::OBJECT_TYPE_CACHE);
 
-                    if (in_array($cache_code, $outdated_listings))
-                    {
+                    if (in_array($cache_code, $outdated_listings)) {
                         Okapi::gettext_domain_init(array_merge(array($row['language']), $langpref));
                         $tmp = (
                             "<p style='color:#c00000'><strong>".
@@ -544,8 +570,7 @@ 
                         Okapi::gettext_domain_restore();
                     }
 
-                    if ($attribution_append != 'none')
-                    {
+                    if ($attribution_append != 'none') {
                         $tmp .= "\n<p><em>".
                             self::get_cache_attribution_note(
                                 $row['cache_id'], strtolower($row['language']), $langpref,
@@ -555,19 +580,16 @@ 
                     }
                     $results[$cache_code]['descriptions'][strtolower($row['language'])] = $tmp;
                 }
-                if ($row['short_desc'])
-                {
+                if ($row['short_desc']) {
                     $results[$cache_code]['short_descriptions'][strtolower($row['language'])] = $row['short_desc'];
                 }
-                if ($row['hint'])
-                {
+                if ($row['hint']) {
                     $results[$cache_code]['hints'][strtolower($row['language'])] = $row['hint'];
                     $results[$cache_code]['hints2'][strtolower($row['language'])]
                         = htmlspecialchars_decode(mb_ereg_replace("<br />", "" , $row['hint']), ENT_COMPAT);
                 }
             }
-            foreach ($results as &$result_ref)
-            {
+            foreach ($results as &$result_ref) {
                 $result_ref['short_description'] = Okapi::pick_best_language($result_ref['short_descriptions'], $langpref);
                 $result_ref['description'] = Okapi::pick_best_language($result_ref['descriptions'], $langpref);
                 $result_ref['hint'] = Okapi::pick_best_language($result_ref['hints'], $langpref);
@@ -579,27 +601,30 @@ 
             foreach (array(
                 'short_description', 'short_descriptions', 'description', 'descriptions',
                 'hint', 'hints', 'hint2', 'hints2'
-            ) as $field)
-                if (!in_array($field, $fields))
+            ) as $field) {
+                            if (!in_array($field, $fields))
                     foreach ($results as &$result_ref)
                         unset($result_ref[$field]);
+            }
         }
 
         # Images.
 
-        if (in_array('images', $fields) || in_array('preview_image', $fields))
-        {
-            if (in_array('images', $fields))
-                foreach ($results as &$result_ref)
+        if (in_array('images', $fields) || in_array('preview_image', $fields)) {
+            if (in_array('images', $fields)) {
+                            foreach ($results as &$result_ref)
                     $result_ref['images'] = array();
-            if (in_array('preview_image', $fields))
-                foreach ($results as &$result_ref)
+            }
+            if (in_array('preview_image', $fields)) {
+                            foreach ($results as &$result_ref)
                     $result_ref['preview_image'] = null;
+            }
 
-            if (Db::field_exists('pictures', 'mappreview'))
-                $preview_field = "mappreview";
-            else
-                $preview_field = "0";
+            if (Db::field_exists('pictures', 'mappreview')) {
+                            $preview_field = "mappreview";
+            } else {
+                            $preview_field = "0";
+            }
             $rs = Db::query("
                 select object_id, uuid, url, title, spoiler, ".$preview_field." as preview
                 from pictures
@@ -613,11 +638,9 @@ 
 
             unset($sql);
             $prev_cache_code = null;
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 $cache_code = $cacheid2wptcode[$row['object_id']];
-                if ($cache_code != $prev_cache_code)
-                {
+                if ($cache_code != $prev_cache_code) {
                     # Group images together. Images must have unique captions within one cache.
                     self::reset_unique_captions();
                     $prev_cache_code = $cache_code;
@@ -635,26 +658,27 @@ 
                     'unique_caption' => self::get_unique_caption($row['title']),
                     'is_spoiler' => ($row['spoiler'] ? true : false),
                 );
-                if (in_array('images', $fields))
-                    $results[$cache_code]['images'][] = $image;
-                if ($row['preview'] != 0 && in_array('preview_image', $fields))
-                    $results[$cache_code]['preview_image'] = $image;
+                if (in_array('images', $fields)) {
+                                    $results[$cache_code]['images'][] = $image;
+                }
+                if ($row['preview'] != 0 && in_array('preview_image', $fields)) {
+                                    $results[$cache_code]['preview_image'] = $image;
+                }
             }
         }
 
         # A-codes and attrnames
 
-        if (in_array('attr_acodes', $fields) || in_array('attrnames', $fields))
-        {
+        if (in_array('attr_acodes', $fields) || in_array('attrnames', $fields)) {
             # Either case, we'll need acodes. If the user didn't want them,
             # remember to remove them later.
 
-            if (!in_array('attr_acodes', $fields))
-            {
+            if (!in_array('attr_acodes', $fields)) {
                 $fields_to_remove_later[] = 'attr_acodes';
             }
-            foreach ($results as &$result_ref)
-                $result_ref['attr_acodes'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['attr_acodes'] = array();
+            }
 
             # Load internal_attr_id => acode mapping.
 
@@ -666,12 +690,10 @@ 
                 from caches_attributes
                 where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
             ");
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 $cache_code = $cacheid2wptcode[$row['cache_id']];
                 $attr_internal_id = $row['attrib_id'];
-                if (!isset($internal2acode[$attr_internal_id]))
-                {
+                if (!isset($internal2acode[$attr_internal_id])) {
                     # Unknown attribute. Ignore.
                     continue;
                 }
@@ -681,24 +703,23 @@ 
             # Now, each cache object has a list of its acodes. We can get
             # the attrnames now.
 
-            if (in_array('attrnames', $fields))
-            {
+            if (in_array('attrnames', $fields)) {
                 $acode2bestname = AttrHelper::get_acode_to_name_mapping($langpref);
-                foreach ($results as &$result_ref)
-                {
+                foreach ($results as &$result_ref) {
                     $result_ref['attrnames'] = array();
-                    foreach ($result_ref['attr_acodes'] as $acode)
-                        $result_ref['attrnames'][] = $acode2bestname[$acode];
+                    foreach ($result_ref['attr_acodes'] as $acode) {
+                                            $result_ref['attrnames'][] = $acode2bestname[$acode];
+                    }
                 }
             }
         }
 
         # Latest log entries.
 
-        if (in_array('latest_logs', $fields))
-        {
-            foreach ($results as &$result_ref)
-                $result_ref['latest_logs'] = array();
+        if (in_array('latest_logs', $fields)) {
+            foreach ($results as &$result_ref) {
+                            $result_ref['latest_logs'] = array();
+            }
 
             # Get all log IDs in proper order, then filter out the latest
             # ones. This should be the fastest technique ...
@@ -728,26 +749,21 @@ 
 
             $loguuids = array();
             $log2cache_map = array();
-            if ($lpc !== null)
-            {
+            if ($lpc !== null) {
                 # User wants some of the latest logs.
                 $tmp = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $tmp[$row['cache_id']][] = $row;
-                foreach ($tmp as $cache_key => &$rowslist_ref)
-                {
-                    for ($i = 0; $i < min(count($rowslist_ref), $lpc); $i++)
-                    {
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $tmp[$row['cache_id']][] = $row;
+                }
+                foreach ($tmp as $cache_key => &$rowslist_ref) {
+                    for ($i = 0; $i < min(count($rowslist_ref), $lpc); $i++) {
                         $loguuids[] = $rowslist_ref[$i]['uuid'];
                         $log2cache_map[$rowslist_ref[$i]['uuid']] = $cacheid2wptcode[$rowslist_ref[$i]['cache_id']];
                     }
                 }
-            }
-            else
-            {
+            } else {
                 # User wants ALL logs.
-                while ($row = Db::fetch_assoc($rs))
-                {
+                while ($row = Db::fetch_assoc($rs)) {
                     $loguuids[] = $row['uuid'];
                     $log2cache_map[$row['uuid']] = $cacheid2wptcode[$row['cache_id']];
                 }
@@ -758,10 +774,8 @@ 
             # We need to retrieve logs/entry for each of the $logids. We do this in groups
             # (there is a limit for log uuids passed to logs/entries method).
 
-            try
-            {
-                foreach (Okapi::make_groups($loguuids, 500) as $subset)
-                {
+            try {
+                foreach (Okapi::make_groups($loguuids, 500) as $subset) {
                     $entries = OkapiServiceRunner::call(
                         "services/logs/entries",
                         new OkapiInternalRequest(
@@ -771,21 +785,16 @@ 
                             )
                         )
                     );
-                    foreach ($subset as $log_uuid)
-                    {
-                        if ($entries[$log_uuid])
-                            $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                    foreach ($subset as $log_uuid) {
+                        if ($entries[$log_uuid]) {
+                                                    $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                        }
                     }
                 }
-            }
-            catch (Exception $e)
-            {
-                if (($e instanceof InvalidParam) && ($e->paramName == 'fields'))
-                {
+            } catch (Exception $e) {
+                if (($e instanceof InvalidParam) && ($e->paramName == 'fields')) {
                     throw new InvalidParam('log_fields', $e->whats_wrong_about_it);
-                }
-                else
-                {
+                } else {
                     /* Something is wrong with OUR code. */
                     throw new Exception($e);
                 }
@@ -794,14 +803,14 @@ 
 
         # My notes
 
-        if (in_array('my_notes', $fields))
-        {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'my_notes' field.");
-            foreach ($results as &$result_ref)
-                $result_ref['my_notes'] = null;
-            if (Settings::get('OC_BRANCH') == 'oc.pl')
-            {
+        if (in_array('my_notes', $fields)) {
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'my_notes' field.");
+            }
+            foreach ($results as &$result_ref) {
+                            $result_ref['my_notes'] = null;
+            }
+            if (Settings::get('OC_BRANCH') == 'oc.pl') {
                 # OCPL uses cache_notes table to store notes.
 
                 $rs = Db::query("
@@ -812,9 +821,7 @@ 
                         and user_id = '".Db::escape_string($request->token->user_id)."'
                     group by cache_id
                 ");
-            }
-            else
-            {
+            } else {
                 # OCDE uses coordinates table (with type == 2) to store notes (this is somewhat weird).
 
                 $rs = Db::query("
@@ -827,15 +834,13 @@ 
                     group by cache_id
                 ");
             }
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 # This one is plain-text. We may add my_notes_html for those who want it in HTML.
                 $results[$cacheid2wptcode[$row['cache_id']]]['my_notes'] = strip_tags($row['desc']);
             }
         }
 
-        if (in_array('trackables', $fields))
-        {
+        if (in_array('trackables', $fields)) {
             # Currently we support Geokrety only. But this interface should remain
             # compatible. In future, other trackables might be returned the same way.
 
@@ -852,15 +857,15 @@ 
                     and gkiw.wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
             ");
             $trs = array();
-            while ($row = Db::fetch_assoc($rs))
-                $trs[$row['cache_code']][] = $row;
-            foreach ($results as $cache_code => &$result_ref)
-            {
+            while ($row = Db::fetch_assoc($rs)) {
+                            $trs[$row['cache_code']][] = $row;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
                 $result_ref['trackables'] = array();
-                if (!isset($trs[$cache_code]))
-                    continue;
-                foreach ($trs[$cache_code] as $t)
-                {
+                if (!isset($trs[$cache_code])) {
+                                    continue;
+                }
+                foreach ($trs[$cache_code] as $t) {
                     $result_ref['trackables'][] = array(
                         'code' => 'GK'.str_pad(strtoupper(dechex($t['gk_id'])), 4, "0", STR_PAD_LEFT),
                         'name' => $t['name'],
@@ -870,16 +875,13 @@ 
             }
             unset($trs);
         }
-        if (in_array('trackables_count', $fields))
-        {
-            if (in_array('trackables', $fields))
-            {
+        if (in_array('trackables_count', $fields)) {
+            if (in_array('trackables', $fields)) {
                 # We already got all trackables data, no need to query database again.
-                foreach ($results as $cache_code => &$result_ref)
-                    $result_ref['trackables_count'] = count($result_ref['trackables']);
-            }
-            else
-            {
+                foreach ($results as $cache_code => &$result_ref) {
+                                    $result_ref['trackables_count'] = count($result_ref['trackables']);
+                }
+            } else {
                 $rs = Db::query("
                     select wp as cache_code, count(*) as count
                     from gk_item_waypoint
@@ -887,14 +889,15 @@ 
                     group by wp
                 ");
                 $tr_counts = new ArrayObject();
-                while ($row = Db::fetch_assoc($rs))
-                    $tr_counts[$row['cache_code']] = $row['count'];
-                foreach ($results as $cache_code => &$result_ref)
-                {
-                    if (isset($tr_counts[$cache_code]))
-                        $result_ref['trackables_count'] = $tr_counts[$cache_code] + 0;
-                    else
-                        $result_ref['trackables_count'] = 0;
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $tr_counts[$row['cache_code']] = $row['count'];
+                }
+                foreach ($results as $cache_code => &$result_ref) {
+                    if (isset($tr_counts[$cache_code])) {
+                                            $result_ref['trackables_count'] = $tr_counts[$cache_code] + 0;
+                    } else {
+                                            $result_ref['trackables_count'] = 0;
+                    }
                 }
                 unset($tr_counts);
             }
@@ -902,11 +905,9 @@ 
 
         # Alternate/Additional waypoints.
 
-        if (in_array('alt_wpts', $fields))
-        {
+        if (in_array('alt_wpts', $fields)) {
             $internal_wpt_type_id2names = array();
-            if (Settings::get('OC_BRANCH') == 'oc.de')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.de') {
                 $rs = Db::query("
                     select
                         ct.id,
@@ -916,30 +917,28 @@ 
                         coordinates_type ct
                         left join sys_trans_text stt on stt.trans_id = ct.trans_id
                 ");
-                while ($row = Db::fetch_assoc($rs))
-                    $internal_wpt_type_id2names[$row['id']][$row['language']] = $row['text'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $internal_wpt_type_id2names[$row['id']][$row['language']] = $row['text'];
+                }
                 Db::free_result($rs);
-            }
-            else
-            {
+            } else {
                 $rs = Db::query("
                     select id, pl, en
                     from waypoint_type
                     where id > 0
                 ");
-                while ($row = Db::fetch_assoc($rs))
-                {
+                while ($row = Db::fetch_assoc($rs)) {
                     $internal_wpt_type_id2names[$row['id']]['pl'] = $row['pl'];
                     $internal_wpt_type_id2names[$row['id']]['en'] = $row['en'];
                 }
             }
 
-            foreach ($results as &$result_ref)
-                $result_ref['alt_wpts'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['alt_wpts'] = array();
+            }
             $cache_codes_escaped_and_imploded = "'".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."'";
 
-            if (Settings::get('OC_BRANCH') == 'oc.pl')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.pl') {
                 # OCPL uses 'waypoints' table to store additional waypoints and defines
                 # waypoint types in 'waypoint_type' table.
                 # OCPL also have a special 'status' field to denote a hidden waypoint
@@ -970,9 +969,7 @@ 
                         and status = 1
                     order by cache_id, stage, `desc`
                 ");
-            }
-            else
-            {
+            } else {
                 # OCDE uses 'coordinates' table (with type=1) to store additional waypoints
                 # and defines waypoint types in 'coordinates_type' table.
                 # All additional waypoints are public.
@@ -1007,15 +1004,12 @@ 
                 ");
             }
 
-            foreach ($cacheid2waypoints as $cache_id => $waypoints)
-            {
+            foreach ($cacheid2waypoints as $cache_id => $waypoints) {
                 $cache_code = $cacheid2wptcode[$cache_id];
                 $wpt_format = $cache_code."-%0".strlen(count($waypoints))."d";
                 $index = 0;
-                foreach ($waypoints as $row)
-                {
-                    if (!isset($internal_wpt_type_id2names[$row['internal_type_id']]))
-                    {
+                foreach ($waypoints as $row) {
+                    if (!isset($internal_wpt_type_id2names[$row['internal_type_id']])) {
                         # Sanity check. Waypoints of undefined type won't be accessible via OKAPI.
                         # See issue 219.
                         continue;
@@ -1034,11 +1028,9 @@ 
 
             # Issue #298 - User coordinates implemented in oc.pl
             # Issue #305 - User coordinates implemented in oc.de
-            if ($request->token != null)
-            {
+            if ($request->token != null) {
                 # Query DB for user provided coordinates
-                if (Settings::get('OC_BRANCH') == 'oc.pl')
-                {
+                if (Settings::get('OC_BRANCH') == 'oc.pl') {
                     $cacheid2user_coords = Db::select_group_by('cache_id', "
                         select
                             cache_id, longitude, latitude
@@ -1061,11 +1053,9 @@ 
                             and latitude != 0
                     ");
                 }
-                foreach ($cacheid2user_coords as $cache_id => $waypoints)
-                {
+                foreach ($cacheid2user_coords as $cache_id => $waypoints) {
                     $cache_code = $cacheid2wptcode[$cache_id];
-                    foreach ($waypoints as $row)
-                    {
+                    foreach ($waypoints as $row) {
                         # there should be only one user waypoint per cache...
                         $results[$cache_code]['alt_wpts'][] = array(
                             'name' => $cache_code.'-USER-COORDS',
@@ -1085,13 +1075,11 @@ 
 
         # Country and/or state.
 
-        if (in_array('country', $fields) || in_array('state', $fields))
-        {
+        if (in_array('country', $fields) || in_array('state', $fields)) {
             $countries = array();
             $states = array();
 
-            if (Settings::get('OC_BRANCH') == 'oc.de')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.de') {
                 # OCDE:
                 #  - cache_location entries are created by a cronjob *after* listing the
                 #      caches and may not yet exist.
@@ -1117,8 +1105,9 @@ 
                         c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                 ");
                 $country_codes2names = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $country_codes2names[$row['country']][$row['language']] = $row['text'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $country_codes2names[$row['country']][$row['language']] = $row['text'];
+                }
                 Db::free_result($rs);
 
                 # get geocache countries and states
@@ -1133,18 +1122,16 @@ 
                     where
                         c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                 ");
-                while ($row = Db::fetch_assoc($rs))
-                {
-                    if (!isset($country_codes2names[$row['country_code']]))
-                        $countries[$row['cache_code']] = '';
-                    else
-                        $countries[$row['cache_code']] = Okapi::pick_best_language($country_codes2names[$row['country_code']], $langpref);
+                while ($row = Db::fetch_assoc($rs)) {
+                    if (!isset($country_codes2names[$row['country_code']])) {
+                                            $countries[$row['cache_code']] = '';
+                    } else {
+                                            $countries[$row['cache_code']] = Okapi::pick_best_language($country_codes2names[$row['country_code']], $langpref);
+                    }
                     $states[$row['cache_code']] = $row['state'];
                 }
                 Db::free_result($rs);
-            }
-            else
-            {
+            } else {
                 # OCPL:
                 #  - cache_location data is entered by the user.
                 #  - The state is in adm3 field.
@@ -1162,23 +1149,22 @@ 
                         c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                         and c.cache_id = cl.cache_id
                 ");
-                while ($row = Db::fetch_assoc($rs))
-                {
+                while ($row = Db::fetch_assoc($rs)) {
                     $countries[$row['cache_code']] = $row['country'];
                     $states[$row['cache_code']] = $row['state'];
                 }
                 Db::free_result($rs);
             }
 
-            if (in_array('country', $fields))
-            {
-                foreach ($results as $cache_code => &$row_ref)
-                    $row_ref['country'] = isset($countries[$cache_code]) ? $countries[$cache_code] : null;
+            if (in_array('country', $fields)) {
+                foreach ($results as $cache_code => &$row_ref) {
+                                    $row_ref['country'] = isset($countries[$cache_code]) ? $countries[$cache_code] : null;
+                }
             }
-            if (in_array('state', $fields))
-            {
-                foreach ($results as $cache_code => &$row_ref)
-                    $row_ref['state'] = isset($states[$cache_code]) ? $states[$cache_code] : null;
+            if (in_array('state', $fields)) {
+                foreach ($results as $cache_code => &$row_ref) {
+                                    $row_ref['state'] = isset($states[$cache_code]) ? $states[$cache_code] : null;
+                }
             }
             unset($countries);
             unset($states);
@@ -1186,27 +1172,25 @@ 
 
         # Attribution note
 
-        if (in_array('attribution_note', $fields))
-        {
+        if (in_array('attribution_note', $fields)) {
             /* Note, that the "owner" and "internal_id" fields are automatically included,
              * whenever the attribution_note is included. */
 
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['attribution_note'] =
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['attribution_note'] =
                     self::get_cache_attribution_note(
                         $result_ref['internal_id'], $langpref[0], $langpref,
                         $results[$cache_code]['owner'], 'full'
                     );
+            }
         }
 
         # Protection areas
 
-        if (in_array('protection_areas', $fields))
-        {
+        if (in_array('protection_areas', $fields)) {
             $cache_ids_escaped_and_imploded = "'".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."'";
 
-            if (Settings::get('OC_BRANCH') == 'oc.de')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.de') {
                 $rs = Db::query("
                     select
                         c.wp_oc as cache_code,
@@ -1222,9 +1206,7 @@ 
                     group by npa_areas.type_id, npa_areas.name
                     order by npa_types.ordinal
                 ");
-            }
-            else if (in_array(Okapi::get_oc_schema_code(), array("OCPL", "OCNL")))
-            {
+            } else if (in_array(Okapi::get_oc_schema_code(), array("OCPL", "OCNL"))) {
                 # Current OCPL table definitions use collation 'latin1' for parkipl
                 # and 'utf8' for np_areas. Union needs identical collations.
                 # To be sure, we convert both to utf8.
@@ -1255,21 +1237,18 @@ 
                         c.cache_id in (".$cache_ids_escaped_and_imploded.")
                         and cache_npa_areas.npa_id != 0
                 ");
-            }
-            else
-            {
+            } else {
                 # OC.US and .UK do not have a 'parkipl' table.
                 # OC.US has a 'us_parks' table instead.
                 # Natura 2000 is Europe-only.
                 $rs = null;
             }
 
-            foreach ($results as &$result_ref)
-                $result_ref['protection_areas'] = array();
-            if ($rs)
-            {
-                while ($row = Db::fetch_assoc($rs))
-                {
+            foreach ($results as &$result_ref) {
+                            $result_ref['protection_areas'] = array();
+            }
+            if ($rs) {
+                while ($row = Db::fetch_assoc($rs)) {
                     $results[$row['cache_code']]['protection_areas'][] = array(
                         'type' => $row['type'],
                         'name' => $row['name'],
@@ -1280,18 +1259,19 @@ 
         }
 
         # Check which cache codes were not found and mark them with null.
-        foreach ($cache_codes as $cache_code)
-            if (!isset($results[$cache_code]))
+        foreach ($cache_codes as $cache_code) {
+                    if (!isset($results[$cache_code]))
                 $results[$cache_code] = null;
+        }
 
-        if (count($fields_to_remove_later) > 0)
-        {
+        if (count($fields_to_remove_later) > 0) {
             # Some of the fields in $results were added only temporarily
             # (the Consumer did not ask for them). We will remove these fields now.
 
-            foreach ($results as &$result_ref)
-                foreach ($fields_to_remove_later as $field)
+            foreach ($results as &$result_ref) {
+                            foreach ($fields_to_remove_later as $field)
                     unset($result_ref[$field]);
+            }
         }
 
         # Order the results in the same order as the input codes were given.
@@ -1301,8 +1281,9 @@ 
         # so we just have to rewrite it (sequentially).
 
         $ordered_results = new ArrayObject();
-        foreach ($cache_codes as $cache_code)
-            $ordered_results[$cache_code] = $results[$cache_code];
+        foreach ($cache_codes as $cache_code) {
+                    $ordered_results[$cache_code] = $results[$cache_code];
+        }
 
         /* Handle OCPL's "access logs" feature. */
 
@@ -1407,21 +1388,17 @@ 
         $cache_url = $site_url."viewcache.php?cacheid=$cache_id";
 
         Okapi::gettext_domain_init(array_merge(array($lang), $langpref));
-        if (Settings::get('OC_BRANCH') == 'oc.pl')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.pl') {
             # This does not vary on $type (yet).
 
             $note = sprintf(
                 _("This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</a> site."),
                 $cache_url, $site_url, $site_name
             );
-        }
-        else
-        {
+        } else {
             # OC.de wants the tld in lowercase here
             $site_name = ucfirst(strtolower($site_name));
-            if ($type == 'full')
-            {
+            if ($type == 'full') {
                 $note = sprintf(
                     _(
                         "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, ".
@@ -1430,9 +1407,7 @@ 
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name, strftime('%x')
                 );
-            }
-            elseif ($type == 'static')
-            {
+            } elseif ($type == 'static') {
                 $note = sprintf(
                     _(
                         "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, ".

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

Indentation +1 added lines, -1 removed lines

@@ -465,7 +465,7 @@
                 $ggz_entry['ratings'] = array();
                 $ratings_ref = &$ggz_entry['ratings'];
                 if (isset($cache_ref['rating'])){
-                   $ratings_ref['awesomeness'] = $cache_ref['rating'];
+                    $ratings_ref['awesomeness'] = $cache_ref['rating'];
                 }
                 $ratings_ref['difficulty'] = $cache_ref['difficulty'];
                 if (!isset($cache_ref['size'])) {

Unused Use Statements +5 added lines, -7 removed lines

@@ -2,18 +2,16 @@
 
 namespace okapi\services\caches\formatters\gpx;
 
+use okapi\BadRequest;
+use okapi\Db;
+use okapi\InvalidParam;
 use okapi\Okapi;
-use okapi\OkapiRequest;
 use okapi\OkapiHttpResponse;
+use okapi\OkapiInternalConsumer;
 use okapi\OkapiInternalRequest;
+use okapi\OkapiRequest;
 use okapi\OkapiServiceRunner;
-use okapi\BadRequest;
 use okapi\ParamMissing;
-use okapi\OkapiAccessToken;
-use okapi\InvalidParam;
-use okapi\services\caches\search\SearchAssistant;
-use okapi\OkapiInternalConsumer;
-use okapi\Db;
 use okapi\Settings;
 use okapi\services\attrs\AttrHelper;
 

Spacing +5 added lines, -5 removed lines

@@ -164,7 +164,7 @@ 
             else $protection_areas = 'none';
         }
         if (!in_array($protection_areas, array('none', 'desc:text')))
-            throw new InvalidParam('protection_areas',"'$protection_areas'");
+            throw new InvalidParam('protection_areas', "'$protection_areas'");
         $vars['protection_areas'] = $protection_areas;
 
         $tmp = $request->get_parameter('trackables');
@@ -290,7 +290,7 @@ 
                     # database; OCPL stores attribute names in a different way and may use
                     # different names for equivalent attributes.
 
-                    $ocde_attrnames = Db::select_group_by('id',"
+                    $ocde_attrnames = Db::select_group_by('id', "
                         select id, name
                         from cache_attrib
                     ");
@@ -413,7 +413,7 @@ 
                             $cache_ref['warning_prefix'] = _(
                                 "<b>Geocache coordinates have been changed.</b> Currently they ".
                                 "point to one of the alternate waypoints originally described as:"
-                            ) . " " . $alt_wpt['description'];
+                            )." ".$alt_wpt['description'];
                         }
                         # remove current alt waypoint
                         unset($cache_ref['alt_wpts'][$alt_wpt_key]);
@@ -464,7 +464,7 @@ 
 
                 $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'];
@@ -491,7 +491,7 @@ 
                         $ggz_entry = &$alt_wpt_ref['ggz_entry'];
                         $ggz_entries[] = &$ggz_entry;
 
-                        $ggz_entry['code'] = $cache_ref['code'] . '-' . $idx;
+                        $ggz_entry['code'] = $cache_ref['code'].'-'.$idx;
                         $ggz_entry['name'] = $alt_wpt_ref['type_name'];
                         $ggz_entry['type'] = $alt_wpt_ref['sym'];
                         list($lat, $lon) = explode("|", $alt_wpt_ref['location']);

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/logs/entry.php

Braces +9 added lines, -4 removed lines

@@ -21,16 +21,21 @@
     public static function call(OkapiRequest $request)
     {
         $log_uuid = $request->get_parameter('log_uuid');
-        if (!$log_uuid) throw new ParamMissing('log_uuid');
+        if (!$log_uuid) {
+            throw new ParamMissing('log_uuid');
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "date|user|type|comment";
+        if (!$fields) {
+            $fields = "date|user|type|comment";
+        }
 
         $results = OkapiServiceRunner::call('services/logs/entries', new OkapiInternalRequest(
             $request->consumer, $request->token, array('log_uuids' => $log_uuid,
             'fields' => $fields)));
         $result = $results[$log_uuid];
-        if ($result == null)
-            throw new InvalidParam('log_uuid', "This log entry does not exist.");
+        if ($result == null) {
+                    throw new InvalidParam('log_uuid', "This log entry does not exist.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }

htdocs/okapi/services/logs/logs.php

Braces +24 added lines, -11 removed lines

@@ -24,19 +24,31 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_code = $request->get_parameter('cache_code');
-        if (!$cache_code) throw new ParamMissing('cache_code');
+        if (!$cache_code) {
+            throw new ParamMissing('cache_code');
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "uuid|date|user|type|comment";
+        if (!$fields) {
+            $fields = "uuid|date|user|type|comment";
+        }
 
         $offset = $request->get_parameter('offset');
-        if (!$offset) $offset = "0";
-        if ((((int)$offset) != $offset) || ((int)$offset) < 0)
-            throw new InvalidParam('offset', "Expecting non-negative integer.");
+        if (!$offset) {
+            $offset = "0";
+        }
+        if ((((int)$offset) != $offset) || ((int)$offset) < 0) {
+                    throw new InvalidParam('offset', "Expecting non-negative integer.");
+        }
         $limit = $request->get_parameter('limit');
-        if (!$limit) $limit = "none";
-        if ($limit == "none") $limit = "999999999";
-        if ((((int)$limit) != $limit) || ((int)$limit) < 0)
-            throw new InvalidParam('limit', "Expecting non-negative integer or 'none'.");
+        if (!$limit) {
+            $limit = "none";
+        }
+        if ($limit == "none") {
+            $limit = "999999999";
+        }
+        if ((((int)$limit) != $limit) || ((int)$limit) < 0) {
+                    throw new InvalidParam('limit', "Expecting non-negative integer or 'none'.");
+        }
 
         # Check if code exists and retrieve cache ID (this will throw
         # a proper exception on invalid code).
@@ -64,8 +76,9 @@ 
         $internal_request->skip_limits = true;
         $logs = OkapiServiceRunner::call('services/logs/entries', $internal_request);
         $results = array();
-        foreach ($log_uuids as $log_uuid)
-            $results[] = $logs[$log_uuid];
+        foreach ($log_uuids as $log_uuid) {
+                    $results[] = $logs[$log_uuid];
+        }
 
         /* Handle OCPL's "access logs" feature. */
 

htdocs/okapi/services/users/by_username.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         # Catch pipe chars here, because services/users/by_usernames would split up the name.
         # OC databases do not contain user names with pipe chars.
 
-        if (strstr($username,'|'))
+        if (strstr($username, '|'))
             throw new InvalidParam('username', "There is no user by this username.");
         $fields = $request->get_parameter('fields');
 

Braces +9 added lines, -5 removed lines

@@ -26,14 +26,17 @@ 
     public static function call(OkapiRequest $request)
     {
         $username = $request->get_parameter('username');
-        if (!$username) throw new ParamMissing('username');
+        if (!$username) {
+            throw new ParamMissing('username');
+        }
 
         # Fix for issue 339:
         # Catch pipe chars here, because services/users/by_usernames would split up the name.
         # OC databases do not contain user names with pipe chars.
 
-        if (strstr($username,'|'))
-            throw new InvalidParam('username', "There is no user by this username.");
+        if (strstr($username,'|')) {
+                    throw new InvalidParam('username', "There is no user by this username.");
+        }
         $fields = $request->get_parameter('fields');
 
         # There's no need to validate the fields parameter.
@@ -42,8 +45,9 @@ 
             $request->consumer, $request->token, array('usernames' => $username,
             'fields' => $fields)));
         $result = $results[$username];
-        if ($result == null)
-            throw new InvalidParam('username', "There is no user by this username.");
+        if ($result == null) {
+                    throw new InvalidParam('username', "There is no user by this username.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }