OpencachingDeutschland / oc-server3

htdocs/okapi/services/apiref/issue.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6))
             throw new InvalidParam('issue_id');
 
-        $cache_key = "apiref/issue#".$issue_id;
+        $cache_key = "apiref/issue#" . $issue_id;
         $result = Cache::get($cache_key);
         if ($result == null)
         {
@@ -43,7 +43,7 @@ 
                 $extra_headers[] = "Accept: application/vnd.github.v3.html+json";
                 $extra_headers[] = "User-Agent: https://github.com/opencaching/okapi/";
                 if (Settings::get('GITHUB_ACCESS_TOKEN')) {
-                    $extra_headers[] = "Authorization: token ".Settings::get('GITHUB_ACCESS_TOKEN');
+                    $extra_headers[] = "Authorization: token " . Settings::get('GITHUB_ACCESS_TOKEN');
                 }
                 $opts = array(
                     'http' => array(
@@ -58,8 +58,8 @@ 
             }
             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 ".
+                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.");
             }
 

Braces +7 added lines, -6 removed lines

@@ -26,10 +26,12 @@ 
     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);
@@ -55,8 +57,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 ".

htdocs/okapi/services/apiref/method_index.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
     {
         $methodnames = OkapiServiceRunner::$all_names;
         sort($methodnames);
-        $cache_key = "api_ref/method_index#".md5(implode("#", $methodnames));
+        $cache_key = "api_ref/method_index#" . md5(implode("#", $methodnames));
         $results = Cache::get($cache_key);
         if ($results == null)
         {

htdocs/okapi/services/apiref/method.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
             'is_deprecated' => (isset($attrs['class']) && (strpos($attrs['class'], 'deprecated') !== false)),
             'class' => 'public',
             'description' =>
-                (isset($attrs['default']) ? ("<p>Default value: <b>".$attrs['default']."</b></p>") : "").
+                (isset($attrs['default']) ? ("<p>Default value: <b>" . $attrs['default'] . "</b></p>") : "") .
                 self::get_inner_xml($arg_node),
 
         );
@@ -96,7 +96,7 @@ 
         switch ($plugin_name) {
             case 'docurl':
                 $fragment = $arr[1];
-                return Settings::get('SITE_URL')."okapi/introduction.html#".$fragment;
+                return Settings::get('SITE_URL') . "okapi/introduction.html#" . $fragment;
             case 'methodref':
             case 'methodargref':
             case 'methodretref':
@@ -104,7 +104,7 @@ 
                 $result = '';
                 if ($elements[0] != '')
                 {
-                    $result .= Settings::get('SITE_URL')."okapi/".$elements[0].'.html';
+                    $result .= Settings::get('SITE_URL') . "okapi/" . $elements[0] . '.html';
                 }
                 if (count($elements) > 1)
                 {
@@ -121,7 +121,7 @@ 
                 }
                 return $result;
             default:
-                throw new Exception("Unknown plugin: ".$input);
+                throw new Exception("Unknown plugin: " . $input);
         }
     }
 
