OpencachingDeutschland / oc-server3

htdocs/okapi/services/caches/geocaches.php

Unused Use Statements -2 removed lines

@@ -13,8 +13,6 @@
 use okapi\BadRequest;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiAccessToken;
-use okapi\services\caches\search\SearchAssistant;
 use okapi\services\attrs\AttrHelper;
 
 class WebService

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)

Spacing +79 added lines, -79 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)
@@ -51,14 +51,14 @@ 
             $cache_codes = explode("|", $cache_codes);
 
         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.");
+            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).");
 
         $langpref = $request->get_parameter('langpref');
         if (!$langpref) $langpref = "en";
-        $langpref .= "|".Settings::get('SITELANG');
+        $langpref .= "|" . Settings::get('SITELANG');
         $langpref = explode("|", $langpref);
 
         $fields = $request->get_parameter('fields');
@@ -99,12 +99,12 @@ 
             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)
         {
-            $user_id = Db::select_value("select user_id from user where uuid='".Db::escape_string($user_uuid)."'");
+            $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))
@@ -136,7 +136,7 @@ 
                 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).".");
+                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))
@@ -178,7 +178,7 @@ 
                     caches c
                     left join stat_caches as sc on c.cache_id = sc.cache_id
                 where
-                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                     and status in (1,2,3)
             ");
         }
@@ -209,7 +209,7 @@ 
                 from
                     caches c
                 where
-                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                     and c.status in (1,2,3)
             ");
         }
@@ -239,11 +239,11 @@ 
                         break;
                     case 'name': $entry['name'] = $row['name']; break;
                     case 'names': $entry['names'] = array(Settings::get('SITELANG') => $row['name']); break; // for the future
-                    case 'location': $entry['location'] = round($row['latitude'], 6)."|".round($row['longitude'], 6); break;
+                    case 'location': $entry['location'] = round($row['latitude'], 6) . "|" . round($row['longitude'], 6); break;
                     case 'type': $entry['type'] = Okapi::cache_type_id2name($row['type']); break;
                     case 'status': $entry['status'] = Okapi::cache_status_id2name($row['status']); break;
                     case 'needs_maintenance': $entry['needs_maintenance'] = $row['needs_maintenance'] > 0; break;
-                    case 'url': $entry['url'] = Settings::get('SITE_URL')."viewcache.php?wp=".$row['wp_oc']; break;
+                    case 'url': $entry['url'] = Settings::get('SITE_URL') . "viewcache.php?wp=" . $row['wp_oc']; break;
                     case 'owner':
                         $owner_ids[$row['wp_oc']] = $row['user_id'];
                         /* continued later */
@@ -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;
@@ -348,7 +348,7 @@ 
                     case 'internal_id': $entry['internal_id'] = $row['cache_id']; break;
                     case 'attribution_note': /* handled separately */ break;
                     case 'protection_areas': /* handled separately */ break;
-                    default: throw new Exception("Missing field case: ".$field);
+                    default: throw new Exception("Missing field case: " . $field);
                 }
             }
             $results[$row['wp_oc']] = $entry;
@@ -364,7 +364,7 @@ 
             $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)))."')
+                where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_values($owner_ids))) . "')
             ");
             $tmp = array();
             while ($row = Db::fetch_assoc($rs))
@@ -375,7 +375,7 @@ 
                 $result_ref['owner'] = array(
                     'uuid' => $row['uuid'],
                     'username' => $row['username'],
-                    'profile_url' => Settings::get('SITE_URL')."viewprofile.php?userid=".$row['user_id']
+                    'profile_url' => Settings::get('SITE_URL') . "viewprofile.php?userid=" . $row['user_id']
                 );
             }
         }
@@ -394,11 +394,11 @@ 
                 where
                     c.cache_id = cl.cache_id
                     and cl.type in (
-                        '".Db::escape_string(Okapi::logtypename2id("Found it"))."',
-                        '".Db::escape_string(Okapi::logtypename2id("Attended"))."'
+                        '".Db::escape_string(Okapi::logtypename2id("Found it")) . "',
+                        '".Db::escape_string(Okapi::logtypename2id("Attended")) . "'
                     )
-                    and cl.user_id = '".Db::escape_string($user_id)."'
-                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
+                    and cl.user_id = '".Db::escape_string($user_id) . "'
+                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "") . "
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -420,9 +420,9 @@ 
                     cache_logs cl
                 where
                     c.cache_id = cl.cache_id
-                    and cl.type = '".Db::escape_string(Okapi::logtypename2id("Didn't find it"))."'
-                    and cl.user_id = '".Db::escape_string($user_id)."'
-                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
+                    and cl.type = '".Db::escape_string(Okapi::logtypename2id("Didn't find it")) . "'
+                    and cl.user_id = '".Db::escape_string($user_id) . "'
+                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "") . "
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -444,7 +444,7 @@ 
                     cache_watches cw
                 where
                     c.cache_id = cw.cache_id
-                    and cw.user_id = '".Db::escape_string($request->token->user_id)."'
+                    and cw.user_id = '".Db::escape_string($request->token->user_id) . "'
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -462,7 +462,7 @@ 
                   where
                       cli.cache_id = c.cache_id
                       and clw.cache_list_id = cli.cache_list_id
-                      and clw.user_id = '".Db::escape_string($request->token->user_id)."'
+                      and clw.user_id = '".Db::escape_string($request->token->user_id) . "'
               ");
               foreach ($tmp as $cache_code)
                   $tmp2[$cache_code] = true;
@@ -485,7 +485,7 @@ 
                     cache_ignore ci
                 where
                     c.cache_id = ci.cache_id
-                    and ci.user_id = '".Db::escape_string($request->token->user_id)."'
+                    and ci.user_id = '".Db::escape_string($request->token->user_id) . "'
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -517,7 +517,7 @@ 
             $rs = Db::query("
                 select cache_id, language, `desc`, short_desc, hint
                 from cache_desc
-                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
+                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
             ");
             while ($row = Db::fetch_assoc($rs))
             {
@@ -534,11 +534,11 @@ 
                     {
                         Okapi::gettext_domain_init(array_merge(array($row['language']), $langpref));
                         $tmp = (
-                            "<p style='color:#c00000'><strong>".
-                            _('Parts of this geocache listing may be outdated.').
-                            "</strong> ".
-                            _('See the log entries for more information.').
-                            "</p>\n".
+                            "<p style='color:#c00000'><strong>" .
+                            _('Parts of this geocache listing may be outdated.') .
+                            "</strong> " .
+                            _('See the log entries for more information.') .
+                            "</p>\n" .
                             $tmp
                         );
                         Okapi::gettext_domain_restore();
@@ -546,11 +546,11 @@ 
 
                     if ($attribution_append != 'none')
                     {
-                        $tmp .= "\n<p><em>".
+                        $tmp .= "\n<p><em>" .
                             self::get_cache_attribution_note(
                                 $row['cache_id'], strtolower($row['language']), $langpref,
                                 $results[$cache_code]['owner'], $attribution_append
-                            ).
+                            ) .
                             "</em></p>";
                     }
                     $results[$cache_code]['descriptions'][strtolower($row['language'])] = $tmp;
@@ -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)
@@ -601,10 +601,10 @@ 
             else
                 $preview_field = "0";
             $rs = Db::query("
-                select object_id, uuid, url, title, spoiler, ".$preview_field." as preview
+                select object_id, uuid, url, title, spoiler, ".$preview_field . " as preview
                 from pictures
                 where
-                    object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
+                    object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
                     and display = 1
                     and object_type = 2
                     and unknown_format = 0
@@ -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),
@@ -658,13 +658,13 @@ 
 
             # Load internal_attr_id => acode mapping.
 
-            require_once($GLOBALS['rootpath'].'okapi/services/attrs/attr_helper.inc.php');
+            require_once($GLOBALS['rootpath'] . 'okapi/services/attrs/attr_helper.inc.php');
             $internal2acode = AttrHelper::get_internal_id_to_acode_mapping();
 
             $rs = Db::query("
                 select cache_id, attrib_id
                 from caches_attributes
-                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
+                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
             ");
             while ($row = Db::fetch_assoc($rs))
             {
@@ -721,9 +721,9 @@ 
                 select cache_id, uuid
                 from cache_logs
                 where
-                    cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
-                    and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
-                order by cache_id, ".$logs_order_field_SQL." desc, date_created desc, id desc
+                    cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
+                    and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
+                order by cache_id, ".$logs_order_field_SQL . " desc, date_created desc, id desc
             ");
 
             $loguuids = array();
@@ -808,8 +808,8 @@ 
                     select cache_id, max(date) as date, group_concat(`desc`) as `desc`
                     from cache_notes
                     where
-                        cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
-                        and user_id = '".Db::escape_string($request->token->user_id)."'
+                        cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
+                        and user_id = '".Db::escape_string($request->token->user_id) . "'
                     group by cache_id
                 ");
             }
@@ -822,8 +822,8 @@ 
                     from coordinates
                     where
                         type = 2  -- personal note
-                        and cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
-                        and user_id = '".Db::escape_string($request->token->user_id)."'
+                        and cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
+                        and user_id = '".Db::escape_string($request->token->user_id) . "'
                     group by cache_id
                 ");
             }
@@ -849,7 +849,7 @@ 
                     gk_item gki
                 where
                     gkiw.id = gki.id
-                    and gkiw.wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    and gkiw.wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
             ");
             $trs = array();
             while ($row = Db::fetch_assoc($rs))
@@ -862,9 +862,9 @@ 
                 foreach ($trs[$cache_code] as $t)
                 {
                     $result_ref['trackables'][] = array(
-                        'code' => 'GK'.str_pad(strtoupper(dechex($t['gk_id'])), 4, "0", STR_PAD_LEFT),
+                        'code' => 'GK' . str_pad(strtoupper(dechex($t['gk_id'])), 4, "0", STR_PAD_LEFT),
                         'name' => $t['name'],
-                        'url' => 'http://geokrety.org/konkret.php?id='.$t['gk_id']
+                        'url' => 'http://geokrety.org/konkret.php?id=' . $t['gk_id']
                     );
                 }
             }
@@ -883,7 +883,7 @@ 
                 $rs = Db::query("
                     select wp as cache_code, count(*) as count
                     from gk_item_waypoint
-                    where wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    where wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                     group by wp
                 ");
                 $tr_counts = new ArrayObject();
@@ -936,7 +936,7 @@ 
 
             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)))."'";
+            $cache_codes_escaped_and_imploded = "'" . implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "'";
 
             if (Settings::get('OC_BRANCH') == 'oc.pl')
             {
@@ -966,7 +966,7 @@ 
                         end as okapi_type
                     from waypoints
                     where
-                        cache_id in (".$cache_codes_escaped_and_imploded.")
+                        cache_id in (".$cache_codes_escaped_and_imploded . ")
                         and status = 1
                     order by cache_id, stage, `desc`
                 ");
@@ -1002,7 +1002,7 @@ 
                     from coordinates
                     where
                         type = 1
-                        and cache_id in (".$cache_codes_escaped_and_imploded.")
+                        and cache_id in (".$cache_codes_escaped_and_imploded . ")
                     order by cache_id, id
                 ");
             }
@@ -1010,7 +1010,7 @@ 
             foreach ($cacheid2waypoints as $cache_id => $waypoints)
             {
                 $cache_code = $cacheid2wptcode[$cache_id];
-                $wpt_format = $cache_code."-%0".strlen(count($waypoints))."d";
+                $wpt_format = $cache_code . "-%0" . strlen(count($waypoints)) . "d";
                 $index = 0;
                 foreach ($waypoints as $row)
                 {
@@ -1023,11 +1023,11 @@ 
                     $index++;
                     $results[$cache_code]['alt_wpts'][] = array(
                         'name' => sprintf($wpt_format, $index),
-                        'location' => round($row['latitude'], 6)."|".round($row['longitude'], 6),
+                        'location' => round($row['latitude'], 6) . "|" . round($row['longitude'], 6),
                         'type' => $row['okapi_type'],
                         'type_name' => Okapi::pick_best_language($internal_wpt_type_id2names[$row['internal_type_id']], $langpref),
                         'sym' => $row['sym'],
-                        'description' => ($row['stage'] ? _("Stage")." ".$row['stage'].": " : "").$row['desc'],
+                        'description' => ($row['stage'] ? _("Stage") . " " . $row['stage'] . ": " : "") . $row['desc'],
                     );
                 }
             }
@@ -1045,7 +1045,7 @@ 
                         from cache_mod_cords
                         where
                             cache_id in ($cache_codes_escaped_and_imploded)
