OpencachingDeutschland / oc-server3

htdocs/okapi/services/logs/logs.php

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

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
         $acode = $request->get_parameter('acode');
         if ($acode === null) throw new ParamMissing('acode');
-        if (strstr($acode,'|')) throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        if (strstr($acode, '|')) throw new InvalidParam('acode', "Only a single A-code must be supplied.");
 
         $langpref = $request->get_parameter('langpref');
         if (!$langpref) $langpref = "en";

Braces +16 added lines, -7 removed lines

@@ -29,17 +29,27 @@ 
         # Read the parameters.
 
         $acode = $request->get_parameter('acode');
-        if ($acode === null) throw new ParamMissing('acode');
-        if (strstr($acode,'|')) throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        if ($acode === null) {
+            throw new ParamMissing('acode');
+        }
+        if (strstr($acode,'|')) {
+            throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        }
 
         $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";
+        }
 
         $forward_compatible = $request->get_parameter('forward_compatible');
-        if (!$forward_compatible) $forward_compatible = "true";
+        if (!$forward_compatible) {
+            $forward_compatible = "true";
+        }
 
         # Pass them all to the attributes method.
 
@@ -52,8 +62,7 @@ 
         $results = OkapiServiceRunner::call('services/attrs/attributes',
             new OkapiInternalRequest($request->consumer, $request->token, $params));
         $result = $results[$acode];
-        if ($result === null)
-        {
+        if ($result === null) {
             /* Note, this can happen only when $forward_compatible is false. */
             throw new InvalidParam('acode', "Unknown A-code.");
         }

htdocs/okapi/facade.php

Braces +6 added lines, -4 removed lines

@@ -78,8 +78,9 @@ 
         );
         $request->i_want_OkapiResponse = true;
         $request->perceive_as_http_request = true;
-        if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-            $request->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+                    $request->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        }
         $response = OkapiServiceRunner::call($service_name, $request);
         $response->display();
     }
@@ -118,8 +119,9 @@ 
      */
     public static function schedule_geocache_check($cache_codes)
     {
-        if (!is_array($cache_codes))
-            $cache_codes = array($cache_codes);
+        if (!is_array($cache_codes)) {
+                    $cache_codes = array($cache_codes);
+        }
         Db::execute("
             update caches
             set okapi_syncbase = now()

htdocs/okapi/lib/oc_session.php

Braces +12 added lines, -8 removed lines

@@ -12,18 +12,22 @@
     public static function get_user_id()
     {
         static $cached_result = false;
-        if ($cached_result !== false)
-            return $cached_result;
+        if ($cached_result !== false) {
+                    return $cached_result;
+        }
 
         $cookie_name = Settings::get('OC_COOKIE_NAME');
-        if (!isset($_COOKIE[$cookie_name]))
-            return null;
+        if (!isset($_COOKIE[$cookie_name])) {
+                    return null;
+        }
         $OC_data = unserialize(base64_decode($_COOKIE[$cookie_name]));
-        if (!isset($OC_data['sessionid']))
-            return null;
+        if (!isset($OC_data['sessionid'])) {
+                    return null;
+        }
         $OC_sessionid = $OC_data['sessionid'];
-        if (!$OC_sessionid)
-            return null;
+        if (!$OC_sessionid) {
+                    return null;
+        }
 
         return Db::select_value("select user_id from sys_sessions where uuid='".Db::escape_string($OC_sessionid)."'");
     }

htdocs/okapi/views/changelog_helper.inc.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
                 );
                 $context = stream_context_create($opts);
                 $changes_xml = file_get_contents(
-                     # TODO: load from OKAPI repo
+                        # TODO: load from OKAPI repo
                     'https://raw.githubusercontent.com/opencaching/okapi/master/etc/changes.xml',
                     false, $context
                 );

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
                     throw new ErrorException();
                 }
                 Cache::set($cache_key, $changes_xml, 3600);
-                Cache::set($cache_backup_key, $changes_xml, 3600*24*30);
+                Cache::set($cache_backup_key, $changes_xml, 3600 * 24 * 30);
             }
             catch (Exception $e)
             {
@@ -51,7 +51,7 @@ 
 
                 $changes_xml = Cache::get($cache_backup_key);
                 if ($changes_xml) {
-                    Cache::set($cache_key, $changes_xml, 3600*12);
+                    Cache::set($cache_key, $changes_xml, 3600 * 12);
                 }
             }
         }

Braces +5 added lines, -12 removed lines

@@ -20,12 +20,10 @@ 
         $changes_xml = Cache::get($cache_key);
         $changelog = null;
 
-        if (!$changes_xml)
-        {
+        if (!$changes_xml) {
             # Download the current changelog.
 
-            try
-            {
+            try {
                 $opts = array(
                     'http' => array(
                         'method' => "GET",
@@ -44,9 +42,7 @@ 
                 }
                 Cache::set($cache_key, $changes_xml, 3600);
                 Cache::set($cache_backup_key, $changes_xml, 3600*24*30);
-            }
-            catch (Exception $e)
-            {
+            } catch (Exception $e) {
                 # GitHub failed on us. User backup list, if available.
 
                 $changes_xml = Cache::get($cache_backup_key);
@@ -64,14 +60,11 @@ 
         $this->unavailable_changes = array();
         $this->available_changes = array();
 
-        if (!$changelog)
-        {
+        if (!$changelog) {
             # We could not retreive the changelog from Github, and there was
             # no backup key or it expired. Probably we are on a developer
             # machine. The template will output some error message.
-        }
-        else
-        {
+        } else {
             $commits = array();
             $versions = array();
 

htdocs/okapi/views/method_call.php

Braces +3 added lines, -2 removed lines

@@ -20,9 +20,10 @@
     {
         require_once($GLOBALS['rootpath'].'okapi/service_runner.php');
 
-        if (!OkapiServiceRunner::exists($methodname))
-            throw new BadRequest("Method '$methodname' does not exist. ".
+        if (!OkapiServiceRunner::exists($methodname)) {
+                    throw new BadRequest("Method '$methodname' does not exist. ".
                 "See OKAPI docs at ".Settings::get('SITE_URL')."okapi/");
+        }
         $options = OkapiServiceRunner::options($methodname);
         $request = new OkapiHttpRequest($options);
         return OkapiServiceRunner::call($methodname, $request);