@@ -142,7 +142,7 @@ 
         $result = array(
             'name' => $methodname,
             'short_name' => end($exploded),
-            'ref_url' => Settings::get('SITE_URL')."okapi/$methodname.html",
+            'ref_url' => Settings::get('SITE_URL') . "okapi/$methodname.html",
             'auth_options' => array(
                 'min_auth_level' => $options['min_auth_level'],
                 'oauth_consumer' => $options['min_auth_level'] >= 2,
@@ -184,15 +184,15 @@ 
                     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>";
+                    $arg['description'] = "<i>Inherited from <a href='" . $referenced_method_info['ref_url'] .
+                        "#arg_" . $arg['name'] . "'>" . $referenced_method_info['name'] . "</a> method.</i>";
                 }
                 elseif (
                     (($include_list === null) || in_array($arg['name'], $include_list))
                     && (!in_array($arg['name'], $exclude_list))
                 ) {
-                    $arg['description'] = "<i>Same as in the <a href='".$referenced_method_info['ref_url'].
-                        "#arg_". $arg['name'] . "'>".$referenced_method_info['name']."</a> method.</i>";
+                    $arg['description'] = "<i>Same as in the <a href='" . $referenced_method_info['ref_url'] .
+                        "#arg_" . $arg['name'] . "'>" . $referenced_method_info['name'] . "</a> method.</i>";
                 } else {
                     continue;
                 }
@@ -207,21 +207,21 @@ 
                 'is_required' => false,
                 'is_deprecated' => false,
                 'class' => 'common-formatting',
-                'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
+                'description' => "<i>Standard <a href='" . Settings::get('SITE_URL') . "okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
             );
             $result['arguments'][] = array(
                 'name' => 'callback',
                 'is_required' => false,
                 'is_deprecated' => false,
                 'class' => 'common-formatting',
-                'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
+                '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'])
                 $arg_ref['class'] .= " deprecated";
         if (!$docs->returns)
-            throw new Exception("Missing <returns> element in the $methodname.xml file. ".
+            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);

Braces +45 added lines, -32 removed lines

@@ -128,15 +128,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,23 +153,30 @@ 
                 '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); }
@@ -180,14 +191,14 @@ 
             $exclude_list = isset($attrs['except']) ? explode("|", $attrs['except']) : array();
             foreach ($referenced_method_info['arguments'] as $arg)
             {
-                if ($arg['class'] == 'common-formatting')
-                    continue;
+                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))
                 ) {
@@ -217,12 +228,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/logs/userlogs.php

Spacing +2 added lines, -2 removed lines

@@ -52,8 +52,8 @@
                 c.wp_oc as cache_code
             from cache_logs cl, caches c
             where
-                cl.user_id = '".Db::escape_string($user['internal_id'])."'
-                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true")."
+                cl.user_id = '".Db::escape_string($user['internal_id']) . "'
+                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "cl.deleted = 0" : "true") . "
                 and c.status in (1,2,3)
                 and cl.cache_id = c.cache_id
             order by cl.date desc

Braces +21 added lines, -11 removed lines

@@ -24,21 +24,31 @@
     public static function call(OkapiRequest $request)
     {
         $user_uuid = $request->get_parameter('user_uuid');
-        if (!$user_uuid) throw new ParamMissing('user_uuid');
+        if (!$user_uuid) {
+            throw new ParamMissing('user_uuid');
+        }
         $limit = $request->get_parameter('limit');
-        if (!$limit) $limit = "20";
-        if (!is_numeric($limit))
-            throw new InvalidParam('limit', "'$limit'");
+        if (!$limit) {
+            $limit = "20";
+        }
+        if (!is_numeric($limit)) {
+                    throw new InvalidParam('limit', "'$limit'");
+        }
         $limit = intval($limit);
-        if (($limit < 1) || ($limit > 1000))
-            throw new InvalidParam('limit', "Has to be in range 1..1000.");
+        if (($limit < 1) || ($limit > 1000)) {
+                    throw new InvalidParam('limit', "Has to be in range 1..1000.");
+        }
         $offset = $request->get_parameter('offset');
-        if (!$offset) $offset = "0";
-        if (!is_numeric($offset))
-            throw new InvalidParam('offset', "'$offset'");
+        if (!$offset) {
+            $offset = "0";
+        }
+        if (!is_numeric($offset)) {
+                    throw new InvalidParam('offset', "'$offset'");
+        }
         $offset = intval($offset);
-        if ($offset < 0)
-            throw new InvalidParam('offset', "'$offset'");
+        if ($offset < 0) {
+                    throw new InvalidParam('offset', "'$offset'");
+        }
 
         # Check if user exists and retrieve user's ID (this will throw
         # a proper exception on invalid UUID).

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);