-                            and user_id = '".Db::escape_string($request->token->user_id)."'
+                            and user_id = '" . Db::escape_string($request->token->user_id) . "'
                     ");
                 } else {
                     # oc.de
@@ -1055,7 +1055,7 @@ 
                         from coordinates
                         where
                             cache_id in ($cache_codes_escaped_and_imploded)
-                            and user_id = '".Db::escape_string($request->token->user_id)."'
+                            and user_id = '" . Db::escape_string($request->token->user_id) . "'
                             and type = 2
                             and longitude != 0
                             and latitude != 0
@@ -1068,8 +1068,8 @@ 
                     {
                         # there should be only one user waypoint per cache...
                         $results[$cache_code]['alt_wpts'][] = array(
-                            'name' => $cache_code.'-USER-COORDS',
-                            'location' => round($row['latitude'], 6)."|".round($row['longitude'], 6),
+                            'name' => $cache_code . '-USER-COORDS',
+                            'location' => round($row['latitude'], 6) . "|" . round($row['longitude'], 6),
                             'type' => 'user-coords',
                             'type_name' => _("User location"),
                             'sym' => 'Block, Green',
@@ -1114,7 +1114,7 @@ 
                         inner join countries on countries.short=c.country
                         inner join sys_trans_text stt on stt.trans_id = countries.trans_id
                     where
-                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                 ");
                 $country_codes2names = array();
                 while ($row = Db::fetch_assoc($rs))
@@ -1131,7 +1131,7 @@ 
                         caches c
                         left join cache_location cl on c.cache_id = cl.cache_id
                     where
-                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                 ");
                 while ($row = Db::fetch_assoc($rs))
                 {
@@ -1159,7 +1159,7 @@ 
                         caches c,
                         cache_location cl
                     where
-                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                        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))
@@ -1203,7 +1203,7 @@ 
 
         if (in_array('protection_areas', $fields))
         {
-            $cache_ids_escaped_and_imploded = "'".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."'";
+            $cache_ids_escaped_and_imploded = "'" . implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "'";
 
             if (Settings::get('OC_BRANCH') == 'oc.de')
             {
@@ -1218,7 +1218,7 @@ 
                         inner join npa_areas on cache_npa_areas.npa_id = npa_areas.id
                         inner join npa_types on npa_areas.type_id = npa_types.id
                     where
-                        c.cache_id in (".$cache_ids_escaped_and_imploded.")
+                        c.cache_id in (".$cache_ids_escaped_and_imploded . ")
                     group by npa_areas.type_id, npa_areas.name
                     order by npa_types.ordinal
                 ");
@@ -1233,14 +1233,14 @@ 
                 $rs = Db::query("
                     select
                         c.wp_oc as cache_code,
-                        '"._('National Park / Landscape')."' as type,
+                        '"._('National Park / Landscape') . "' as type,
                         CONVERT(parkipl.name USING utf8) as name
                     from
                         caches c
                         inner join cache_npa_areas on cache_npa_areas.cache_id=c.cache_id
                         inner join parkipl on cache_npa_areas.parki_id=parkipl.id
                     where
-                        c.cache_id in (".$cache_ids_escaped_and_imploded.")
+                        c.cache_id in (".$cache_ids_escaped_and_imploded . ")
                         and cache_npa_areas.parki_id != 0
                     union
                     select
@@ -1252,7 +1252,7 @@ 
                         inner join cache_npa_areas on cache_npa_areas.cache_id=c.cache_id
                         inner join npa_areas on cache_npa_areas.npa_id=npa_areas.id
                     where
-                        c.cache_id in (".$cache_ids_escaped_and_imploded.")
+                        c.cache_id in (".$cache_ids_escaped_and_imploded . ")
                         and cache_npa_areas.npa_id != 0
                 ");
             }
@@ -1321,7 +1321,7 @@ 
                     'description', 'descriptions'
                 ), $fields)) > 0)
             ) {
-                require_once($GLOBALS['rootpath'].'okapi/lib/ocpl_access_logs.php');
+                require_once($GLOBALS['rootpath'] . 'okapi/lib/ocpl_access_logs.php');
                 \okapi\OCPLAccessLogs::log_geocache_access($request, $cache_ids);
             }
         }
@@ -1340,7 +1340,7 @@ 
         # Garmin and cannot determine WHY. That's why we won't use captions until we
         # know more.
 
-        $caption = self::$caption_no."";
+        $caption = self::$caption_no . "";
         self::$caption_no++;
         return $caption;
 
@@ -1404,7 +1404,7 @@ 
         # which replicates geocaches!
 
         $site_name = Okapi::get_normalized_site_name();
-        $cache_url = $site_url."viewcache.php?cacheid=$cache_id";
+        $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')
@@ -1424,8 +1424,8 @@ 
             {
                 $note = sprintf(
                     _(
-                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, ".
-                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>, ".
+                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, " .
+                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>, " .
                         "as of %s; all log entries &copy; their authors"
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name, strftime('%x')
@@ -1435,8 +1435,8 @@ 
             {
                 $note = sprintf(
                     _(
-                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, ".
-                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>; ".
+                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, " .
+                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>; " .
                         "all log entries &copy; their authors"
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name

Braces +236 added lines, -171 removed lines

@@ -40,33 +40,42 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_codes = $request->get_parameter('cache_codes');
-        if ($cache_codes === null) throw new ParamMissing('cache_codes');
+        if ($cache_codes === null) {
+            throw new ParamMissing('cache_codes');
+        }
         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
@@ -94,60 +103,77 @@ 
         }
 
         $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)
         {
             $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 ($lpc === null) {
+            $lpc = 10;
+        }
+        if ($lpc == 'all') {
+                    $lpc = null;
+        } else
         {
-            if (!is_numeric($lpc))
-                throw new InvalidParam('lpc', "Invalid number: '$lpc'");
+            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))
         {
             $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).".");
+            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 (!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')
@@ -181,8 +207,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.
@@ -231,10 +256,11 @@ 
                         $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;
@@ -312,12 +338,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,8 +385,9 @@ 
                 }
             }
             $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);
 
@@ -367,8 +401,9 @@ 
                 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;
+            while ($row = Db::fetch_assoc($rs)) {
+                            $tmp[$row['user_id']] = $row;
+            }
             foreach ($results as $cache_code => &$result_ref)
             {
                 $row = $tmp[$owner_ids[$cache_code]];
@@ -384,8 +419,9 @@ 
 
         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 ($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 +437,21 @@ 
                     ".((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 ($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 +464,21 @@ 
                     ".((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 ($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,8 +489,9 @@ 
                     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')
@@ -464,20 +507,23 @@ 
                       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 ($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 +534,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.
@@ -579,27 +627,31 @@ 
             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)) {
+                            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
@@ -635,10 +687,12 @@ 
                     '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;
+                }
             }
         }
 
@@ -653,8 +707,9 @@ 
             {
                 $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.
 
@@ -687,8 +742,9 @@ 
                 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];
+                    }
                 }
             }
         }
@@ -697,8 +753,9 @@ 
 
         if (in_array('latest_logs', $fields))
         {
-            foreach ($results as &$result_ref)
-                $result_ref['latest_logs'] = array();
+            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 ...
@@ -732,8 +789,9 @@ 
             {
                 # User wants some of the latest logs.
                 $tmp = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $tmp[$row['cache_id']][] = $row;
+                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++)
@@ -742,8 +800,7 @@ 
                         $log2cache_map[$rowslist_ref[$i]['uuid']] = $cacheid2wptcode[$rowslist_ref[$i]['cache_id']];
                     }
                 }
-            }
-            else
+            } else
             {
                 # User wants ALL logs.
                 while ($row = Db::fetch_assoc($rs))
@@ -773,18 +830,17 @@ 
                     );
                     foreach ($subset as $log_uuid)
                     {
-                        if ($entries[$log_uuid])
-                            $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                        if ($entries[$log_uuid]) {
+                                                    $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                        }
                     }
                 }
-            }
-            catch (Exception $e)
+            } 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);
@@ -796,10 +852,12 @@ 
 
         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 ($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.
@@ -812,8 +870,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).
 
@@ -852,13 +909,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;
+            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;
+                if (!isset($trs[$cache_code])) {
+                                    continue;
+                }
                 foreach ($trs[$cache_code] as $t)
                 {
                     $result_ref['trackables'][] = array(
@@ -875,10 +934,10 @@ 
             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
@@ -887,14 +946,16 @@ 
                     group by wp
                 ");
                 $tr_counts = new ArrayObject();
-                while ($row = Db::fetch_assoc($rs))
-                    $tr_counts[$row['cache_code']] = $row['count'];
+                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;
+                    if (isset($tr_counts[$cache_code])) {
+                                            $result_ref['trackables_count'] = $tr_counts[$cache_code] + 0;
+                    } else {
+                                            $result_ref['trackables_count'] = 0;
+                    }
                 }
                 unset($tr_counts);
             }
@@ -916,11 +977,11 @@ 
                         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
@@ -934,8 +995,9 @@ 
                 }
             }
 
-            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')
@@ -970,8 +1032,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.
@@ -1117,8 +1178,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
@@ -1135,15 +1197,15 @@ 
                 ");
                 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);
+                    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.
@@ -1172,13 +1234,15 @@ 
 
             if (in_array('country', $fields))
             {
-                foreach ($results as $cache_code => &$row_ref)
-                    $row_ref['country'] = isset($countries[$cache_code]) ? $countries[$cache_code] : null;
+                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;
+                foreach ($results as $cache_code => &$row_ref) {
+                                    $row_ref['state'] = isset($states[$cache_code]) ? $states[$cache_code] : null;
+                }
             }
             unset($countries);
             unset($states);
@@ -1191,12 +1255,13 @@ 
             /* 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
@@ -1222,8 +1287,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.
@@ -1255,8 +1319,7 @@ 
                         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.
@@ -1264,8 +1327,9 @@ 
                 $rs = null;
             }
 
-            foreach ($results as &$result_ref)
-                $result_ref['protection_areas'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['protection_areas'] = array();
+            }
             if ($rs)
             {
                 while ($row = Db::fetch_assoc($rs))
@@ -1280,18 +1344,20 @@ 
         }
 
         # 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)
         {
             # 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 +1367,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. */
 
@@ -1415,8 +1482,7 @@ 
                 _("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));
@@ -1430,8 +1496,7 @@ 
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name, strftime('%x')
                 );
