OpencachingDeutschland / oc-server3

htdocs/okapi/services/logs/entry.php

Braces +9 added lines, -4 removed lines

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

htdocs/okapi/services/logs/logs.php

Spacing +3 added lines, -3 removed lines

@@ -50,8 +50,8 @@ 
             select uuid
             from cache_logs
             where
-                cache_id = '".Db::escape_string($cache['internal_id'])."'
-                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
+                cache_id = '".Db::escape_string($cache['internal_id']) . "'
+                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
             order by date desc
             limit $offset, $limit
         ");
@@ -74,7 +74,7 @@ 
             && Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS')
             && (count($log_uuids) > 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['internal_id']);
         }
 

Braces +24 added lines, -11 removed lines

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

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

Spacing +18 added lines, -18 removed lines

@@ -81,8 +81,8 @@ 
         if ($caption !== null) {
             Db::execute("
                 update pictures
-                set title = '".Db::escape_string($caption)."'
-                where uuid = '".$image_uuid_escaped."'
+                set title = '".Db::escape_string($caption) . "'
+                where uuid = '".$image_uuid_escaped . "'
             ");
             $log_entry_modified = true;
         }
@@ -91,8 +91,8 @@ 
         if ($is_spoiler !== null) {
             Db::execute("
                 update pictures
-                set spoiler = ".($is_spoiler == 'true' ? 1 : 0)."
-                where uuid = '".$image_uuid_escaped."'
+                set spoiler = ".($is_spoiler == 'true' ? 1 : 0) . "
+                where uuid = '".$image_uuid_escaped . "'
             ");
             $log_entry_modified = true;
         }
@@ -107,7 +107,7 @@ 
 
                 $image_uuids = Db::select_column("
                     select uuid from pictures
-                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
+                    where object_type = 1 and object_id = '".Db::escape_string($log_internal_id) . "'
                     order by date_created
                 ");
                 $position = array_search($image_uuid, $image_uuids);
@@ -122,7 +122,7 @@ 
                 # For OCDE the pictures table is write locked now.
 
                 $old_seq = DB::select_value("
-                    select seq from pictures where uuid = '".$image_uuid_escaped."'
+                    select seq from pictures where uuid = '".$image_uuid_escaped . "'
                 ");
 
                 if ($seq != $old_seq)
@@ -134,13 +134,13 @@ 
                     $max_seq = Db::select_value("
                         select max(seq)
                         from pictures
-                        where object_type = 1 and object_id = '".Db::escape_string($log_internal_id)."'
+                        where object_type = 1 and object_id = '".Db::escape_string($log_internal_id) . "'
                     ");
 
                     Db::query("
                         update pictures
-                        set seq = '".Db::escape_string($max_seq + 1)."'
-                        where uuid = '".$image_uuid_escaped."'
+                        set seq = '".Db::escape_string($max_seq + 1) . "'
+                        where uuid = '".$image_uuid_escaped . "'
                     ");
 
                     # now move the pictures inbetween
@@ -150,9 +150,9 @@ 
                             set seq = seq + 1
                             where
                                 object_type = 1
-                                and object_id = '".Db::escape_string($log_internal_id)."'
-                                and seq >= '".Db::escape_string($seq)."'
-                                and seq < '".Db::escape_string($old_seq)."'
+                                and object_id = '".Db::escape_string($log_internal_id) . "'
+                                and seq >= '".Db::escape_string($seq) . "'
+                                and seq < '".Db::escape_string($old_seq) . "'
                             order by seq desc
                         ");
                     } else {
@@ -161,9 +161,9 @@ 
                             set seq = seq - 1
                             where
                                 object_type = 1
-                                and object_id = '".Db::escape_string($log_internal_id)."'
-                                and seq <= '".Db::escape_string($seq)."'
-                                and seq > '".Db::escape_string($old_seq)."'
+                                and object_id = '".Db::escape_string($log_internal_id) . "'
+                                and seq <= '".Db::escape_string($seq) . "'
+                                and seq > '".Db::escape_string($old_seq) . "'
                             order by seq asc
                         ");
                     }
@@ -171,8 +171,8 @@ 
                     # and finally move the edited picture into place
                     Db::query("
                         update pictures
-                        set seq = '".Db::escape_string($seq)."'
-                        where uuid = '".$image_uuid_escaped."'
+                        set seq = '".Db::escape_string($seq) . "'
+                        where uuid = '".$image_uuid_escaped . "'
                     ");
                 }
 
@@ -188,7 +188,7 @@ 
             Db::query("
                 update cache_logs
                 set last_modified = NOW()
-                where id = '".Db::escape_string($log_internal_id)."'
+                where id = '".Db::escape_string($log_internal_id) . "'
             ");
 
             # OCPL code currently does not update pictures.last_modified when

Braces +8 added lines, -7 removed lines

@@ -60,8 +60,9 @@ 
 
         $is_spoiler = $request->get_parameter('is_spoiler');
         if ($is_spoiler !== null) {
-            if (!in_array($is_spoiler, array('true', 'false')))
-                throw new InvalidParam('is_spoiler');
+            if (!in_array($is_spoiler, array('true', 'false'))) {
+                            throw new InvalidParam('is_spoiler');
+            }
         }
 
         $position = LogImagesCommon::validate_position($request);
@@ -111,8 +112,7 @@ 
                     order by date_created
                 ");
                 $position = array_search($image_uuid, $image_uuids);
-            }
-            else
+            } else
             {
                 list($position, $seq) = LogImagesCommon::prepare_position(
                     $log_internal_id,
@@ -204,7 +204,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
@@ -216,8 +218,7 @@ 
                 'position' => $position
             );
             Okapi::gettext_domain_restore();
-        }
-        catch (CannotPublishException $e)
+        } catch (CannotPublishException $e)
         {
             Okapi::gettext_domain_restore();
             $result = array(

htdocs/okapi/services/logs/entries.php

Spacing +13 added lines, -13 removed lines

@@ -40,8 +40,8 @@ 
             $log_uuids = explode("|", $log_uuids);
 
         if ((count($log_uuids) > 500) && (!$request->skip_limits))
-            throw new InvalidParam('log_uuids', "Maximum allowed number of referenced ".
-                "log entries is 500. You provided ".count($log_uuids)." UUIDs.");
+            throw new InvalidParam('log_uuids', "Maximum allowed number of referenced " .
+                "log entries is 500. You provided " . count($log_uuids) . " UUIDs.");
         if (count($log_uuids) != count(array_unique($log_uuids)))
             throw new InvalidParam('log_uuids', "Duplicate UUIDs detected (make sure each UUID is referenced only once).");
         $fields = $request->get_parameter('fields');
@@ -68,9 +68,9 @@ 
         $rs = Db::query("
             select
                 cl.id, c.wp_oc as cache_code, cl.uuid, cl.type,
-                ".$teamentry_field." as oc_team_entry,
-                ".$needs_maintenance_SQL." as needs_maintenance2,
-                ".$listing_is_outdated_SQL." as listing_is_outdated,
+                ".$teamentry_field . " as oc_team_entry,
+                ".$needs_maintenance_SQL . " as needs_maintenance2,
+                ".$listing_is_outdated_SQL . " as listing_is_outdated,
                 unix_timestamp(cl.date) as date, cl.text,
                 u.uuid as user_uuid, u.username, u.user_id,
                 if(cr.user_id is null, 0, 1) as was_recommended
@@ -81,14 +81,14 @@ 
                 left join cache_rating cr
                     on cr.user_id = u.user_id
                     and cr.cache_id = c.cache_id
-                    ".$ratingdate_condition."
+                    ".$ratingdate_condition . "
                     and cl.type in (
-                        ".Okapi::logtypename2id("Found it").",
-                        ".Okapi::logtypename2id("Attended")."
+                        ".Okapi::logtypename2id("Found it") . ",
+                        ".Okapi::logtypename2id("Attended") . "
                     )
             where
-                cl.uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $log_uuids))."')
-                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true")."
+                cl.uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $log_uuids)) . "')
+                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true") . "
                 and cl.user_id = u.user_id
                 and c.cache_id = cl.cache_id
                 and c.status in (1,2,3)
@@ -105,7 +105,7 @@ 
                 'user' => array(
                     'uuid' => $row['user_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'],
                 ),
                 'type' => Okapi::logtypeid2name($row['type']),
                 'was_recommended' => $row['was_recommended'] ? true : false,
@@ -132,7 +132,7 @@ 
                 from pictures
                 where
                     object_type = 1
-                    and object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($log_id2uuid)))."')
+                    and object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($log_id2uuid))) . "')
                     and display = 1   /* currently is always 1 for logpix */
                     and unknown_format = 0
                 order by seq, date_created
