Skip to content
Permalink
Browse files

added home_location field to user/user(s) methods; closes #369

  • Loading branch information...
following5 committed Feb 10, 2016
1 parent fc8e0e7 commit a9a2a042125ed7cebd271ff5f5692cec6e6dee2c
Showing with 22 additions and 2 deletions.
  1. +6 −0 okapi/services/users/user.xml
  2. +16 −2 okapi/services/users/users.php
@@ -38,6 +38,12 @@
<li><b>caches_notfound</b> - number of "Didn't find it" log entries,</li>
<li><b>caches_hidden</b> - number of caches owned,</li>
<li><b>rcmds_given</b> - number of recommendations given.</li>
<li><p><b>home_location</b> - home location of the user in the "lat|lon" format
(lat and lon are in full degrees with a dot as a decimal point);
<b>null</b> if no home location is given in the user's Opencaching profile.</p>
<p>This value can be accessed only with <b>Level 3</b> Authentication
and only for the user of your Access Token. For all other reads,
home_location will equal <b>null</b>.</p></li>
</ul>

<p>If given user does not exist, the method will respond with an HTTP 400 error.</p>
@@ -21,7 +21,7 @@ public static function options()
}
private static $valid_field_names = array('uuid', 'username', 'profile_url', 'internal_id', 'is_admin',
'caches_found', 'caches_notfound', 'caches_hidden', 'rcmds_given');
'caches_found', 'caches_notfound', 'caches_hidden', 'rcmds_given', 'home_location');
public static function call(OkapiRequest $request)
{
@@ -39,7 +39,7 @@ public static function call(OkapiRequest $request)
if (!in_array($field, self::$valid_field_names))
throw new InvalidParam('fields', "'$field' is not a valid field code.");
$rs = Db::query("
select user_id, uuid, username, admin
select user_id, uuid, username, admin, latitude, longitude
from user
where uuid in ('".implode("','", array_map('mysql_real_escape_string', $user_uuids))."')
");
@@ -72,6 +72,20 @@ public static function call(OkapiRequest $request)
case 'caches_notfound': /* handled separately */ break;
case 'caches_hidden': /* handled separately */ break;
case 'rcmds_given': /* handled separately */ break;
case 'home_location':
if (!$request->token) {
$entry['home_location'] = null;
} elseif ($request->token->user_id != $row['user_id']) {
$entry['home_location'] = null;
} elseif (!$row['latitude'] && !$row['longitude']) {
# OCPL sets NULL/NULL for unknown location, OCDE sets 0/0.
# It is safe to return null also for OCPL 0/0, as this value
# does not make sense.
$entry['home_location'] = null;
} else {
$entry['home_location'] = round($row['latitude'], 6)."|".round($row['longitude'], 6);
}
break;
default: throw new Exception("Missing field case: ".$field);
}
}

0 comments on commit a9a2a04

Please sign in to comment.
You can’t perform that action at this time.