-            }
-            elseif ($type == 'static')
+            } elseif ($type == 'static')
             {
                 $note = sprintf(
                     _(

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

Unused Use Statements -10 removed lines

@@ -2,21 +2,11 @@
 
 namespace okapi\services\caches\map;
 
-use Exception;
-use okapi\Okapi;
-use okapi\Settings;
-use okapi\Cache;
 use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
 use okapi\InvalidParam;
-use okapi\BadRequest;
-use okapi\DoesNotExist;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiInternalConsumer;
 use okapi\OkapiServiceRunner;
-
 use okapi\services\caches\map\TileTree;
 
 require_once 'tiletree.inc.php';

Spacing +28 added lines, -28 removed lines

@@ -73,7 +73,7 @@ 
             from okapi_tile_caches
             where
                 z=0
-                and cache_id = '".Db::escape_string($cache['internal_id'])."'
+                and cache_id = '".Db::escape_string($cache['internal_id']) . "'
         "));
 
         # Caches near the poles caused our computations to break here. We will
@@ -122,7 +122,7 @@ 
 
         Db::execute("
             delete from okapi_tile_caches
-            where cache_id = '".Db::escape_string($cache_id)."'
+            where cache_id = '".Db::escape_string($cache_id) . "'
         ");
 
         # Note, that after this operation, okapi_tile_status may be out-of-date.
@@ -145,8 +145,8 @@ 
 
         $z21x = $row[1];
         $z21y = $row[2];
-        $ex = $z21x >> 8;  # initially, z21x / <tile width>
-        $ey = $z21y >> 8;  # initially, z21y / <tile height>
+        $ex = $z21x >> 8; # initially, z21x / <tile width>
+        $ey = $z21y >> 8; # initially, z21y / <tile height>
         for ($zoom = 21; $zoom >= 0; $zoom--, $ex >>= 1, $ey >>= 1)
         {
             # ($ex, $ey) points to the "exact match" tile. We need to determine
@@ -154,9 +154,9 @@ 
             # go with the simple approach and check all 1+8 bordering tiles.
 
             $tiles_in_this_region = array();
-            for ($x=$ex-1; $x<=$ex+1; $x++)
-                for ($y=$ey-1; $y<=$ey+1; $y++)
-                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
+            for ($x = $ex - 1; $x <= $ex + 1; $x++)
+                for ($y = $ey - 1; $y <= $ey + 1; $y++)
+                    if (($x >= 0) && ($x < 1 << $zoom) && ($y >= 0) && ($y < 1 << $zoom))
                         $tiles_in_this_region[] = array($x, $y);
 
             foreach ($tiles_in_this_region as $coords)
@@ -164,7 +164,7 @@ 
                 list($x, $y) = $coords;
 
                 $scale = 8 + 21 - $zoom;
-                $margin = 1 << ($scale - 3);  # 32px of current $zoom level, measured in z21 pixels.
+                $margin = 1 << ($scale - 3); # 32px of current $zoom level, measured in z21 pixels.
 
                 $left_z21x = ($x << $scale) - $margin;
                 $right_z21x = (($x + 1) << $scale) + $margin;
@@ -195,9 +195,9 @@ 
         {
             list($z, $x, $y) = $coords;
             $alternatives_escaped[] = "(
-                z = '".Db::escape_string($z)."'
-                and x = '".Db::escape_string($x)."'
-                and y = '".Db::escape_string($y)."'
+                z = '".Db::escape_string($z) . "'
+                and x = '".Db::escape_string($x) . "'
+                and y = '".Db::escape_string($y) . "'
             )";
         }
         if (count($alternatives_escaped) > 0)
@@ -208,17 +208,17 @@ 
                 )
                 select
                     z, x, y,
-                    '".Db::escape_string($row[0])."',
-                    '".Db::escape_string($row[1])."',
-                    '".Db::escape_string($row[2])."',
-                    '".Db::escape_string($row[3])."',
-                    '".Db::escape_string($row[4])."',
-                    ".(($row[5] === null) ? "null" : "'".Db::escape_string($row[5])."'").",
-                    '".Db::escape_string($row[6])."',
-                    '".Db::escape_string($row[7])."'
+                    '".Db::escape_string($row[0]) . "',
+                    '".Db::escape_string($row[1]) . "',
+                    '".Db::escape_string($row[2]) . "',
+                    '".Db::escape_string($row[3]) . "',
+                    '".Db::escape_string($row[4]) . "',
+                    ".(($row[5] === null) ? "null" : "'" . Db::escape_string($row[5]) . "'") . ",
+                    '".Db::escape_string($row[6]) . "',
+                    '".Db::escape_string($row[7]) . "'
                 from okapi_tile_status
                 where
-                    (".implode(" or ", $alternatives_escaped).")
+                    (".implode(" or ", $alternatives_escaped) . ")
                     and status in (1,2)
             ");
 
@@ -229,7 +229,7 @@ 
                 update okapi_tile_status
                 set status=2
                 where
-                    (".implode(" or ", $alternatives_escaped).")
+                    (".implode(" or ", $alternatives_escaped) . ")
                     and status=1
             ");
         }
@@ -246,13 +246,13 @@ 
         Db::execute("
             update okapi_tile_caches
             set
-                status = '".Db::escape_string($row[3])."',
-                type = '".Db::escape_string($row[4])."',
-                rating = ".(($row[5] === null) ? "null" : "'".Db::escape_string($row[5])."'").",
-                flags = '".Db::escape_string($row[6])."',
-                name_crc = '".Db::escape_string($row[7])."'
+                status = '".Db::escape_string($row[3]) . "',
+                type = '".Db::escape_string($row[4]) . "',
+                rating = ".(($row[5] === null) ? "null" : "'" . Db::escape_string($row[5]) . "'") . ",
+                flags = '".Db::escape_string($row[6]) . "',
+                name_crc = '".Db::escape_string($row[7]) . "'
             where
-                cache_id = '".Db::escape_string($row[0])."'
+                cache_id = '".Db::escape_string($row[0]) . "'
         ");
     }
 
@@ -263,7 +263,7 @@ 
         $cache_id = Db::select_value("
             select cache_id
             from caches
-            where wp_oc='".Db::escape_string($c['object_key']['code'])."'
+            where wp_oc='".Db::escape_string($c['object_key']['code']) . "'
         ");
         self::remove_geocache_from_cached_tiles($cache_id);
     }

Braces +28 added lines, -21 removed lines

@@ -33,10 +33,11 @@ 
         {
             if ($c['object_type'] == 'geocache')
             {
-                if ($c['change_type'] == 'replace')
-                    self::handle_geocache_replace($c);
-                else
-                    self::handle_geocache_delete($c);
+                if ($c['change_type'] == 'replace') {
+                                    self::handle_geocache_replace($c);
+                } else {
+                                    self::handle_geocache_delete($c);
+                }
             }
         }
     }
@@ -95,19 +96,18 @@ 
             # Aaah, a new geocache! How nice... ;)
 
             self::add_geocache_to_cached_tiles($theirs);
-        }
-        elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2]))  # z21x & z21y fields
+        } elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2])) {
+            # z21x & z21y fields
         {
             # Location changed.
 
             self::remove_geocache_from_cached_tiles($ours[0]);
-            self::add_geocache_to_cached_tiles($theirs);
         }
-        elseif ($ours != $theirs)
+            self::add_geocache_to_cached_tiles($theirs);
+        } elseif ($ours != $theirs)
         {
             self::update_geocache_attributes_in_cached_tiles($theirs);
-        }
-        else
+        } else
         {
             # No need to update anything. This is very common (i.e. when the
             # cache was simply found, not actually changed). Replicate module generates
@@ -154,10 +154,13 @@ 
             # go with the simple approach and check all 1+8 bordering tiles.
 
             $tiles_in_this_region = array();
-            for ($x=$ex-1; $x<=$ex+1; $x++)
-                for ($y=$ey-1; $y<=$ey+1; $y++)
-                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
+            for ($x=$ex-1; $x<=$ex+1; $x++) {
+                            for ($y=$ey-1;
+            }
+            $y<=$ey+1; $y++) {
+                                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
                         $tiles_in_this_region[] = array($x, $y);
+                }
 
             foreach ($tiles_in_this_region as $coords)
             {
@@ -171,14 +174,18 @@ 
                 $top_z21y = ($y << $scale) - $margin;
                 $bottom_z21y = (($y + 1) << $scale) + $margin;
 
-                if ($z21x < $left_z21x)
-                    continue;
-                if ($z21x > $right_z21x)
-                    continue;
-                if ($z21y < $top_z21y)
-                    continue;
-                if ($z21y > $bottom_z21y)
-                    continue;
+                if ($z21x < $left_z21x) {
+                                    continue;
+                }
+                if ($z21x > $right_z21x) {
+                                    continue;
+                }
+                if ($z21y < $top_z21y) {
+                                    continue;
+                }
+                if ($z21y > $bottom_z21y) {
+                                    continue;
+                }
 
                 # We found a match. Store it for later.
 

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

Doc Comments +4 added lines

@@ -55,6 +55,10 @@
         );
     }
 
