OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

okapi wptype sanity check

Browse Source
This commit is contained in:
following
2013-04-12 16:54:34 +02:00
parent 1056904d99
commit 47b8d98553
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/okapi/services/caches/geocaches.php
View File

@ -850,7 +850,6 @@ class WebService
where
cache_id in (".$cache_codes_escaped_and_imploded.")
and status = 1
and type > 0
order by cache_id, stage, `desc`
");
}
@ -896,14 +895,17 @@ class WebService
foreach ($waypoints as $row)
{
$index++;
$results[$cacheid2wptcode[$row['cache_id']]]['alt_wpts'][] = array(
'name' => sprintf($wpt_format, $cacheid2wptcode[$row['cache_id']], $index),
'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'],
);
if (in_array($row['internal_type_id'], array_keys($internal_wpt_type_id2names))) # waypoint-type sanity check
{
$results[$cacheid2wptcode[$row['cache_id']]]['alt_wpts'][] = array(
'name' => sprintf($wpt_format, $cacheid2wptcode[$row['cache_id']], $index),
'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'],
);
}
}
}