OpencachingDeutschland / oc-server3

htdocs/okapi/services/logs/entries.php

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

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

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

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/users.php

Braces +25 added lines, -17 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
@@ -115,8 +120,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.
 
@@ -153,8 +157,9 @@ 
                     group by user_id
                 ");
                 $rcmds_counts = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $rcmds_counts[$row['user_id']] = $row['rcmds_given'];
+                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;
@@ -165,18 +170,21 @@ 
 
             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];
+                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/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);
     }
 }

htdocs/okapi/services/oauth/authorize.php

Braces +9 added lines, -5 removed lines

@@ -21,13 +21,17 @@
     public static function call(OkapiRequest $request)
     {
         $token_key = $request->get_parameter('oauth_token');
-        if (!$token_key)
-            throw new ParamMissing("oauth_token");
+        if (!$token_key) {
+                    throw new ParamMissing("oauth_token");
+        }
         $langpref = $request->get_parameter('langpref');
         $interactivity = $request->get_parameter('interactivity');
-        if (!$interactivity) $interactivity = 'minimal';
-        if (!in_array($interactivity, array('minimal', 'confirm_user')))
-            throw new InvalidParam('interactivity', $interactivity);
+        if (!$interactivity) {
+            $interactivity = 'minimal';
+        }
+        if (!in_array($interactivity, array('minimal', 'confirm_user'))) {
+                    throw new InvalidParam('interactivity', $interactivity);
+        }
 
         # Redirect to the "apps" folder. This is done there (not here)
         # because: 1) we don't want any cookie or session-handling

htdocs/okapi/services/attrs/attribute_index.php

Braces +9 added lines, -3 removed lines

@@ -30,13 +30,19 @@
         # Read the parameters.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "name";
+        if (!$fields) {
+            $fields = "name";
+        }
 
         $only_locally_used = $request->get_parameter('only_locally_used');
-        if (!$only_locally_used) $only_locally_used = "false";
+        if (!$only_locally_used) {
+            $only_locally_used = "false";
+        }
         $only_locally_used = ($only_locally_used == "true");
 
         # Get the list of attributes and filter the A-codes based on the