+    /**
+     * @param OkapiRequest $request
+     * @param string $name
+     */
     private static function require_uint($request, $name, $min_value = 0)
     {
         $val = $request->get_parameter($name);

Unused Use Statements -8 removed lines

@@ -2,26 +2,18 @@
 
 namespace okapi\services\caches\map\tile;
 
-use Exception;
-use okapi\Okapi;
 use okapi\Settings;
 use okapi\Cache;
-use okapi\FileCache;
 use okapi\Db;
 use okapi\OkapiRequest;
 use okapi\OkapiHttpResponse;
 use okapi\ParamMissing;
 use okapi\InvalidParam;
 use okapi\BadRequest;
-use okapi\DoesNotExist;
 use okapi\OkapiInternalRequest;
-use okapi\OkapiInternalConsumer;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiLock;
-
 use okapi\services\caches\map\TileTree;
 use okapi\services\caches\map\TileRenderer;
-use okapi\services\caches\search\SearchAssistant;
 use okapi\OkapiConsumer;
 
 require_once('tiletree.inc.php');

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
 
 require_once('tiletree.inc.php');
 require_once('tilerenderer.inc.php');
-require_once($GLOBALS['rootpath']."okapi/services/caches/search/searching.inc.php");
+require_once($GLOBALS['rootpath'] . "okapi/services/caches/search/searching.inc.php");
 
 class WebService
 {
@@ -88,10 +88,10 @@ 
             throw new InvalidParam('z', "Maximum value for this parameter is 21.");
         $x = self::require_uint($request, 'x');
         $y = self::require_uint($request, 'y');
-        if ($x >= 1<<$zoom)
-            throw new InvalidParam('x', "Should be in 0..".((1<<$zoom) - 1).".");
-        if ($y >= 1<<$zoom)
-            throw new InvalidParam('y', "Should be in 0..".((1<<$zoom) - 1).".");
+        if ($x >= 1 << $zoom)
+            throw new InvalidParam('x', "Should be in 0.." . ((1 << $zoom) - 1) . ".");
+        if ($y >= 1 << $zoom)
+            throw new InvalidParam('y', "Should be in 0.." . ((1 << $zoom) - 1) . ".");
 
         # Now, we will create a search set (or use one previously created).
         # Instead of creating a new OkapiInternalRequest object, we will pass
@@ -128,7 +128,7 @@ 
         {
             # Load user-related cache ids.
 
-            $cache_key = "tileuser/".$request->token->user_id;
+            $cache_key = "tileuser/" . $request->token->user_id;
             $user = self::$USE_OTHER_CACHE ? Cache::get($cache_key) : null;
             if ($user === null)
             {
@@ -139,7 +139,7 @@ 
                 $rs = Db::query("
                     select cache_id
                     from cache_ignore
-                    where user_id = '".Db::escape_string($request->token->user_id)."'
+                    where user_id = '".Db::escape_string($request->token->user_id) . "'
                 ");
                 $user['ignored'] = array();
                 while (list($cache_id) = Db::fetch_row($rs))
@@ -151,9 +151,9 @@ 
                     select distinct cache_id
                     from cache_logs
                     where
-                        user_id = '".Db::escape_string($request->token->user_id)."'
+                        user_id = '".Db::escape_string($request->token->user_id) . "'
                         and type = 1
-                        and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
+                        and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
                 ");
                 $user['found'] = array();
                 while (list($cache_id) = Db::fetch_row($rs))
@@ -164,7 +164,7 @@ 
                 $rs = Db::query("
                     select distinct cache_id
                     from caches
-                    where user_id = '".Db::escape_string($request->token->user_id)."'
+                    where user_id = '".Db::escape_string($request->token->user_id) . "'
                 ");
                 $user['own'] = array();
                 while (list($cache_id) = Db::fetch_row($rs))
@@ -182,9 +182,9 @@ 
                 # the current user is the owner).
 
                 if (isset($user['found'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_FOUND;  # $row[6] is "flags"
+                    $row_ref[6] |= TileTree::$FLAG_FOUND; # $row[6] is "flags"
                 if (isset($user['own'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_OWN;  # $row[6] is "flags"
+                    $row_ref[6] |= TileTree::$FLAG_OWN; # $row[6] is "flags"
             }
         }
 
@@ -199,7 +199,7 @@ 
         $response = new OkapiHttpResponse();
         $response->content_type = $tile->get_content_type();
         $response->cache_control = "Cache-Control: private, max-age=600";
-        $response->etag = 'W/"'.$image_fingerprint.'"';
+        $response->etag = 'W/"' . $image_fingerprint . '"';
         $response->allow_gzip = false; // images are usually compressed, prevent compression at Apache level
 
         # Check if the request didn't include the same ETag.
@@ -218,7 +218,7 @@ 
 
         # Check if the image was recently rendered and is kept in image cache.
 
-        $cache_key = "tile/".$image_fingerprint;
+        $cache_key = "tile/" . $image_fingerprint;
         $response->body = self::$USE_IMAGE_CACHE ? Cache::get($cache_key) : null;
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointC", null,
             microtime(true) - $checkpointC_started);

Braces +35 added lines, -22 removed lines

@@ -58,11 +58,13 @@ 
     private static function require_uint($request, $name, $min_value = 0)
     {
         $val = $request->get_parameter($name);
-        if ($val === null)
-            throw new ParamMissing($name);
+        if ($val === null) {
+                    throw new ParamMissing($name);
+        }
         $ret = intval($val);
-        if ($ret < 0 || ("$ret" !== $val))
-            throw new InvalidParam($name, "Expecting non-negative integer.");
+        if ($ret < 0 || ("$ret" !== $val)) {
+                    throw new InvalidParam($name, "Expecting non-negative integer.");
+        }
         return $ret;
     }
 
@@ -84,14 +86,17 @@ 
         # zoom, x, y - required tile-specific parameters.
 
         $zoom = self::require_uint($request, 'z');
-        if ($zoom > 21)
-            throw new InvalidParam('z', "Maximum value for this parameter is 21.");
+        if ($zoom > 21) {
+                    throw new InvalidParam('z', "Maximum value for this parameter is 21.");
+        }
         $x = self::require_uint($request, 'x');
         $y = self::require_uint($request, 'y');
-        if ($x >= 1<<$zoom)
-            throw new InvalidParam('x', "Should be in 0..".((1<<$zoom) - 1).".");
-        if ($y >= 1<<$zoom)
-            throw new InvalidParam('y', "Should be in 0..".((1<<$zoom) - 1).".");
+        if ($x >= 1<<$zoom) {
+                    throw new InvalidParam('x', "Should be in 0..".((1<<$zoom) - 1).".");
+        }
+        if ($y >= 1<<$zoom) {
+                    throw new InvalidParam('y', "Should be in 0..".((1<<$zoom) - 1).".");
+        }
 
         # Now, we will create a search set (or use one previously created).
         # Instead of creating a new OkapiInternalRequest object, we will pass
@@ -114,8 +119,9 @@ 
         $rows = array();
         if ($rs !== null)
         {
-            while ($row = Db::fetch_row($rs))
-                $rows[] = $row;
+            while ($row = Db::fetch_row($rs)) {
+                            $rows[] = $row;
+            }
             unset($row);
         }
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointA", null,
@@ -142,8 +148,9 @@ 
                     where user_id = '".Db::escape_string($request->token->user_id)."'
                 ");
                 $user['ignored'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['ignored'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['ignored'][$cache_id] = true;
+                }
 
                 # Found caches.
 
@@ -156,8 +163,9 @@ 
                         and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
                 ");
                 $user['found'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['found'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['found'][$cache_id] = true;
+                }
 
                 # Own caches.
 
@@ -167,8 +175,9 @@ 
                     where user_id = '".Db::escape_string($request->token->user_id)."'
                 ");
                 $user['own'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['own'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['own'][$cache_id] = true;
+                }
 
                 Cache::set($cache_key, $user, 30);
             }
@@ -181,10 +190,14 @@ 
                 # to be drawn as found) and the "own" flag (to indicate that
                 # the current user is the owner).
 
-                if (isset($user['found'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_FOUND;  # $row[6] is "flags"
-                if (isset($user['own'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_OWN;  # $row[6] is "flags"
+                if (isset($user['found'][$row_ref[0]])) {
+                                    $row_ref[6] |= TileTree::$FLAG_FOUND;
+                }
+                # $row[6] is "flags"
+                if (isset($user['own'][$row_ref[0]])) {
+                                    $row_ref[6] |= TileTree::$FLAG_OWN;
+                }
+                # $row[6] is "flags"
             }
         }
 

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

Doc Comments +12 added lines

@@ -38,6 +38,7 @@ 
      * Takes the zoom level and the list of geocache descriptions. Note, that
      * $rows_ref can be altered after calling render. If you don't want it to,
      * you should pass a deep copy.
+     * @param integer $zoom
      */
     public function __construct($zoom, &$rows_ref)
     {
@@ -101,6 +102,9 @@ 
         return ob_get_clean();
     }
 
+    /**
+     * @param string $name
+     */
     private static function get_image($name, $opacity=1, $brightness=0,
         $contrast=0, $r=0, $g=0, $b=0)
     {
@@ -157,6 +161,8 @@ 
 
     /**
      * Extremely slow! Remember to cache the result!
+     * @param resource $im
+     * @param integer $ratio
      */
     private static function change_opacity($im, $ratio)
     {
@@ -295,6 +301,9 @@ 
 
     /**
      * Split lines so that they fit inside the specified width.
+     * @param string $font
+     * @param integer $size
+     * @param integer $maxWidth
      */
     private static function wordwrap($font, $size, $maxWidth, $text)
     {
@@ -503,6 +512,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $extended_set
+     */
     private static function get_type_suffix($type, $extended_set)
     {
         switch ($type) {

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Exception;
 use okapi\Okapi;
-use okapi\Settings;
 use okapi\Cache;
 use okapi\Db;
 use okapi\FileCache; // WRTODO

Spacing +42 added lines, -42 removed lines

@@ -101,8 +101,8 @@ 
         return ob_get_clean();
     }
 
-    private static function get_image($name, $opacity=1, $brightness=0,
-        $contrast=0, $r=0, $g=0, $b=0)
+    private static function get_image($name, $opacity = 1, $brightness = 0,
+        $contrast = 0, $r = 0, $g = 0, $b = 0)
     {
         static $locmem_cache = array();
 
@@ -115,7 +115,7 @@ 
 
             try
             {
-                $cache_key = "tilesrc/".Okapi::$git_revision."/".self::$VERSION."/".$key;
+                $cache_key = "tilesrc/" . Okapi::$git_revision . "/" . self::$VERSION . "/" . $key;
                 $gd2_path = self::$USE_STATIC_IMAGE_CACHE
                     ? FileCache::get_file_path($cache_key) : null;
                 if ($gd2_path === null)
@@ -128,7 +128,7 @@ 
             {
                 # Miss again (or error decoding). Read the image from PNG.
 
-                $locmem_cache[$key] = imagecreatefrompng($GLOBALS['rootpath']."okapi/static/tilemap/$name.png");
+                $locmem_cache[$key] = imagecreatefrompng($GLOBALS['rootpath'] . "okapi/static/tilemap/$name.png");
 
                 # Apply all wanted effects.
 
@@ -165,9 +165,9 @@ 
         $w = imagesx($im);
         $h = imagesy($im);
 
-        for($x = 0; $x < $w; $x++)
+        for ($x = 0; $x < $w; $x++)
         {
-            for($y = 0; $y < $h; $y++)
+            for ($y = 0; $y < $h; $y++)
             {
                 $color = imagecolorat($im, $x, $y);
                 $new_color = ((max(0, floor(127 - ((127 - (($color >> 24) & 0x7f)) * $ratio))) & 0x7f) << 24) | ($color & 0x80ffffff);
@@ -247,7 +247,7 @@ 
 
         # Put the inner marker (indicates the type).
 
-        $inner_marker = self::get_image("large_inner_".self::get_type_suffix(
+        $inner_marker = self::get_image("large_inner_" . self::get_type_suffix(
             $type, true), $a, $br, $c, $r, $g, $b);
         imagecopy($this->im, $inner_marker, $px - 7, $py - 22, 0, 0, 16, 16);
 
@@ -287,7 +287,7 @@ 
 
         if ($found)
         {
-            $icon = self::get_image("found", 0.7*$a, $br, $c, $r, $g, $b);
+            $icon = self::get_image("found", 0.7 * $a, $br, $c, $r, $g, $b);
             imagecopy($this->im, $icon, $px - 2, $py - $center_y - 3, 0, 0, 16, 16);
         }
 
@@ -302,16 +302,16 @@ 
         $lines = array();
         $line = "";
         $nextBonus = "";
-        for ($i=0; ($i<count($words)) || (mb_strlen($nextBonus)>0); $i++) {
-            $word = isset($words[$i])?$words[$i]:"";
+        for ($i = 0; ($i < count($words)) || (mb_strlen($nextBonus) > 0); $i++) {
+            $word = isset($words[$i]) ? $words[$i] : "";
             if (mb_strlen($nextBonus) > 0)
-                $word = $nextBonus." ".$word;
+                $word = $nextBonus . " " . $word;
             $nextBonus = "";
             while (true) {
-                $bbox = imagettfbbox($size, 0, $font, $line.$word);
-                $width = $bbox[2]-$bbox[0];
+                $bbox = imagettfbbox($size, 0, $font, $line . $word);
+                $width = $bbox[2] - $bbox[0];
                 if ($width <= $maxWidth) {
-                    $line .= $word." ";
+                    $line .= $word . " ";
                     continue 2;
                 }
                 if (mb_strlen($line) > 0) {
@@ -319,8 +319,8 @@ 
                     $line = "";
                     continue;
                 }
-                $nextBonus = $word[mb_strlen($word)-1].$nextBonus;
-                $word = mb_substr($word, 0, mb_strlen($word)-1);
+                $nextBonus = $word[mb_strlen($word) - 1] . $nextBonus;
+                $word = mb_substr($word, 0, mb_strlen($word) - 1);
                 continue;
             }
         }
@@ -336,16 +336,16 @@ 
     {
         # Check cache.
 
-        $cache_key = "tilecaption/".self::$VERSION."/".$cache_id."/".$name_crc;
+        $cache_key = "tilecaption/" . self::$VERSION . "/" . $cache_id . "/" . $name_crc;
         $gd2 = self::$USE_CAPTIONS_CACHE ? Cache::get($cache_key) : null;
         if ($gd2 === null)
         {
             # We'll work with 16x bigger image to get smoother interpolation.
 
-            $im = imagecreatetruecolor(64*4, 26*4);
+            $im = imagecreatetruecolor(64 * 4, 26 * 4);
             imagealphablending($im, false);
             $transparent = imagecolorallocatealpha($im, 255, 255, 255, 127);
-            imagefilledrectangle($im, 0, 0, 64*4, 26*4, $transparent);
+            imagefilledrectangle($im, 0, 0, 64 * 4, 26 * 4, $transparent);
             imagealphablending($im, true);
 
             # Get the name of the cache.
@@ -353,15 +353,15 @@ 
             $name = Db::select_value("
                 select name
                 from caches
-                where cache_id = '".Db::escape_string($cache_id)."'
+                where cache_id = '".Db::escape_string($cache_id) . "'
             ");
 
             # Split the name into a couple of lines.
 
             //$font = $GLOBALS['rootpath'].'util.sec/bt.ttf';
-            $font = $GLOBALS['rootpath'].'okapi/static/tilemap/tahoma.ttf';
+            $font = $GLOBALS['rootpath'] . 'okapi/static/tilemap/tahoma.ttf';
             $size = 25;
-            $lines = explode("\n", self::wordwrap($font, $size, 64*4 - 6*2, $name));
+            $lines = explode("\n", self::wordwrap($font, $size, 64 * 4 - 6 * 2, $name));
 
             # For each line, compute its (x, y) so that the text is centered.
 
@@ -370,7 +370,7 @@ 
             foreach ($lines as $line)
             {
                 $bbox = imagettfbbox($size, 0, $font, $line);
-                $width = $bbox[2]-$bbox[0];
+                $width = $bbox[2] - $bbox[0];
                 $x = 128 - ($width >> 1);
                 $positions[] = array($x, $y);
                 $y += 36;
@@ -378,7 +378,7 @@ 
             $drawer = function($x, $y, $color) use (&$lines, &$positions, &$im, &$size, &$font)
             {
                 $len = count($lines);
-                for ($i=0; $i<$len; $i++)
+                for ($i = 0; $i < $len; $i++)
                 {
                     $line = $lines[$i];
                     list($offset_x, $offset_y) = $positions[$i];
@@ -389,8 +389,8 @@ 
             # Draw an outline.
 
             $outline_color = imagecolorallocatealpha($im, 255, 255, 255, 80);
-            for ($x=0; $x<=12; $x+=3)
-                for ($y=$size-3; $y<=$size+9; $y+=3)
+            for ($x = 0; $x <= 12; $x += 3)
+                for ($y = $size - 3; $y <= $size + 9; $y += 3)
                     $drawer($x, $y, $outline_color);
 
             # Add a slight shadow effect (on top of the outline).
@@ -406,7 +406,7 @@ 
             imagealphablending($im, false);
             $small = imagecreatetruecolor(64, 26);
             imagealphablending($small, false);
-            imagecopyresampled($small, $im, 0, 0, 0, 0, 64, 26, 64*4, 26*4);
+            imagecopyresampled($small, $im, 0, 0, 0, 0, 64, 26, 64 * 4, 26 * 4);
 
             # Cache it!
 
@@ -433,7 +433,7 @@ 
 
         # Put the marker (indicates the type).
 
-        $marker = self::get_image("medium_".self::get_type_suffix($type, false), $a);
+        $marker = self::get_image("medium_" . self::get_type_suffix($type, false), $a);
         $width = 14;
         $height = 14;
         $center_x = 7;
@@ -490,7 +490,7 @@ 
         {
             # Mark found caches with V.
 
-            $icon = self::get_image("found", 0.7*$a);
+            $icon = self::get_image("found", 0.7 * $a);
             imagecopy($this->im, $icon, $px - ($center_x - $markercenter_x) - 7,
                 $py - ($center_y - $markercenter_y) - 9, 0, 0, 16, 16);
         }
@@ -532,7 +532,7 @@ 
         $own = $flags & TileTree::$FLAG_OWN;
         $new = $flags & TileTree::$FLAG_NEW;
 
-        $marker = self::get_image("tiny_".self::get_type_suffix($type, false));
+        $marker = self::get_image("tiny_" . self::get_type_suffix($type, false));
         $width = 10;
         $height = 10;
         $center_x = 5;
@@ -577,7 +577,7 @@ 
         # This is efficient and yields acceptable results.
 
         $matrix = array();
-        for ($i=0; $i<12; $i++)
+        for ($i = 0; $i < 12; $i++)
             $matrix[] = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
         foreach ($this->rows_ref as &$row_ref)
@@ -586,27 +586,27 @@ 
             $my = ($row_ref[2] + 64) >> 5;
             if (($mx >= 12) || ($my >= 12)) continue;
             if (($matrix[$mx][$my] === 0) && ($row_ref[8] == 1))  # 8 is count
-                $matrix[$mx][$my] = $row_ref[0];  # 0 is cache_id
+                $matrix[$mx][$my] = $row_ref[0]; # 0 is cache_id
             else
                 $matrix[$mx][$my] = -1;
         }
         $selected_cache_ids = array();
-        for ($mx=1; $mx<11; $mx++)
+        for ($mx = 1; $mx < 11; $mx++)
         {
-            for ($my=1; $my<11; $my++)
+            for ($my = 1; $my < 11; $my++)
             {
                 if ($matrix[$mx][$my] > 0)  # cache_id
                 {
                     # Check all adjacent squares.
 
-                    if (   ($matrix[$mx-1][$my-1] === 0)
-                        && ($matrix[$mx-1][$my  ] === 0)
-                        && ($matrix[$mx-1][$my+1] === 0)
-                        && ($matrix[$mx  ][$my-1] === 0)
-                        && ($matrix[$mx  ][$my+1] === 0)
-                        && ($matrix[$mx+1][$my-1] === 0)
-                        && ($matrix[$mx+1][$my  ] === 0)
-                        && ($matrix[$mx+1][$my+1] === 0)
+                    if (($matrix[$mx - 1][$my - 1] === 0)
+                        && ($matrix[$mx - 1][$my] === 0)
+                        && ($matrix[$mx - 1][$my + 1] === 0)
+                        && ($matrix[$mx][$my - 1] === 0)
+                        && ($matrix[$mx][$my + 1] === 0)
+                        && ($matrix[$mx + 1][$my - 1] === 0)
+                        && ($matrix[$mx + 1][$my] === 0)
+                        && ($matrix[$mx + 1][$my + 1] === 0)
                     )
                         $selected_cache_ids[] = $matrix[$mx][$my];
                 }

Braces +77 added lines, -53 removed lines

@@ -74,23 +74,28 @@ 
     {
         # Preprocess the rows.
 
-        if ($this->zoom >= 5)
-            $this->decide_which_get_captions();
+        if ($this->zoom >= 5) {
+                    $this->decide_which_get_captions();
+        }
 
         # Make a background.
 
         $this->im = imagecreatetruecolor(256, 256);
         imagealphablending($this->im, false);
-        if ($this->zoom >= 13) $opacity = 15;
-        elseif ($this->zoom <= 12) $opacity = max(0, $this->zoom * 2 - 14);
+        if ($this->zoom >= 13) {
+            $opacity = 15;
+        } elseif ($this->zoom <= 12) {
+            $opacity = max(0, $this->zoom * 2 - 14);
+        }
         $transparent = imagecolorallocatealpha($this->im, 0, 0, 0, 127 - $opacity);
         imagefilledrectangle($this->im, 0, 0, 256, 256, $transparent);
         imagealphablending($this->im, true);
 
         # Draw the caches.
 
-        foreach ($this->rows_ref as &$row_ref)
-            $this->draw_cache($row_ref);
+        foreach ($this->rows_ref as &$row_ref) {
+                    $this->draw_cache($row_ref);
+        }
 
         # Return the result.
 
@@ -118,13 +123,13 @@ 
                 $cache_key = "tilesrc/".Okapi::$git_revision."/".self::$VERSION."/".$key;
                 $gd2_path = self::$USE_STATIC_IMAGE_CACHE
                     ? FileCache::get_file_path($cache_key) : null;
-                if ($gd2_path === null)
-                    throw new Exception("Not in cache");
+                if ($gd2_path === null) {
+                                    throw new Exception("Not in cache");
+                }
                 # File cache hit. GD2 files are much faster to read than PNGs.
                 # This can throw an Exception (see bug#160).
                 $locmem_cache[$key] = imagecreatefromgd2($gd2_path);
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 # Miss again (or error decoding). Read the image from PNG.
 
@@ -132,12 +137,15 @@ 
 
                 # Apply all wanted effects.
 
-                if ($opacity != 1)
-                    self::change_opacity($locmem_cache[$key], $opacity);
-                if ($contrast != 0)
-                    imagefilter($locmem_cache[$key], IMG_FILTER_CONTRAST, $contrast);
-                if ($brightness != 0)
-                    imagefilter($locmem_cache[$key], IMG_FILTER_BRIGHTNESS, $brightness);
+                if ($opacity != 1) {
+                                    self::change_opacity($locmem_cache[$key], $opacity);
+                }
+                if ($contrast != 0) {
+                                    imagefilter($locmem_cache[$key], IMG_FILTER_CONTRAST, $contrast);
+                }
+                if ($brightness != 0) {
+                                    imagefilter($locmem_cache[$key], IMG_FILTER_BRIGHTNESS, $brightness);
+                }
                 if (($r != 0) || ($g != 0) || ($b != 0))
                 {
                     imagefilter($locmem_cache[$key], IMG_FILTER_GRAYSCALE);
@@ -182,12 +190,13 @@ 
     {
         $capt = ($cache_struct[6] & TileTree::$FLAG_DRAW_CAPTION);
 
-        if (($this->zoom <= 8) && (!$capt))
-            $this->draw_cache_tiny($cache_struct);
-        elseif (($this->zoom <= 13) && (!$capt))
-            $this->draw_cache_medium($cache_struct);
-        else
-            $this->draw_cache_large($cache_struct);
+        if (($this->zoom <= 8) && (!$capt)) {
+                    $this->draw_cache_tiny($cache_struct);
+        } elseif (($this->zoom <= 13) && (!$capt)) {
+                    $this->draw_cache_medium($cache_struct);
+        } else {
+                    $this->draw_cache_large($cache_struct);
+        }
 
         # Put caption (this flag is set only when there is plenty of space around).
 
@@ -241,8 +250,9 @@ 
         $markercenter_x = 12;
         $markercenter_y = 12;
 
-        if ($count > 1)
-            imagecopy($this->im, $outer_marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
+        if ($count > 1) {
+                    imagecopy($this->im, $outer_marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
+        }
         imagecopy($this->im, $outer_marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
 
         # Put the inner marker (indicates the type).
@@ -304,8 +314,9 @@ 
         $nextBonus = "";
         for ($i=0; ($i<count($words)) || (mb_strlen($nextBonus)>0); $i++) {
             $word = isset($words[$i])?$words[$i]:"";
-            if (mb_strlen($nextBonus) > 0)
-                $word = $nextBonus." ".$word;
+            if (mb_strlen($nextBonus) > 0) {
+                            $word = $nextBonus." ".$word;
+            }
             $nextBonus = "";
             while (true) {
                 $bbox = imagettfbbox($size, 0, $font, $line.$word);
@@ -324,8 +335,9 @@ 
                 continue;
             }
         }
-        if (mb_strlen($line) > 0)
-            $lines[] = trim($line);
+        if (mb_strlen($line) > 0) {
+                    $lines[] = trim($line);
+        }
         return implode("\n", $lines);
     }
 
@@ -389,9 +401,12 @@ 
             # Draw an outline.
 
             $outline_color = imagecolorallocatealpha($im, 255, 255, 255, 80);
-            for ($x=0; $x<=12; $x+=3)
-                for ($y=$size-3; $y<=$size+9; $y+=3)
-                    $drawer($x, $y, $outline_color);
+            for ($x=0; $x<=12; $x+=3) {
+                            for ($y=$size-3;
+            }
+            $y<=$size+9; $y+=3) {
+                                    $drawer($x, $y, $outline_color);
+                }
 
             # Add a slight shadow effect (on top of the outline).
 
@@ -426,10 +441,11 @@ 
         $found = $flags & TileTree::$FLAG_FOUND;
         $own = $flags & TileTree::$FLAG_OWN;
         $new = $flags & TileTree::$FLAG_NEW;
-        if ($found && (!($flags & TileTree::$FLAG_DRAW_CAPTION)))
-            $a = .35;
-        else
-            $a = 1;
+        if ($found && (!($flags & TileTree::$FLAG_DRAW_CAPTION))) {
+                    $a = .35;
+        } else {
+                    $a = 1;
+        }
 
         # Put the marker (indicates the type).
 
@@ -445,11 +461,12 @@ 
         {
             imagecopy($this->im, $marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($status == 1)  # don't put the marker for unavailable caches (X only)
+        } elseif ($status == 1) {
+            # don't put the marker for unavailable caches (X only)
         {
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
         }
+        }
 
         # If the cache is unavailable, mark it with X.
 
@@ -485,16 +502,14 @@ 
 
             $overlay = self::get_image("medium_overlay_own");
             imagecopy($this->im, $overlay, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($found)
+        } elseif ($found)
         {
             # Mark found caches with V.
 
             $icon = self::get_image("found", 0.7*$a);
             imagecopy($this->im, $icon, $px - ($center_x - $markercenter_x) - 7,
                 $py - ($center_y - $markercenter_y) - 9, 0, 0, 16, 16);
-        }
-        elseif ($new)
+        } elseif ($new)
         {
             # Mark new caches with additional overlay.
 
@@ -546,8 +561,7 @@ 
         {
             imagecopy($this->im, $marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($status == 1)
+        } elseif ($status == 1)
         {
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
         }
@@ -577,25 +591,33 @@ 
         # This is efficient and yields acceptable results.
 
         $matrix = array();
-        for ($i=0; $i<12; $i++)
-            $matrix[] = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        for ($i=0; $i<12; $i++) {
+                    $matrix[] = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        }
 
         foreach ($this->rows_ref as &$row_ref)
         {
             $mx = ($row_ref[1] + 64) >> 5;
             $my = ($row_ref[2] + 64) >> 5;
-            if (($mx >= 12) || ($my >= 12)) continue;
-            if (($matrix[$mx][$my] === 0) && ($row_ref[8] == 1))  # 8 is count
-                $matrix[$mx][$my] = $row_ref[0];  # 0 is cache_id
-            else
-                $matrix[$mx][$my] = -1;
+            if (($mx >= 12) || ($my >= 12)) {
+                continue;
+            }
+            if (($matrix[$mx][$my] === 0) && ($row_ref[8] == 1)) {
+                # 8 is count
+                $matrix[$mx][$my] = $row_ref[0];
+            }
+            # 0 is cache_id
+            else {
+                            $matrix[$mx][$my] = -1;
+            }
         }
         $selected_cache_ids = array();
         for ($mx=1; $mx<11; $mx++)
         {
             for ($my=1; $my<11; $my++)
             {
-                if ($matrix[$mx][$my] > 0)  # cache_id
+                if ($matrix[$mx][$my] > 0) {
+                    # cache_id
                 {
                     # Check all adjacent squares.
 
@@ -610,12 +632,14 @@ 
                     )
                         $selected_cache_ids[] = $matrix[$mx][$my];
                 }
+                }
             }
         }
 
-        foreach ($this->rows_ref as &$row_ref)
-            if (in_array($row_ref[0], $selected_cache_ids))
+        foreach ($this->rows_ref as &$row_ref) {
+                    if (in_array($row_ref[0], $selected_cache_ids))
                 $row_ref[6] |= TileTree::$FLAG_DRAW_CAPTION;
+        }
     }
 
 }
\ No newline at end of file

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

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
      * Note that $pixels can also be negative or >=256 (up to a margin of 32px).
      * Count is the number of other caches "eclipsed" by this geocache (such
      * eclipsed geocaches are not included in the result).
+     * @param integer $zoom
+     * @param integer $x
+     * @param integer $y
      */
     public static function query_fast($zoom, $x, $y, $set_id)
     {

Unused Use Statements -8 removed lines

@@ -4,19 +4,11 @@
 
 use Exception;
 use okapi\Okapi;
-use okapi\Settings;
 use okapi\Cache;
 use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\BadRequest;
-use okapi\DoesNotExist;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiInternalConsumer;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiLock;
 
 
 class TileTree

Indentation +1 added lines, -1 removed lines

@@ -312,7 +312,7 @@
          * avoid MySQL casting negative values to 0, we'll do an additional
          * abs on it. */
 
-         return abs(crc32($name));
+            return abs(crc32($name));
     }
 
     private static function latlon_to_z21xy($lat, $lon)

Spacing +34 added lines, -34 removed lines

@@ -41,9 +41,9 @@ 
             select status
             from okapi_tile_status
             where
-                z = '".Db::escape_string($zoom)."'
-                and x = '".Db::escape_string($x)."'
-                and y = '".Db::escape_string($y)."'
+                z = '".Db::escape_string($zoom) . "'
+                and x = '".Db::escape_string($x) . "'
+                and y = '".Db::escape_string($y) . "'
         ");
     }
 
@@ -83,9 +83,9 @@ 
         $tile_upper_x = $x << 8;
         $tile_leftmost_y = $y << 8;
 
-        $zoom_escaped = "'".Db::escape_string($zoom)."'";
-        $tile_upper_x_escaped = "'".Db::escape_string($tile_upper_x)."'";
-        $tile_leftmost_y_escaped = "'".Db::escape_string($tile_leftmost_y)."'";
+        $zoom_escaped = "'" . Db::escape_string($zoom) . "'";
+        $tile_upper_x_escaped = "'" . Db::escape_string($tile_upper_x) . "'";
+        $tile_leftmost_y_escaped = "'" . Db::escape_string($tile_leftmost_y) . "'";
         return Db::query("
             select
                 otc.cache_id,
@@ -97,10 +97,10 @@ 
                 okapi_search_results osr
             where
                 z = $zoom_escaped
-                and x = '".Db::escape_string($x)."'
-                and y = '".Db::escape_string($y)."'
+                and x = '" . Db::escape_string($x) . "'
+                and y = '".Db::escape_string($y) . "'
                 and otc.cache_id = osr.cache_id
-                and osr.set_id = '".Db::escape_string($set_id)."'
+                and osr.set_id = '".Db::escape_string($set_id) . "'
             group by
                 z21x >> (3 + (21 - $zoom_escaped)),
                 z21y >> (3 + (21 - $zoom_escaped))
@@ -135,8 +135,8 @@ 
             # but there is *no need* to - this query is run seldom and is cached.
 
             $params = array();
-            $params['status'] = "Available|Temporarily unavailable|Archived";  # we want them all
-            $params['limit'] = "10000000";  # no limit
+            $params['status'] = "Available|Temporarily unavailable|Archived"; # we want them all
+            $params['limit'] = "10000000"; # no limit
 
             $internal_request = new OkapiInternalRequest(new OkapiInternalConsumer(), null, $params);
             $internal_request->skip_limits = true;
@@ -162,14 +162,14 @@ 
                         z, x, y, cache_id, z21x, z21y, status, type, rating, flags, name_crc
                     ) values (
                         0, 0, 0,
-                        '".Db::escape_string($row[0])."',
-                        '".Db::escape_string($row[1])."',
-                        '".Db::escape_string($row[2])."',
-                        '".Db::escape_string($row[3])."',
-                        '".Db::escape_string($row[4])."',
-                        ".(($row[5] === null) ? "null" : "'".Db::escape_string($row[5])."'").",
-                        '".Db::escape_string($row[6])."',
-                        '".Db::escape_string($row[7])."'
+                        '".Db::escape_string($row[0]) . "',
+                        '".Db::escape_string($row[1]) . "',
+                        '".Db::escape_string($row[2]) . "',
+                        '".Db::escape_string($row[3]) . "',
+                        '".Db::escape_string($row[4]) . "',
+                        ".(($row[5] === null) ? "null" : "'" . Db::escape_string($row[5]) . "'") . ",
+                        '".Db::escape_string($row[6]) . "',
+                        '".Db::escape_string($row[7]) . "'
                     );
                 ");
             }
@@ -229,31 +229,31 @@ 
                             flags, name_crc
                         )
                         select
-                            '".Db::escape_string($zoom)."',
-                            '".Db::escape_string($x)."',
-                            '".Db::escape_string($y)."',
+                            '".Db::escape_string($zoom) . "',
+                            '".Db::escape_string($x) . "',
+                            '".Db::escape_string($y) . "',
                             cache_id, z21x, z21y, status, type, rating,
                             flags, name_crc
                         from okapi_tile_caches tc2
                         where
-                            z = '".Db::escape_string($parent_zoom)."'
-                            and x = '".Db::escape_string($parent_x)."'
-                            and y = '".Db::escape_string($parent_y)."'
+                            z = '".Db::escape_string($parent_zoom) . "'
+                            and x = '".Db::escape_string($parent_x) . "'
+                            and y = '".Db::escape_string($parent_y) . "'
                             and z21x between $left_z21x and $right_z21x
                             and z21y between $top_z21y and $bottom_z21y
                     ");
                     Db::execute("unlock tables;");
                 } catch (Exception $e) {
-                    Db::execute("unlock tables");  // No "finally" in PHP 5.3
+                    Db::execute("unlock tables"); // No "finally" in PHP 5.3
                     throw $e;
                 }
                 $test = Db::select_value("
                     select 1
                     from okapi_tile_caches
                     where
-                        z = '".Db::escape_string($zoom)."'
-                        and x = '".Db::escape_string($x)."'
-                        and y = '".Db::escape_string($y)."'
+                        z = '".Db::escape_string($zoom) . "'
+                        and x = '".Db::escape_string($x) . "'
+                        and y = '".Db::escape_string($y) . "'
                     limit 1;
                 ");
                 if ($test)
@@ -268,10 +268,10 @@ 
         Db::execute("
             replace into okapi_tile_status (z, x, y, status)
             values (
-                '".Db::escape_string($zoom)."',
-                '".Db::escape_string($x)."',
-                '".Db::escape_string($y)."',
-                '".Db::escape_string($status)."'
+                '".Db::escape_string($zoom) . "',
+                '".Db::escape_string($x) . "',
+                '".Db::escape_string($y) . "',
+                '".Db::escape_string($status) . "'
             );
         ");
 
@@ -319,7 +319,7 @@ 
     {
         $offset = 128 << 21;
         $x = round($offset + ($offset * $lon / 180));
-        $y = round($offset - $offset/pi() * log((1 + sin($lat * pi() / 180)) / (1 - sin($lat * pi() / 180))) / 2);
+        $y = round($offset - $offset / pi() * log((1 + sin($lat * pi() / 180)) / (1 - sin($lat * pi() / 180))) / 2);
         return array($x, $y);
     }
 }
\ No newline at end of file

Braces +40 added lines, -22 removed lines

@@ -64,19 +64,23 @@ 
         # (and if it was, was it empty).
 
         $status = self::get_tile_status($zoom, $x, $y);
-        if ($status === null)  # Not yet computed.
+        if ($status === null) {
+            # Not yet computed.
         {
             # Note, that computing the tile does not involve taking any
             # search parameters.
 
             $status = self::compute_tile($zoom, $x, $y);
         }
+        }
 
-        if ($status === 1)  # Computed and empty.
+        if ($status === 1) {
+            # Computed and empty.
         {
             # This tile was already computed and it is empty.
             return null;
         }
+        }
 
         # If we got here, then the tile is computed and not empty (status 2).
 
@@ -121,8 +125,9 @@ 
         # For low-level tiles, this can be expensive.
 
         $status = self::get_tile_status($zoom, $x, $y);
-        if ($status !== null)
-            return $status;
+        if ($status !== null) {
+                    return $status;
+        }
 
         if ($zoom === 0)
         {
@@ -174,8 +179,7 @@ 
                 ");
             }
             $status = 2;
-        }
-        else
+        } else
         {
             # We will use the parent tile to compute the contents of this tile.
 
@@ -184,19 +188,23 @@ 
             $parent_y = $y >> 1;
 
             $status = self::get_tile_status($parent_zoom, $parent_x, $parent_y);
-            if ($status === null)  # Not computed.
+            if ($status === null) {
+                # Not computed.
             {
                 $time_started = microtime(true);
+            }
                 $status = self::compute_tile($parent_zoom, $parent_x, $parent_y);
             }
 
-            if ($status === 1)  # Computed and empty.
+            if ($status === 1) {
+                # Computed and empty.
             {
                 # No need to check.
             }
             else  # Computed, not empty.
             {
                 $scale = 8 + 21 - $zoom;
+            }
                 $parentcenter_z21x = (($parent_x << 1) | 1) << $scale;
                 $parentcenter_z21y = (($parent_y << 1) | 1) << $scale;
                 $margin = 1 << ($scale - 2);
@@ -209,14 +217,20 @@ 
                 # |1 2|
                 # |3 4|
 
-                if ($x & 1)  # 2 or 4
+                if ($x & 1) {
+                    # 2 or 4
                     $left_z21x = $parentcenter_z21x - $margin;
-                else  # 1 or 3
+                } else {
+                    # 1 or 3
                     $right_z21x = $parentcenter_z21x + $margin;
-                if ($y & 1)  # 3 or 4
+                }
+                if ($y & 1) {
+                    # 3 or 4
                     $top_z21y = $parentcenter_z21y - $margin;
-                else  # 1 or 2
+                } else {
+                    # 1 or 2
                     $bottom_z21y = $parentcenter_z21y + $margin;
+                }
 
                 # Cache the result.
 
@@ -256,10 +270,11 @@ 
                         and y = '".Db::escape_string($y)."'
                     limit 1;
                 ");
-                if ($test)
-                    $status = 2;
-                else
-                    $status = 1;
+                if ($test) {
+                                    $status = 2;
+                } else {
+                                    $status = 1;
+                }
             }
         }
 
@@ -294,12 +309,15 @@ 
             return false;
         }
         $flags = 0;
-        if (($cache['founds'] > 6) && (($cache['recommendations'] / $cache['founds']) > 0.3))
-            $flags |= self::$FLAG_STAR;
-        if ($cache['trackables_count'] > 0)
-            $flags |= self::$FLAG_HAS_TRACKABLES;
-        if ($cache['founds'] == 0)
-            $flags |= self::$FLAG_NOT_YET_FOUND;
+        if (($cache['founds'] > 6) && (($cache['recommendations'] / $cache['founds']) > 0.3)) {
+                    $flags |= self::$FLAG_STAR;
+        }
+        if ($cache['trackables_count'] > 0) {
+                    $flags |= self::$FLAG_HAS_TRACKABLES;
+        }
+        if ($cache['founds'] == 0) {
+                    $flags |= self::$FLAG_NOT_YET_FOUND;
+        }
         return array($cache['internal_id'], $z21x, $z21y, Okapi::cache_status_name2id($cache['status']),
             Okapi::cache_type_name2id($cache['type']), $cache['rating'], $flags,
             self::compute_name_crc($cache['name']));

htdocs/okapi/services/caches/save_personal_notes.php

Doc Comments +3 added lines

@@ -108,6 +108,9 @@
         return $str1 == $str2;
     }
 
+    /**
+     * @param string $new_notes
+     */
     private static function update_notes($cache_id, $user_id, $new_notes)
     {
         if (Settings::get('OC_BRANCH') == 'oc.de')

Unused Use Statements -4 removed lines

@@ -2,16 +2,12 @@
 
 namespace okapi\services\caches\save_personal_notes;
 
-use Exception;
 use okapi\Okapi;
 use okapi\Db;
 use okapi\OkapiRequest;
 use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\BadRequest;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiAccessToken;
 use okapi\Settings;
 
 

Spacing +24 added lines, -24 removed lines

@@ -85,7 +85,7 @@ 
 
             /* APPEND mode */
 
-            $ret_saved_value = trim($current_value)."\n\n".trim($new_value);
+            $ret_saved_value = trim($current_value) . "\n\n" . trim($new_value);
             self::update_notes($cache_id, $request->token->user_id, $ret_saved_value);
         }
 
@@ -123,11 +123,11 @@ 
                 from coordinates
                 where
                     type = 2  -- personal note
-                    and cache_id = '".Db::escape_string($cache_id)."'
-                    and user_id = '".Db::escape_string($user_id)."'
+                    and cache_id = '".Db::escape_string($cache_id) . "'
+                    and user_id = '".Db::escape_string($user_id) . "'
             ");
             $id = null;
-            if($row = Db::fetch_assoc($rs)) {
+            if ($row = Db::fetch_assoc($rs)) {
                 $id = $row['id'];
             }
             if ($id == null) {
@@ -137,17 +137,17 @@ 
                         description
                     ) values (
                         2, 0, 0,
-                        '".Db::escape_string($cache_id)."',
-                        '".Db::escape_string($user_id)."',
-                        '".Db::escape_string($new_notes)."'
+                        '".Db::escape_string($cache_id) . "',
+                        '".Db::escape_string($user_id) . "',
+                        '".Db::escape_string($new_notes) . "'
                     )
                 ");
             } else {
                 Db::query("
                     update coordinates
-                    set description = '".Db::escape_string($new_notes)."'
+                    set description = '".Db::escape_string($new_notes) . "'
                     where
-                        id = '".Db::escape_string($id)."'
+                        id = '".Db::escape_string($id) . "'
                         and type = 2
                 ");
             }
@@ -158,11 +158,11 @@ 
                 select max(note_id) as id
                 from cache_notes
                 where
-                    cache_id = '".Db::escape_string($cache_id)."'
-                    and user_id = '".Db::escape_string($user_id)."'
+                    cache_id = '".Db::escape_string($cache_id) . "'
+                    and user_id = '".Db::escape_string($user_id) . "'
             ");
             $id = null;
-            if($row = Db::fetch_assoc($rs)) {
+            if ($row = Db::fetch_assoc($rs)) {
                 $id = $row['id'];
             }
             if ($id == null) {
@@ -170,20 +170,20 @@ 
                     insert into cache_notes (
                         cache_id, user_id, date, desc_html, `desc`
                     ) values (
-                        '".Db::escape_string($cache_id)."',
-                        '".Db::escape_string($user_id)."',
+                        '".Db::escape_string($cache_id) . "',
+                        '".Db::escape_string($user_id) . "',
                         NOW(), 0,
-                        '".Db::escape_string($new_notes)."'
+                        '".Db::escape_string($new_notes) . "'
                     )
                 ");
             } else {
                 Db::query("
                     update cache_notes
                     set
-                        `desc` = '".Db::escape_string($new_notes)."',
+                        `desc` = '".Db::escape_string($new_notes) . "',
                         desc_html = 0,
                         date = NOW()
-                    where note_id = '".Db::escape_string($id)."'
+                    where note_id = '".Db::escape_string($id) . "'
                 ");
             }
         }
@@ -197,12 +197,12 @@ 
                 delete from coordinates
                 where
                     type = 2  -- personal note
-                    and cache_id = '".Db::escape_string($cache_id)."'
-                    and user_id = '".Db::escape_string($user_id)."'
+                    and cache_id = '".Db::escape_string($cache_id) . "'
+                    and user_id = '".Db::escape_string($user_id) . "'
                     and longitude = 0
                     and latitude = 0
             ");
-            if (Db::get_affected_row_count() <= 0){
+            if (Db::get_affected_row_count() <= 0) {
                 # no rows deleted - record either doesn't exist, or has coords
                 # remove only description
                 Db::execute("
@@ -210,16 +210,16 @@ 
                     set description = null
                     where
                         type = 2
-                        and cache_id = '".Db::escape_string($cache_id)."'
-                        and user_id = '".Db::escape_string($user_id)."'
+                        and cache_id = '".Db::escape_string($cache_id) . "'
+                        and user_id = '".Db::escape_string($user_id) . "'
                 ");
             }
         } else {  # oc.pl branch
             Db::execute("
                 delete from cache_notes
                 where
-                    cache_id = '".Db::escape_string($cache_id)."'
-                    and user_id = '".Db::escape_string($user_id)."'
+                    cache_id = '".Db::escape_string($cache_id) . "'
+                    and user_id = '".Db::escape_string($user_id) . "'
             ");
         }
     }

Braces +16 added lines, -12 removed lines

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

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

Doc Comments +2 added lines

@@ -24,6 +24,7 @@ 
     /**
      * Get [set_id, date_created, expires] for the given params_hash
      * (or [null, null, null] if not found).
+     * @param string $params_hash
      */
     private static function find_param_set($params_hash, $ref_max_age)
     {
@@ -92,6 +93,7 @@ 
     /**
      * Important: YOU HAVE TO make sure $tables and $where_conds don't contain
      * unescaped user-supplied data!
+     * @param string[] $tables
      */
     public static function get_set($tables, $joins, $where_conds, $min_store, $ref_max_age)
     {

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 
 use okapi\Okapi;
 use okapi\OkapiRequest;
-use okapi\ParamMissing;
 use okapi\InvalidParam;
 use okapi\Db;
 use okapi\OkapiLock;

Spacing +12 added lines, -12 removed lines

@@ -34,8 +34,8 @@ 
                 unix_timestamp(expires) as expires
             from okapi_search_sets
             where
-                params_hash = '".Db::escape_string($params_hash)."'
-                and date_add(date_created, interval '".Db::escape_string($ref_max_age)."' second) > now()
+                params_hash = '".Db::escape_string($params_hash) . "'
+                and date_add(date_created, interval '".Db::escape_string($ref_max_age) . "' second) > now()
             order by id desc
             limit 1
         ");
@@ -51,7 +51,7 @@ 
         $tmp = $request->get_parameter('min_store');
         if ($tmp === null) $tmp = "300";
         $min_store = intval($tmp);
-        if (("$min_store" !== $tmp) ||($min_store < 0) || ($min_store > 64800))
+        if (("$min_store" !== $tmp) || ($min_store < 0) || ($min_store > 64800))
             throw new InvalidParam('min_store', "Has to be in the 0..64800 range.");
 
         $tmp = $request->get_parameter('ref_max_age');
@@ -128,7 +128,7 @@ 
                         values (
                             'processing in progress',
                             now(),
-                            date_add(now(), interval '".Db::escape_string($min_store + 60)."' second)
+                            date_add(now(), interval '".Db::escape_string($min_store + 60) . "' second)
                         )
                     ");
                     $set_id = Db::last_insert_id();
@@ -137,12 +137,12 @@ 
                     Db::execute("
                         insert into okapi_search_results (set_id, cache_id)
                         select distinct
-                            '".Db::escape_string($set_id)."',
+                            '".Db::escape_string($set_id) . "',
                             caches.cache_id
                         from
-                            ".implode(", ", $tables)."
-                            ".implode(" ", $joins)."
-                        where (".implode(") and (", $where_conds).")
+                            ".implode(", ", $tables) . "
+                            ".implode(" ", $joins) . "
+                        where (".implode(") and (", $where_conds) . ")
                     ");
 
                     # Lock barrier, to make sure the data is visible by other
@@ -153,8 +153,8 @@ 
 
                     Db::execute("
                         update okapi_search_sets
-                        set params_hash = '".Db::escape_string($params_hash)."'
-                        where id = '".Db::escape_string($set_id)."'
+                        set params_hash = '".Db::escape_string($params_hash) . "'
+                        where id = '".Db::escape_string($set_id) . "'
                     ");
                 } else {
                     # Some other thread acquired the lock before us and it has
@@ -178,8 +178,8 @@ 
         {
             Db::execute("
                 update okapi_search_sets
-                set expires = date_add(now(), interval '".Db::escape_string($min_store + 60)."' second)
-                where id = '".Db::escape_string($set_id)."'
+                set expires = date_add(now(), interval '".Db::escape_string($min_store + 60) . "' second)
+                where id = '".Db::escape_string($set_id) . "'
             ");
         }
 

Braces +24 added lines, -15 removed lines

@@ -39,8 +39,9 @@ 
             order by id desc
             limit 1
         ");
-        if ($tmp === null)
-            return array(null, null, null);
+        if ($tmp === null) {
+                    return array(null, null, null);
+        }
         return array($tmp['id'], $tmp['date_created'], $tmp['expires']);
     }
 
@@ -49,17 +50,25 @@ 
         # "Cache control" parameters.
 
         $tmp = $request->get_parameter('min_store');
-        if ($tmp === null) $tmp = "300";
+        if ($tmp === null) {
+            $tmp = "300";
+        }
         $min_store = intval($tmp);
-        if (("$min_store" !== $tmp) ||($min_store < 0) || ($min_store > 64800))
-            throw new InvalidParam('min_store', "Has to be in the 0..64800 range.");
+        if (("$min_store" !== $tmp) ||($min_store < 0) || ($min_store > 64800)) {
+                    throw new InvalidParam('min_store', "Has to be in the 0..64800 range.");
+        }
 
         $tmp = $request->get_parameter('ref_max_age');
-        if ($tmp === null) $tmp = "300";
-        if ($tmp == "nolimit") $tmp = "9999999";
+        if ($tmp === null) {
+            $tmp = "300";
+        }
+        if ($tmp == "nolimit") {
+            $tmp = "9999999";
+        }
         $ref_max_age = intval($tmp);
-        if (("$ref_max_age" !== $tmp) || ($ref_max_age < 300))
-            throw new InvalidParam('ref_max_age', "Has to be >=300.");
+        if (("$ref_max_age" !== $tmp) || ($ref_max_age < 300)) {
+                    throw new InvalidParam('ref_max_age', "Has to be >=300.");
+        }
 
         # Search params.
 
@@ -75,10 +84,11 @@ 
             $search_params['where_conds']
         );
 
-        if (isset($search_params['extra_joins']) && is_array($search_params['extra_joins']))
-            $joins = $search_params['extra_joins'];
-        else
-            $joins = array();
+        if (isset($search_params['extra_joins']) && is_array($search_params['extra_joins'])) {
+                    $joins = $search_params['extra_joins'];
+        } else {
+                    $joins = array();
+        }
 
         unset($search_params);
 
@@ -161,8 +171,7 @@ 
                     # generated the result set. We don't need to do anything.
                 }
                 $lock->release();
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 # SQL error? Make sure the lock is released and rethrow.
 

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

Doc Comments +4 added lines

@@ -284,6 +284,10 @@
     }
 
 
+    /**
+     * @param string $image_uuid
+     * @param string $file_ext
+     */
     private static function db_insert_image(
         $consumer_key, $user_id,
         $log_internal_id, $image_uuid, $position, $caption, $is_spoiler, $file_ext)

Spacing +30 added lines, -30 removed lines

@@ -53,12 +53,12 @@ 
         $rs = Db::query("
             select id, node, user_id
             from cache_logs
-            where uuid = '".Db::escape_string($log_uuid)."'"
+            where uuid = '".Db::escape_string($log_uuid) . "'"
         );
         $row = Db::fetch_assoc($rs);
         Db::free_result($rs);
         if (!$row)
-            throw new InvalidParam('log_uuid', "There is no log entry with uuid '".$log_uuid."'.");
+            throw new InvalidParam('log_uuid', "There is no log entry with uuid '" . $log_uuid . "'.");
         if ($row['node'] != Settings::get('OC_NODE_ID')) {
             throw new Exception(
                 "This site's database contains the log entry '$log_uuid' which has been"
@@ -116,7 +116,7 @@ 
             throw new InvalidParam('image', "bad base64 encoding");
 
         try {
-            $image_properties = getimagesizefromstring($image);  # can throw
+            $image_properties = getimagesizefromstring($image); # can throw
             if (!$image_properties)
                 throw new Exception();
             list($width, $height, $image_type) = $image_properties;
@@ -148,7 +148,7 @@ 
             ));
         }
         try {
-            $image = imagecreatefromstring($image);  # can throw
+            $image = imagecreatefromstring($image); # can throw
             if (!$image) throw new Exception();
         }
         catch (Exception $e) {
@@ -167,23 +167,23 @@ 
         #   - eliminate any data flaws which have may been in the source files.
 
         $image_uuid = Okapi::create_uuid();
-        $imagepath = Settings::get('IMAGES_DIR').'/'.$image_uuid;
+        $imagepath = Settings::get('IMAGES_DIR') . '/' . $image_uuid;
         switch ($image_type)
         {
             case IMAGETYPE_JPEG:
                 $file_ext = '.jpg';
                 $quality = Settings::get('JPEG_QUALITY');
-                $result = imagejpeg($image, $imagepath.$file_ext, $quality);
+                $result = imagejpeg($image, $imagepath . $file_ext, $quality);
                 break;
 
             case IMAGETYPE_PNG:
                 $file_ext = '.png';
-                $result = imagepng($image, $imagepath.$file_ext);
+                $result = imagepng($image, $imagepath . $file_ext);
                 break;
 
             case IMAGETYPE_GIF:
                 $file_ext = '.gif';
-                $result = imagegif($image, $imagepath.$file_ext);
+                $result = imagegif($image, $imagepath . $file_ext);
                 break;
 
             default:
@@ -191,7 +191,7 @@ 
                 $result = false;
         }
         if (!$result)
-            throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+            throw new Exception("could not save image file '" . $imagepath . $file_ext . "'");
 
         # insert image into database
 
@@ -208,7 +208,7 @@ 
             # (which is very unlikely, and will just add a bit more of garbage
             # to that which is already present in the images directory).
 
-            try { unlink($imagepath.$file_ext); }
+            try { unlink($imagepath . $file_ext); }
             catch (Exception $e2) {}
             throw $e;
         }
@@ -224,11 +224,11 @@ 
 
     private static function max_pixels($base64_image)
     {
-        $bytes_per_pixel = 5;   # GD needs 5 bytes per pixel for "true color"
+        $bytes_per_pixel = 5; # GD needs 5 bytes per pixel for "true color"
         $available_memory = Okapi::php_ini_get_bytes('memory_limit') - memory_get_usage();
-        $available_memory -= 16 * 1024 * 1024;  # reserve
-        $available_memory -= strlen($base64_image);  # will be copied for EXIF processing
-        $available_memory -= 3 * $bytes_per_pixel * Settings::get('IMAGE_MAX_PIXEL_COUNT');  # processing buffers
+        $available_memory -= 16 * 1024 * 1024; # reserve
+        $available_memory -= strlen($base64_image); # will be copied for EXIF processing
+        $available_memory -= 3 * $bytes_per_pixel * Settings::get('IMAGE_MAX_PIXEL_COUNT'); # processing buffers
         return floor($available_memory / $bytes_per_pixel);
     }
 
@@ -312,15 +312,15 @@ 
                 set seq = seq + 1
                 where
                     object_type = 1
-                    and object_id = '".Db::escape_string($log_internal_id)."'
-                    and seq >= '".Db::escape_string($seq)."'
+                    and object_id = '".Db::escape_string($log_internal_id) . "'
+                    and seq >= '".Db::escape_string($seq) . "'
                 order by seq desc
             ");
         }
 
         if (Settings::get('OC_BRANCH') == 'oc.de') {
             $local_fields_SQL = "seq";
-            $local_values_escaped_SQL = "'".Db::escape_string($seq)."'";
+            $local_values_escaped_SQL = "'" . Db::escape_string($seq) . "'";
             # All other fields are set by trigger or defaults for OCDE.
         } else {
             # These are the additional fields that OCPL newpic.php supplies
@@ -328,27 +328,27 @@ 
             $local_fields_SQL =
                 "date_created, last_modified, description, desc_html, last_url_check, user_id";
             $local_values_escaped_SQL =
-                "NOW(), NOW(), '', 0, NOW(), '".Db::escape_string($user_id)."'";
+                "NOW(), NOW(), '', 0, NOW(), '" . Db::escape_string($user_id) . "'";
         }
 
         Db::execute("
             insert into pictures (
                 uuid, node, local, title, spoiler, url, object_type, object_id,
                 unknown_format, display,
-                ".$local_fields_SQL."
+                ".$local_fields_SQL . "
             )
             values (
-                '".Db::escape_string($image_uuid)."',
-                '".Db::escape_string(Settings::get('OC_NODE_ID'))."',
+                '".Db::escape_string($image_uuid) . "',
+                '".Db::escape_string(Settings::get('OC_NODE_ID')) . "',
                 1,
-                '".Db::escape_string($caption)."',
-                '".($is_spoiler == 'true' ? 1 : 0)."',
-                '".Db::escape_string(Settings::get('IMAGES_URL').$image_uuid.$file_ext)."',
+                '".Db::escape_string($caption) . "',
+                '".($is_spoiler == 'true' ? 1 : 0) . "',
+                '".Db::escape_string(Settings::get('IMAGES_URL') . $image_uuid . $file_ext) . "',
                 1,
-                '".Db::escape_string($log_internal_id)."',
+                '".Db::escape_string($log_internal_id) . "',
                 0,
                 1,
-                ".$local_values_escaped_SQL."
+                ".$local_values_escaped_SQL . "
             )
         ");
         $image_internal_id = Db::last_insert_id();
@@ -365,7 +365,7 @@ 
                 set
                     picturescount = picturescount + 1,
                     last_modified = NOW()
-                where id = '".Db::escape_string($log_internal_id)."'
+                where id = '".Db::escape_string($log_internal_id) . "'
             ");
         }
 
@@ -375,9 +375,9 @@ 
         Db::execute("
             insert into okapi_submitted_objects (object_type, object_id, consumer_key)
             values (
-                '".Okapi::OBJECT_TYPE_CACHE_LOG_IMAGE."',
-                '".Db::escape_string($image_internal_id)."',
-                '".Db::escape_string($consumer_key)."'
+                '".Okapi::OBJECT_TYPE_CACHE_LOG_IMAGE . "',
+                '".Db::escape_string($image_internal_id) . "',
+                '".Db::escape_string($consumer_key) . "'
             );
         ");
 

Braces +41 added lines, -31 removed lines

@@ -48,8 +48,9 @@ 
         # validate the 'log_uuid' parameter
 
         $log_uuid = $request->get_parameter('log_uuid');
-        if (!$log_uuid)
-            throw new ParamMissing('log_uuid');
+        if (!$log_uuid) {
+                    throw new ParamMissing('log_uuid');
+        }
         $rs = Db::query("
             select id, node, user_id
             from cache_logs
@@ -57,8 +58,9 @@ 
         );
         $row = Db::fetch_assoc($rs);
         Db::free_result($rs);
-        if (!$row)
-            throw new InvalidParam('log_uuid', "There is no log entry with uuid '".$log_uuid."'.");
+        if (!$row) {
+                    throw new InvalidParam('log_uuid', "There is no log entry with uuid '".$log_uuid."'.");
+        }
         if ($row['node'] != Settings::get('OC_NODE_ID')) {
             throw new Exception(
                 "This site's database contains the log entry '$log_uuid' which has been"
@@ -85,17 +87,21 @@ 
         }
 
         $is_spoiler = $request->get_parameter('is_spoiler');
-        if ($is_spoiler === null) $is_spoiler = 'false';
-        if (!in_array($is_spoiler, array('true', 'false')))
-            throw new InvalidParam('is_spoiler');
+        if ($is_spoiler === null) {
+            $is_spoiler = 'false';
+        }
+        if (!in_array($is_spoiler, array('true', 'false'))) {
+                    throw new InvalidParam('is_spoiler');
+        }
 
         $position = LogImagesCommon::validate_position($request);
 
         # validate the 'image' parameter
 
         $base64_image = $request->get_parameter('image');
-        if (!$base64_image)
-            throw new ParamMissing('image');
+        if (!$base64_image) {
+                    throw new ParamMissing('image');
+        }
 
         $estimated_decoded_size = strlen($base64_image) / 4 * 3 - 2;
         if ($estimated_decoded_size > Settings::get('IMAGE_MAX_UPLOAD_SIZE'))
@@ -112,20 +118,21 @@ 
         }
 
         $image = base64_decode($base64_image);
-        if (!$image)
-            throw new InvalidParam('image', "bad base64 encoding");
+        if (!$image) {
+                    throw new InvalidParam('image', "bad base64 encoding");
+        }
 
         try {
             $image_properties = getimagesizefromstring($image);  # can throw
-            if (!$image_properties)
-                throw new Exception();
+            if (!$image_properties) {
+                            throw new Exception();
+            }
             list($width, $height, $image_type) = $image_properties;
             if (!in_array($image_type, array(IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_GIF))) {
                 # This will happen e.g. for BMP and XBM images, which are supported by GD.
                 throw new Exception();
             }
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             # Note: There may be *subtypes* which are not accepted by the GD library.
             # About 1 of 2000 JPEGs at OC.de is not readable by the PHP functions,
             # though they can be displayed by web browsers.
@@ -149,9 +156,10 @@ 
         }
         try {
             $image = imagecreatefromstring($image);  # can throw
-            if (!$image) throw new Exception();
-        }
-        catch (Exception $e) {
+            if (!$image) {
+                throw new Exception();
+            }
+        } catch (Exception $e) {
             throw new CannotPublishException(_("The uploaded image file is broken."));
         }
 
@@ -190,8 +198,9 @@ 
                 $file_ext = '.???';
                 $result = false;
         }
-        if (!$result)
-            throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+        if (!$result) {
+                    throw new Exception("could not save image file '".$imagepath.$file_ext."'");
+        }
 
         # insert image into database
 
@@ -201,15 +210,13 @@ 
                 $request->consumer->key, $request->token->user_id,
                 $log_internal_id, $image_uuid, $position, $caption, $is_spoiler, $file_ext
             );
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             # TODO: Proper handling of nested exception if the unlink() fails
             # (which is very unlikely, and will just add a bit more of garbage
             # to that which is already present in the images directory).
 
-            try { unlink($imagepath.$file_ext); }
-            catch (Exception $e2) {}
+            try { unlink($imagepath.$file_ext); } catch (Exception $e2) {}
             throw $e;
         }
 
@@ -239,8 +246,9 @@ 
         # and more powerful alternative (e.g. allowing more file types),
         # but that needs additional and sometimes non-trivial installation.
 
-        if (!extension_loaded('gd'))
-            throw new Exception('PHP GD image processing module is disabled');
+        if (!extension_loaded('gd')) {
+                    throw new Exception('PHP GD image processing module is disabled');
+        }
 
         # rescale image if necessary
 
@@ -261,8 +269,9 @@ 
         #   - GD cannot save EXIF data anyway, and
         #   - the orientation flag may not be recognized by all image processors.
 
-        if (!extension_loaded('exif'))
-            throw new Exception('PHP Exif module is disabled');
+        if (!extension_loaded('exif')) {
+                    throw new Exception('PHP Exif module is disabled');
+        }
 
         if ($image_type == IMAGETYPE_JPEG)
         {
@@ -393,7 +402,9 @@ 
         # This is the "real" entry point. A wrapper for the _call method.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         Okapi::gettext_domain_init(explode("|", $langpref));
 
         try
@@ -406,8 +417,7 @@ 
                 'position' => $position
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
+        } catch (CannotPublishException $e)
         {
             Okapi::gettext_domain_restore();
             $result = array(

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

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace okapi\services\logs\images\delete;
 
-use Exception;
 use okapi\Okapi;
 use okapi\Db;
 use okapi\OkapiRequest;

Spacing +6 added lines, -6 removed lines

@@ -31,10 +31,10 @@ 
         $image_row = Db::select_row("
             select id, node, url, local
             from pictures
-            where uuid = '".$image_uuid_escaped."'
+            where uuid = '".$image_uuid_escaped . "'
         ");
         Db::execute("
-            delete from pictures where uuid = '".$image_uuid_escaped."'
+            delete from pictures where uuid = '".$image_uuid_escaped . "'
         ");
 
         # Remember that OCPL picture sequence numbers are always 1, and
@@ -52,8 +52,8 @@ 
                     localID, uuid, type, removed_date, node
                 )
                 VALUES (
-                    ".$image_row['id']."
-                    '".$image_uuid_escaped."',
+                    ".$image_row['id'] . "
+                    '".$image_uuid_escaped . "',
                     6,
                     NOW(),
                     ".$image_row['node']
@@ -72,7 +72,7 @@ 
                 set
                     picturescount = greatest(0, picturescount - 1),
                     last_modified = NOW()
-                where id = '".Db::escape_string($log_internal_id)."'
+                where id = '".Db::escape_string($log_internal_id) . "'
             ");
         }
 
@@ -80,7 +80,7 @@ 
 
         if ($image_row['local']) {
             $filename = basename($image_row['url']);
-            unlink(Settings::get('IMAGES_DIR').'/'.$filename);
+            unlink(Settings::get('IMAGES_DIR') . '/' . $filename);
         }
 
         $result = array(

Braces +1 added lines, -2 removed lines

@@ -44,8 +44,7 @@
         if (Settings::get('OC_BRANCH') == 'oc.de')
         {
             # OCDE does all the housekeeping by triggers
-        }
-        else
+        } else
         {
             Db::execute("
                 INSERT INTO removed_objects (