@@ -148,7 +148,7 @@ 
                     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'],
                         'is_spoiler' => ($row['spoiler'] ? true : false),
                     );

Braces +27 added lines, -18 removed lines

@@ -31,25 +31,32 @@ 
     public static function call(OkapiRequest $request)
     {
         $log_uuids = $request->get_parameter('log_uuids');
-        if ($log_uuids === null) throw new ParamMissing('log_uuids');
+        if ($log_uuids === null) {
+            throw new ParamMissing('log_uuids');
+        }
         if ($log_uuids === "")
         {
             $log_uuids = array();
+        } else {
+                    $log_uuids = explode("|", $log_uuids);
         }
-        else
-            $log_uuids = explode("|", $log_uuids);
 
-        if ((count($log_uuids) > 500) && (!$request->skip_limits))
-            throw new InvalidParam('log_uuids', "Maximum allowed number of referenced ".
+        if ((count($log_uuids) > 500) && (!$request->skip_limits)) {
+                    throw new InvalidParam('log_uuids', "Maximum allowed number of referenced ".
                 "log entries is 500. You provided ".count($log_uuids)." UUIDs.");
-        if (count($log_uuids) != count(array_unique($log_uuids)))
-            throw new InvalidParam('log_uuids', "Duplicate UUIDs detected (make sure each UUID is referenced only once).");
+        }
+        if (count($log_uuids) != count(array_unique($log_uuids))) {
+                    throw new InvalidParam('log_uuids', "Duplicate UUIDs detected (make sure each UUID is referenced only once).");
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "date|user|type|comment";
+        if (!$fields) {
+            $fields = "date|user|type|comment";
+        }
         $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.");
+        }
 
         if (Settings::get('OC_BRANCH') == 'oc.de')
         {
@@ -57,8 +64,7 @@ 
             $ratingdate_condition = 'and cr.rating_date=cl.date';
             $needs_maintenance_SQL = 'cl.needs_maintenance';
             $listing_is_outdated_SQL = 'cl.listing_outdated';
-        }
-        else
+        } else
         {
             $teamentry_field = '(cl.type=12)';
             $ratingdate_condition = '';
@@ -158,22 +164,25 @@ 
 
         # Check which UUIDs were not found and mark them with null.
 
-        foreach ($log_uuids as $log_uuid)
-            if (!isset($results[$log_uuid]))
+        foreach ($log_uuids as $log_uuid) {
+                    if (!isset($results[$log_uuid]))
                 $results[$log_uuid] = null;
+        }
 
         # Remove unwanted fields.
 
-        foreach (self::$valid_field_names as $field)
-            if (!in_array($field, $fields))
+        foreach (self::$valid_field_names as $field) {
+                    if (!in_array($field, $fields))
                 foreach ($results as &$result_ref)
                     unset($result_ref[$field]);
+        }
 
         # Order the results in the same order as the input codes were given.
 
         $ordered_results = array();
-        foreach ($log_uuids as $log_uuid)
-            $ordered_results[$log_uuid] = $results[$log_uuid];
+        foreach ($log_uuids as $log_uuid) {
+                    $ordered_results[$log_uuid] = $results[$log_uuid];
+        }
 
         return Okapi::formatted_response($request, $ordered_results);
     }

htdocs/okapi/services/users/by_internal_ids.php

Spacing +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
         if (!$internal_ids) throw new ParamMissing('internal_ids');
         $internal_ids = explode("|", $internal_ids);
         if (count($internal_ids) > 500)
-            throw new InvalidParam('internal_ids', "Maximum allowed number of referenced users ".
-                "is 500. You provided ".count($internal_ids)." references.");
+            throw new InvalidParam('internal_ids', "Maximum allowed number of referenced users " .
+                "is 500. You provided " . count($internal_ids) . " references.");
         $fields = $request->get_parameter('fields');
         if (!$fields)
             throw new ParamMissing('fields');
@@ -38,7 +38,7 @@ 
         $rs = Db::query("
             select user_id, uuid
             from user
-            where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_ids))."')
+            where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_ids)) . "')
         ");
         $internalid2useruuid = array();
         while ($row = Db::fetch_assoc($rs))

