OpencachingDeutschland / oc-server3

htdocs/okapi/services/users/users.php

Braces +34 added lines, -36 removed lines

@@ -28,18 +28,23 @@ 
     public static function call(OkapiRequest $request)
     {
         $user_uuids = $request->get_parameter('user_uuids');
-        if (!$user_uuids) throw new ParamMissing('user_uuids');
+        if (!$user_uuids) {
+            throw new ParamMissing('user_uuids');
+        }
         $user_uuids = explode("|", $user_uuids);
-        if (count($user_uuids) > 500)
-            throw new InvalidParam('user_uuids', "Maximum allowed number of referenced users ".
+        if (count($user_uuids) > 500) {
+                    throw new InvalidParam('user_uuids', "Maximum allowed number of referenced users ".
                 "is 500. You provided ".count($user_uuids)." user IDs.");
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields)
-            throw new ParamMissing('fields');
+        if (!$fields) {
+                    throw new ParamMissing('fields');
+        }
         $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.");
+        }
         $rs = Db::query("
             select user_id, uuid, username, admin, latitude, longitude, date_created
             from user
@@ -48,15 +53,12 @@ 
         $results = array();
         $id2uuid = array();
         $uuid2id = array();
-        while ($row = Db::fetch_assoc($rs))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $id2uuid[$row['user_id']] = $row['uuid'];
             $uuid2id[$row['uuid']] = $row['user_id'];
             $entry = array();
-            foreach ($fields as $field)
-            {
-                switch ($field)
-                {
+            foreach ($fields as $field) {
+                switch ($field) {
                     case 'uuid': $entry['uuid'] = $row['uuid']; break;
                     case 'username': $entry['username'] = $row['username']; break;
                     case 'profile_url': $entry['profile_url'] = Settings::get('SITE_URL')."viewprofile.php?userid=".$row['user_id']; break;
@@ -99,15 +101,13 @@ 
         # caches_found, caches_notfound, caches_hidden
 
         if (in_array('caches_found', $fields) || in_array('caches_notfound', $fields) || in_array('caches_hidden', $fields)
-            || in_array('rcmds_given', $fields))
-        {
+            || in_array('rcmds_given', $fields)) {
             # We will load all these stats together. Then we may remove these which
             # the user doesn't need.
 
             $extras = array();
 
-            if (Settings::get('OC_BRANCH') == 'oc.pl')
-            {
+            if (Settings::get('OC_BRANCH') == 'oc.pl') {
                 # OCPL stores user stats in 'user' table.
 
                 $rs = Db::query("
@@ -115,9 +115,7 @@ 
                     from user
                     where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid)))."')
                 ");
-            }
-            else
-            {
+            } else {
                 # OCDE stores user stats in 'stat_user' table.
 
                 $rs = Db::query("
@@ -134,8 +132,7 @@ 
                 ");
             }
 
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 $extras[$row['user_id']] = array();;
                 $extra_ref = &$extras[$row['user_id']];
                 $extra_ref['caches_found'] = 0 + $row['founds_count'];
@@ -144,8 +141,7 @@ 
             }
             Db::free_result($rs);
 
-            if (in_array('rcmds_given', $fields))
-            {
+            if (in_array('rcmds_given', $fields)) {
                 $rs = Db::query("
                     select user_id, count(*) as rcmds_given
                     from cache_rating
@@ -153,30 +149,32 @@ 
                     group by user_id
                 ");
                 $rcmds_counts = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $rcmds_counts[$row['user_id']] = $row['rcmds_given'];
-                foreach ($extras as $user_id => &$extra_ref)
-                {
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $rcmds_counts[$row['user_id']] = $row['rcmds_given'];
+                }
+                foreach ($extras as $user_id => &$extra_ref) {
                     $extra_ref['rcmds_given'] = isset($rcmds_counts[$user_id]) ? 0 + $rcmds_counts[$user_id] : 0;
                 }
             }
 
             # "Apply" only those fields which the consumer wanted.
 
-            foreach (array('caches_found', 'caches_notfound', 'caches_hidden', 'rcmds_given') as $field)
-            {
-                if (!in_array($field, $fields))
-                    continue;
-                foreach ($results as $uuid => &$result_ref)
-                    $result_ref[$field] = $extras[$uuid2id[$uuid]][$field];
+            foreach (array('caches_found', 'caches_notfound', 'caches_hidden', 'rcmds_given') as $field) {
+                if (!in_array($field, $fields)) {
+                                    continue;
+                }
+                foreach ($results as $uuid => &$result_ref) {
+                                    $result_ref[$field] = $extras[$uuid2id[$uuid]][$field];
+                }
             }
         }
 
         # Check which user IDs were not found and mark them with null.
 
-        foreach ($user_uuids as $user_uuid)
-            if (!isset($results[$user_uuid]))
+        foreach ($user_uuids as $user_uuid) {
+                    if (!isset($results[$user_uuid]))
                 $results[$user_uuid] = null;
+        }
 
         return Okapi::formatted_response($request, $results);
     }

htdocs/okapi/services/users/by_internal_ids.php

Braces +16 added lines, -13 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).
@@ -41,8 +45,7 @@ 
             where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_ids))."')
         ");
         $internalid2useruuid = array();
-        while ($row = Db::fetch_assoc($rs))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $internalid2useruuid[$row['user_id']] = $row['uuid'];
         }
         Db::free_result($rs);
@@ -55,12 +58,12 @@ 
         # Map user_uuids to internal_ids. Also check which internal_ids were not found
         # and mark them with null.
         $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]];
+        foreach ($internal_ids as $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/user.php

Braces +6 added lines, -9 removed lines

@@ -26,16 +26,12 @@ 
     public static function call(OkapiRequest $request)
     {
         $user_uuid = $request->get_parameter('user_uuid');
-        if (!$user_uuid)
-        {
-            if ($request->token)
-            {
+        if (!$user_uuid) {
+            if ($request->token) {
                 $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 +45,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);
     }
 }

htdocs/okapi/services/users/by_usernames.php

Braces +17 added lines, -15 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).
@@ -42,16 +46,14 @@ 
             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))
-        {
+        while ($row = Db::fetch_assoc($rs)) {
             $lower_username2useruuid[mb_strtolower($row['username'], 'utf-8')] = $row['uuid'];
         }
         Db::free_result($rs);
 
         # Retrieve data for the found user_uuids.
 
-        if (count($lower_username2useruuid) > 0)
-        {
+        if (count($lower_username2useruuid) > 0) {
             $id_results = OkapiServiceRunner::call('services/users/users', new OkapiInternalRequest(
                 $request->consumer, $request->token, array('user_uuids' => implode("|", array_values($lower_username2useruuid)),
                 'fields' => $fields)));
@@ -63,12 +65,12 @@ 
         # and mark them with null.
 
         $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')]];
+        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')]];
+            }
         }
 
         return Okapi::formatted_response($request, $results);

htdocs/okapi/services/apiref/issue.php

Braces +9 added lines, -11 removed lines

@@ -26,19 +26,19 @@ 
     public static function call(OkapiRequest $request)
     {
         $issue_id = $request->get_parameter('issue_id');
-        if (!$issue_id)
-            throw new ParamMissing('issue_id');
-        if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6))
-            throw new InvalidParam('issue_id');
+        if (!$issue_id) {
+                    throw new ParamMissing('issue_id');
+        }
+        if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6)) {
+                    throw new InvalidParam('issue_id');
+        }
 
         $cache_key = "apiref/issue#".$issue_id;
         $result = Cache::get($cache_key);
-        if ($result == null)
-        {
+        if ($result == null) {
             # Download the number of comments from GitHub Issue Tracker.
 
-            try
-            {
+            try {
                 $extra_headers = array();
                 $extra_headers[] = "Accept: application/vnd.github.v3.html+json";
                 $extra_headers[] = "User-Agent: https://github.com/opencaching/okapi/";
@@ -55,9 +55,7 @@ 
                 $context = stream_context_create($opts);
                 $json = file_get_contents("https://api.github.com/repos/opencaching/okapi/issues/$issue_id",
                     false, $context);
-            }
-            catch (ErrorException $e)
-            {
+            } catch (ErrorException $e) {
                 throw new BadRequest("Sorry, we could not retrieve issue stats from the GitHub site. ".
                     "This is probably due to a temporary connection problem. Try again later or contact ".
                     "us if this seems permanent.");

htdocs/okapi/services/apiref/method.php

Braces +51 added lines, -44 removed lines

@@ -102,12 +102,10 @@ 
             case 'methodretref':
                 $elements = explode('#', $arr[1]);
                 $result = '';
-                if ($elements[0] != '')
-                {
+                if ($elements[0] != '') {
                     $result .= Settings::get('SITE_URL')."okapi/".$elements[0].'.html';
                 }
-                if (count($elements) > 1)
-                {
+                if (count($elements) > 1) {
                     $result .= '#';
                     switch ($plugin_name) {
                         case 'methodargref':
@@ -128,15 +126,19 @@ 
     public static function call(OkapiRequest $request)
     {
         $methodname = $request->get_parameter('name');
-        if (!$methodname)
-            throw new ParamMissing('name');
-        if (!preg_match("#^services/[0-9a-z_/]*$#", $methodname))
-            throw new InvalidParam('name');
-        if (!OkapiServiceRunner::exists($methodname))
-            throw new InvalidParam('name', "Method does not exist: '$methodname'.");
+        if (!$methodname) {
+                    throw new ParamMissing('name');
+        }
+        if (!preg_match("#^services/[0-9a-z_/]*$#", $methodname)) {
+                    throw new InvalidParam('name');
+        }
+        if (!OkapiServiceRunner::exists($methodname)) {
+                    throw new InvalidParam('name', "Method does not exist: '$methodname'.");
+        }
         $options = OkapiServiceRunner::options($methodname);
-        if (!isset($options['min_auth_level']))
-            throw new Exception("Method $methodname is missing a required 'min_auth_level' option!");
+        if (!isset($options['min_auth_level'])) {
+                    throw new Exception("Method $methodname is missing a required 'min_auth_level' option!");
+        }
         $docs = simplexml_load_string(OkapiServiceRunner::docs($methodname));
         $exploded = explode("/", $methodname);
         $result = array(
@@ -149,45 +151,49 @@ 
                 'oauth_token' => $options['min_auth_level'] >= 3,
             )
         );
-        if (!$docs->brief)
-            throw new Exception("Missing <brief> element in the $methodname.xml file.");
-        if ($docs->brief != self::get_inner_xml($docs->brief))
-            throw new Exception("The <brief> element may not contain HTML markup ($methodname.xml).");
-        if (strlen($docs->brief) > 80)
-            throw new Exception("The <brief> description may not be longer than 80 characters ($methodname.xml).");
-        if (strpos($docs->brief, "\n") !== false)
-            throw new Exception("The <brief> element may not contain new-lines ($methodname.xml).");
-        if (substr(trim($docs->brief), -1) == '.')
-            throw new Exception("The <brief> element should not end with a dot ($methodname.xml).");
+        if (!$docs->brief) {
+                    throw new Exception("Missing <brief> element in the $methodname.xml file.");
+        }
+        if ($docs->brief != self::get_inner_xml($docs->brief)) {
+                    throw new Exception("The <brief> element may not contain HTML markup ($methodname.xml).");
+        }
+        if (strlen($docs->brief) > 80) {
+                    throw new Exception("The <brief> description may not be longer than 80 characters ($methodname.xml).");
+        }
+        if (strpos($docs->brief, "\n") !== false) {
+                    throw new Exception("The <brief> element may not contain new-lines ($methodname.xml).");
+        }
+        if (substr(trim($docs->brief), -1) == '.') {
+                    throw new Exception("The <brief> element should not end with a dot ($methodname.xml).");
+        }
         $result['brief_description'] = self::get_inner_xml($docs->brief);
-        if ($docs->{'issue-id'})
-            $result['issue_id'] = (string)$docs->{'issue-id'};
-        else
-            $result['issue_id'] = null;
-        if (!$docs->desc)
-            throw new Exception("Missing <desc> element in the $methodname.xml file.");
+        if ($docs->{'issue-id'}) {
+                    $result['issue_id'] = (string)$docs->{'issue-id'};
+        } else {
+                    $result['issue_id'] = null;
+        }
+        if (!$docs->desc) {
+                    throw new Exception("Missing <desc> element in the $methodname.xml file.");
+        }
         $result['description'] = self::get_inner_xml($docs->desc);
         $result['arguments'] = array();
         foreach ($docs->req as $arg) { $result['arguments'][] = self::arg_desc($arg); }
         foreach ($docs->opt as $arg) { $result['arguments'][] = self::arg_desc($arg); }
-        foreach ($docs->{'import-params'} as $import_desc)
-        {
+        foreach ($docs->{'import-params'} as $import_desc) {
             $attrs = $import_desc->attributes();
             $referenced_methodname = $attrs['method'];
             $referenced_method_info = OkapiServiceRunner::call('services/apiref/method',
                 new OkapiInternalRequest(new OkapiInternalConsumer(), null, array('name' => $referenced_methodname)));
             $include_list = isset($attrs['params']) ? explode("|", $attrs['params']) : null;
             $exclude_list = isset($attrs['except']) ? explode("|", $attrs['except']) : array();
-            foreach ($referenced_method_info['arguments'] as $arg)
-            {
-                if ($arg['class'] == 'common-formatting')
-                    continue;
-                if (($include_list === null) && (count($exclude_list) == 0))
-                {
+            foreach ($referenced_method_info['arguments'] as $arg) {
+                if ($arg['class'] == 'common-formatting') {
+                                    continue;
+                }
+                if (($include_list === null) && (count($exclude_list) == 0)) {
                     $arg['description'] = "<i>Inherited from <a href='".$referenced_method_info['ref_url'].
                         "#arg_". $arg['name'] . "'>".$referenced_method_info['name']."</a> method.</i>";
-                }
-                elseif (
+                } elseif (
                     (($include_list === null) || in_array($arg['name'], $include_list))
                     && (!in_array($arg['name'], $exclude_list))
                 ) {
@@ -200,8 +206,7 @@ 
                 $result['arguments'][] = $arg;
             }
         }
-        if ($docs->{'common-format-params'})
-        {
+        if ($docs->{'common-format-params'}) {
             $result['arguments'][] = array(
                 'name' => 'format',
                 'is_required' => false,
@@ -217,12 +222,14 @@ 
                 'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
             );
         }
-        foreach ($result['arguments'] as &$arg_ref)
-            if ($arg_ref['is_deprecated'])
+        foreach ($result['arguments'] as &$arg_ref) {
+                    if ($arg_ref['is_deprecated'])
                 $arg_ref['class'] .= " deprecated";
-        if (!$docs->returns)
-            throw new Exception("Missing <returns> element in the $methodname.xml file. ".
+        }
+        if (!$docs->returns) {
+                    throw new Exception("Missing <returns> element in the $methodname.xml file. ".
                 "If your method does not return anything, you should document in nonetheless.");
+        }
         $result['returns'] = self::get_inner_xml($docs->returns);
         return Okapi::formatted_response($request, $result);
     }

htdocs/okapi/services/apiref/method_index.php

Braces +2 added lines, -4 removed lines

@@ -28,11 +28,9 @@
         sort($methodnames);
         $cache_key = "api_ref/method_index#".md5(implode("#", $methodnames));
         $results = Cache::get($cache_key);
-        if ($results == null)
-        {
+        if ($results == null) {
             $results = array();
-            foreach ($methodnames as $methodname)
-            {
+            foreach ($methodnames as $methodname) {
                 $info = OkapiServiceRunner::call('services/apiref/method', new OkapiInternalRequest(
                     new OkapiInternalConsumer(), null, array('name' => $methodname)));
                 $results[] = array(

htdocs/okapi/services/apisrv/stats.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
     {
         $cachekey = "apisrv/stats";
         $result = Cache::get($cachekey);
-        if (!$result)
-        {
+        if (!$result) {
             $result = array(
                 'cache_count' => 0 + Db::select_value("
                     select count(*) from caches where status in (1,2,3)

htdocs/okapi/services/apisrv/installations.php

Braces +19 added lines, -23 removed lines

@@ -30,12 +30,10 @@ 
         $cachekey = 'apisrv/installations';
         $backupkey = 'apisrv/installations-backup';
         $results = Cache::get($cachekey);
-        if (!$results)
-        {
+        if (!$results) {
             # Download the current list of OKAPI servers.
 
-            try
-            {
+            try {
                 $opts = array(
                     'http' => array(
                         'method' => "GET",
@@ -49,14 +47,11 @@ 
                 if (!$doc) {
                     throw new ErrorException(); # just to get to the catch block
                 }
-            }
-            catch (ErrorException $e)
-            {
+            } catch (ErrorException $e) {
                 # GitHub failed on us. Try to respond with a backup list.
 
                 $results = Cache::get($backupkey);
-                if ($results)
-                {
+                if ($results) {
                     Cache::set($cachekey, $results, 12 * 3600); # so to retry no earlier than after 12 hours
                     return Okapi::formatted_response($request, $results);
                 }
@@ -77,31 +72,32 @@ 
 
             $results = array();
             $i_was_included = false;
-            foreach ($doc->installation as $inst)
-            {
+            foreach ($doc->installation as $inst) {
                 $site_url = (string)$inst[0]['site_url'];
-                if ($inst[0]['okapi_base_url'])
-                    $okapi_base_url = (string)$inst[0]['okapi_base_url'];
-                else
-                    $okapi_base_url = $site_url."okapi/";
-                if ($inst[0]['site_name'])
-                    $site_name = (string)$inst[0]['site_name'];
-                else
-                    $site_name = Okapi::get_normalized_site_name($site_url);
+                if ($inst[0]['okapi_base_url']) {
+                                    $okapi_base_url = (string)$inst[0]['okapi_base_url'];
+                } else {
+                                    $okapi_base_url = $site_url."okapi/";
+                }
+                if ($inst[0]['site_name']) {
+                                    $site_name = (string)$inst[0]['site_name'];
+                } else {
+                                    $site_name = Okapi::get_normalized_site_name($site_url);
+                }
                 $results[] = array(
                     'site_url' => $site_url,
                     'site_name' => $site_name,
                     'okapi_base_url' => $okapi_base_url,
                 );
-                if ($site_url == Settings::get('SITE_URL'))
-                    $i_was_included = true;
+                if ($site_url == Settings::get('SITE_URL')) {
+                                    $i_was_included = true;
+                }
             }
 
             # If running on a local development installation, then include the local
             # installation URL.
 
-            if (!$i_was_included)
-            {
+            if (!$i_was_included) {
                 $results[] = array(
                     'site_url' => Settings::get('SITE_URL'),
                     'site_name' => "DEVELSITE",