Braces +14 added lines, -9 removed lines

@@ -23,14 +23,18 @@ 
     public static function call(OkapiRequest $request)
     {
         $internal_ids = $request->get_parameter('internal_ids');
-        if (!$internal_ids) throw new ParamMissing('internal_ids');
+        if (!$internal_ids) {
+            throw new ParamMissing('internal_ids');
+        }
         $internal_ids = explode("|", $internal_ids);
-        if (count($internal_ids) > 500)
-            throw new InvalidParam('internal_ids', "Maximum allowed number of referenced users ".
+        if (count($internal_ids) > 500) {
+                    throw new InvalidParam('internal_ids', "Maximum allowed number of referenced users ".
                 "is 500. You provided ".count($internal_ids)." references.");
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields)
-            throw new ParamMissing('fields');
+        if (!$fields) {
+                    throw new ParamMissing('fields');
+        }
 
         # There's no need to validate the fields parameter as the 'users'
         # method does this (it will raise a proper exception on invalid values).
@@ -57,10 +61,11 @@ 
         $results = array();
         foreach ($internal_ids as $internal_id)
         {
-            if (!isset($internalid2useruuid[$internal_id]))
-                $results[$internal_id] = null;
-            else
-                $results[$internal_id] = $id_results[$internalid2useruuid[$internal_id]];
+            if (!isset($internalid2useruuid[$internal_id])) {
+                            $results[$internal_id] = null;
+            } else {
+                            $results[$internal_id] = $id_results[$internalid2useruuid[$internal_id]];
+            }
         }
 
         return Okapi::formatted_response($request, $results);

htdocs/okapi/services/users/by_username.php

Spacing +1 added lines, -1 removed lines

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

Braces +9 added lines, -5 removed lines

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

htdocs/okapi/services/users/by_internal_id.php

Braces +6 added lines, -3 removed lines

@@ -23,7 +23,9 @@ 
     public static function call(OkapiRequest $request)
     {
         $internal_id = $request->get_parameter('internal_id');
-        if (!$internal_id) throw new ParamMissing('internal_id');
+        if (!$internal_id) {
+            throw new ParamMissing('internal_id');
+        }
         $fields = $request->get_parameter('fields');
 
         # There's no need to validate the fields parameter.
@@ -32,8 +34,9 @@ 
             $request->consumer, $request->token, array('internal_ids' => $internal_id,
             'fields' => $fields)));
         $result = $results[$internal_id];
-        if ($result == null)
-            throw new InvalidParam('internal_id', "There is no user by this internal_id.");
+        if ($result == null) {
+                    throw new InvalidParam('internal_id', "There is no user by this internal_id.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }

htdocs/okapi/services/users/by_usernames.php

Spacing +3 added lines, -3 removed lines

@@ -27,8 +27,8 @@ 
         if (!$usernames) throw new ParamMissing('usernames');
         $usernames = explode("|", $usernames);
         if (count($usernames) > 500)
-            throw new InvalidParam('usernames', "Maximum allowed number of referenced users ".
-                "is 500. You provided ".count($usernames)." usernames.");
+            throw new InvalidParam('usernames', "Maximum allowed number of referenced users " .
+                "is 500. You provided " . count($usernames) . " usernames.");
         $fields = $request->get_parameter('fields');
         if (!$fields)
             throw new ParamMissing('fields');
@@ -39,7 +39,7 @@ 
         $rs = Db::query("
             select username, uuid
             from user
-            where username collate ".Settings::get('DB_CHARSET')."_general_ci in ('".implode("','", array_map('\okapi\Db::escape_string', $usernames))."')
+            where username collate ".Settings::get('DB_CHARSET') . "_general_ci in ('" . implode("','", array_map('\okapi\Db::escape_string', $usernames)) . "')
         ");
         $lower_username2useruuid = array();
         while ($row = Db::fetch_assoc($rs))

Braces +14 added lines, -9 removed lines

@@ -24,14 +24,18 @@ 
     public static function call(OkapiRequest $request)
     {
         $usernames = $request->get_parameter('usernames');
-        if (!$usernames) throw new ParamMissing('usernames');
+        if (!$usernames) {
+            throw new ParamMissing('usernames');
+        }
         $usernames = explode("|", $usernames);
-        if (count($usernames) > 500)
-            throw new InvalidParam('usernames', "Maximum allowed number of referenced users ".
+        if (count($usernames) > 500) {
+                    throw new InvalidParam('usernames', "Maximum allowed number of referenced users ".
                 "is 500. You provided ".count($usernames)." usernames.");
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields)
-            throw new ParamMissing('fields');
+        if (!$fields) {
+                    throw new ParamMissing('fields');
+        }
 
         # There's no need to validate the fields parameter as the 'users'
         # method does this (it will raise a proper exception on invalid values).
@@ -65,10 +69,11 @@ 
         $results = array();
         foreach ($usernames as $username)
         {
-            if (!isset($lower_username2useruuid[mb_strtolower($username, 'utf-8')]))
-                $results[$username] = null;
-            else
-                $results[$username] = $id_results[$lower_username2useruuid[mb_strtolower($username, 'utf-8')]];
+            if (!isset($lower_username2useruuid[mb_strtolower($username, 'utf-8')])) {
+                            $results[$username] = null;
+            } else {
+                            $results[$username] = $id_results[$lower_username2useruuid[mb_strtolower($username, 'utf-8')]];
+            }
         }
 
         return Okapi::formatted_response($request, $results);

htdocs/okapi/services/users/user.php

Braces +4 added lines, -4 removed lines

@@ -33,8 +33,7 @@ 
                 $tmp = OkapiServiceRunner::call('services/users/by_internal_id', new OkapiInternalRequest(
                     $request->consumer, null, array('internal_id' => $request->token->user_id, 'fields' => 'uuid')));
                 $user_uuid = $tmp['uuid'];
-            }
-            else
+            } else
             {
                 throw new BadRequest("You must either: 1. supply the user_uuid argument, or "
                     ."2. sign your request with an Access Token.");
@@ -49,8 +48,9 @@ 
             $request->consumer, $request->token, array('user_uuids' => $user_uuid,
             'fields' => $fields)));
         $result = $results[$user_uuid];
-        if ($result == null)
-            throw new InvalidParam('user_uuid', "There is no user by this ID.");
+        if ($result == null) {
+                    throw new InvalidParam('user_uuid', "There is no user by this ID.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }