OpencachingDeutschland / oc-server3

htdocs/okapi/services/attrs/attr_helper.inc.php

Braces +23 added lines, -18 removed lines

@@ -54,8 +54,7 @@ 
             $path = $GLOBALS['rootpath']."okapi/services/attrs/attribute-definitions.xml";
             $xml = file_get_contents($path);
             self::refresh_from_string($xml);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             # Failed to read or parse the file (i.e. after a syntax error was
             # commited). Let's check when the last successful parse occured.
@@ -127,13 +126,15 @@ 
                     /* It is used by THIS OC site. */
 
                     $internal_id = (int)$ocnode['id'];
-                    if (isset($all_internal_ids[$internal_id]))
-                        throw new Exception("The internal attribute ".$internal_id.
+                    if (isset($all_internal_ids[$internal_id])) {
+                                            throw new Exception("The internal attribute ".$internal_id.
                             " has multiple assigments to OKAPI attributes.");
+                    }
                     $all_internal_ids[$internal_id] = true;
-                    if (!is_null($attr['internal_id']))
-                        throw new Exception("There are multiple internal IDs for the ".
+                    if (!is_null($attr['internal_id'])) {
+                                            throw new Exception("There are multiple internal IDs for the ".
                             $attr['acode']." attribute.");
+                    }
                     $attr['internal_id'] = $internal_id;
                 }
             }
@@ -142,14 +143,16 @@ 
                 $lang = (string)$langnode['id'];
                 foreach ($langnode->name as $namenode)
                 {
-                    if (isset($attr['names'][$lang]))
-                        throw new Exception("Duplicate ".$lang." name of attribute ".$attr['acode']);
+                    if (isset($attr['names'][$lang])) {
+                                            throw new Exception("Duplicate ".$lang." name of attribute ".$attr['acode']);
+                    }
                     $attr['names'][$lang] = (string)$namenode;
                 }
                 foreach ($langnode->desc as $descnode)
                 {
-                    if (isset($attr['descriptions'][$lang]))
-                        throw new Exception("Duplicate ".$lang." description of attribute ".$attr['acode']);
+                    if (isset($attr['descriptions'][$lang])) {
+                                            throw new Exception("Duplicate ".$lang." description of attribute ".$attr['acode']);
+                    }
                     $xml = $descnode->asxml(); /* contains "<desc>" and "</desc>" */
                     $innerxml = preg_replace("/(^[^>]+>)|(<[^<]+$)/us", "", $xml);
                     $attr['descriptions'][$lang] = self::cleanup_string($innerxml);
@@ -210,8 +213,7 @@ 
                 self::refresh_now();
                 self::init_from_cache(false);
                 return;
-            }
-            else
+            } else
             {
                 $cachedvalue = array(
                     'attr_dict' => array(),
@@ -244,8 +246,9 @@ 
     public static function get_internal_id_to_acode_mapping()
     {
         static $mapping = null;
-        if ($mapping !== null)
-            return $mapping;
+        if ($mapping !== null) {
+                    return $mapping;
+        }
 
         $cache_key = "attrhelper/id2acode/".Okapi::$git_revision.self::cache_key_suffix();
         $mapping = Cache::get($cache_key);
@@ -253,8 +256,9 @@ 
         {
             self::init_from_cache();
             $mapping = array();
-            foreach (self::$attr_dict as $acode => &$attr_ref)
-                $mapping[$attr_ref['internal_id']] = $acode;
+            foreach (self::$attr_dict as $acode => &$attr_ref) {
+                            $mapping[$attr_ref['internal_id']] = $acode;
+            }
             Cache::set($cache_key, $mapping, self::ttl());
         }
         return $mapping;
@@ -267,8 +271,9 @@ 
     public static function get_acode_to_name_mapping($langpref)
     {
         static $mapping = null;
-        if ($mapping !== null)
-            return $mapping;
+        if ($mapping !== null) {
+                    return $mapping;
+        }
 
         $cache_key = md5(serialize(array("attrhelper/acode2name", $langpref,
             Okapi::$git_revision, self::cache_key_suffix())));

htdocs/okapi/services/apisrv/installations.php

Braces +14 added lines, -12 removed lines

@@ -49,8 +49,7 @@ 
                 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.
 
@@ -80,21 +79,24 @@ 
             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

htdocs/okapi/settings.php

Braces +42 added lines, -28 removed lines

@@ -249,41 +249,53 @@ 
 
     private static function verify(&$dict)
     {
-        if (!in_array($dict['OC_BRANCH'], array('oc.pl', 'oc.de')))
-            throw new Exception("Currently, OC_BRANCH has to be either 'oc.pl' or 'oc.de'. Hint: Whom did you get your code from?");
+        if (!in_array($dict['OC_BRANCH'], array('oc.pl', 'oc.de'))) {
+                    throw new Exception("Currently, OC_BRANCH has to be either 'oc.pl' or 'oc.de'. Hint: Whom did you get your code from?");
+        }
         $boolean_keys = array('DEBUG', 'DEBUG_PREVENT_EMAILS', 'DEBUG_PREVENT_SEMAPHORES');
-        foreach ($boolean_keys as $key)
-            if (!in_array($dict[$key], array(true, false)))
+        foreach ($boolean_keys as $key) {
+                    if (!in_array($dict[$key], array(true, false)))
                 throw new Exception("Invalid value for $key.");
-        if (count($dict['ADMINS']) == 0)
-            throw new Exception("ADMINS array has to filled (e.g. array('root@localhost')).");
-        if ($dict['DEBUG'] == false)
-            foreach ($dict as $k => $v)
+        }
+        if (count($dict['ADMINS']) == 0) {
+                    throw new Exception("ADMINS array has to filled (e.g. array('root@localhost')).");
+        }
+        if ($dict['DEBUG'] == false) {
+                    foreach ($dict as $k => $v)
                 if ((strpos($k, 'DEBUG_') === 0) && $v == true)
                     throw new Exception("When DEBUG is false, $k has to be false too.");
-        if ($dict['VAR_DIR'] == null)
-            throw new Exception("VAR_DIR cannot be null. Please provide a valid directory.");
-        if ($dict['IMAGES_DIR'] == null)
-            throw new Exception("IMAGES_DIR cannot be null. Please provide a valid directory.");
-        foreach ($dict as $k => $v)
-            if ((strpos($k, '_DIR') !== false) && ($k[strlen($k) - 1] == '/'))
+        }
+        if ($dict['VAR_DIR'] == null) {
+                    throw new Exception("VAR_DIR cannot be null. Please provide a valid directory.");
+        }
+        if ($dict['IMAGES_DIR'] == null) {
+                    throw new Exception("IMAGES_DIR cannot be null. Please provide a valid directory.");
+        }
+        foreach ($dict as $k => $v) {
+                    if ((strpos($k, '_DIR') !== false) && ($k[strlen($k) - 1] == '/'))
                 throw new Exception("None of the *_DIR settings may end with a slash. Check $k.");
+        }
         $notnull = array(
             'OC_COOKIE_NAME', 'DB_SERVER', 'DB_NAME', 'DB_USERNAME', 'SITE_URL',
             'IMAGES_URL', 'OC_NODE_ID');
-        foreach ($notnull as $k)
-            if ($dict[$k] === null)
+        foreach ($notnull as $k) {
+                    if ($dict[$k] === null)
                 throw new Exception("$k cannot be null.");
+        }
         $slash_keys = array('SITE_URL', 'IMAGES_URL');
-        foreach ($slash_keys as $key)
-            if ($dict[$key][strlen($dict[$key]) - 1] != '/')
+        foreach ($slash_keys as $key) {
+                    if ($dict[$key][strlen($dict[$key]) - 1] != '/')
                 throw new Exception("$key must end with a slash.");
-        if ($dict['REGISTRATION_URL'] === null)
-            $dict['REGISTRATION_URL'] = $dict['SITE_URL'] . 'register.php';
-        if ($dict['SITE_LOGO'] === null)
-            $dict['SITE_LOGO'] = $dict['SITE_URL'] . 'okapi/static/oc_logo.png';
-        if ($dict['JPEG_QUALITY'] < 50 || $dict['JPEG_QUALITY'] > 100)
-            throw new Exception('JPEG_QUALITY must be between 50 and 100.');
+        }
+        if ($dict['REGISTRATION_URL'] === null) {
+                    $dict['REGISTRATION_URL'] = $dict['SITE_URL'] . 'register.php';
+        }
+        if ($dict['SITE_LOGO'] === null) {
+                    $dict['SITE_LOGO'] = $dict['SITE_URL'] . 'okapi/static/oc_logo.png';
+        }
+        if ($dict['JPEG_QUALITY'] < 50 || $dict['JPEG_QUALITY'] > 100) {
+                    throw new Exception('JPEG_QUALITY must be between 50 and 100.');
+        }
 
         # The OKAPI code is only compatible with utf8 and utf8mb4 charsets.
         if (!in_array($dict['DB_CHARSET'], array('utf8', 'utf8mb4'))) {
@@ -296,11 +308,13 @@ 
      */
     public static function get($key)
     {
-        if (self::$SETTINGS == null)
-            self::load_settings();
+        if (self::$SETTINGS == null) {
+                    self::load_settings();
+        }
 
-        if (!array_key_exists($key, self::$SETTINGS))
-            throw new Exception("Tried to access an invalid settings key: '$key'");
+        if (!array_key_exists($key, self::$SETTINGS)) {
+                    throw new Exception("Tried to access an invalid settings key: '$key'");
+        }
 
         return self::$SETTINGS[$key];
     }

htdocs/okapi/oauth.php

Braces +27 added lines, -15 removed lines

@@ -473,8 +473,9 @@ 
                       "oauth_nonce" => OAuthRequest::generate_nonce(),
                       "oauth_timestamp" => OAuthRequest::generate_timestamp(),
                       "oauth_consumer_key" => $consumer->key);
-    if ($token)
-      $defaults['oauth_token'] = $token->key;
+    if ($token) {
+          $defaults['oauth_token'] = $token->key;
+    }
 
     $parameters = array_merge($defaults, $parameters);
 
@@ -597,12 +598,15 @@ 
     if($realm) {
       $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
       $first = false;
-    } else
-      $out = 'Authorization: OAuth';
+    } else {
+          $out = 'Authorization: OAuth';
+    }
 
     $total = array();
     foreach ($this->parameters as $k => $v) {
-      if (substr($k, 0, 5) != "oauth") continue;
+      if (substr($k, 0, 5) != "oauth") {
+          continue;
+      }
       if (is_array($v)) {
         throw new OAuthClientException('Arrays not supported in headers.');
       }
@@ -841,8 +845,9 @@ 
    * check that the timestamp is new enough
    */
   private function check_timestamp($timestamp) {
-    if( ! $timestamp )
-      throw new OAuthMissingParameterException('oauth_timestamp');
+    if( ! $timestamp ) {
+          throw new OAuthMissingParameterException('oauth_timestamp');
+    }
 
     // Cast to integer. See issue #314.
     $timestamp = $timestamp + 0;
@@ -859,8 +864,9 @@ 
    * check that the nonce is not repeated
    */
   private function check_nonce($consumer, $token, $nonce, $timestamp) {
-    if( ! $nonce )
-      throw new OAuthMissingParameterException('oauth_nonce');
+    if( ! $nonce ) {
+          throw new OAuthMissingParameterException('oauth_nonce');
+    }
 
     // verify that the nonce is uniqueish
     $found = $this->data_store->lookup_nonce(
@@ -967,10 +973,12 @@ 
       // otherwise we don't have apache and are just going to have to hope
       // that $_SERVER actually contains what we need
       $out = array();
-      if( isset($_SERVER['CONTENT_TYPE']) )
-        $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
-      if( isset($_ENV['CONTENT_TYPE']) )
-        $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+      if( isset($_SERVER['CONTENT_TYPE']) ) {
+              $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
+      }
+      if( isset($_ENV['CONTENT_TYPE']) ) {
+              $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+      }
 
       foreach ($_SERVER as $key => $value) {
         if (substr($key, 0, 5) == "HTTP_") {
@@ -993,7 +1001,9 @@ 
   // parameters like this
   // array('a' => array('b','c'), 'd' => 'e')
   public static function parse_parameters( $input ) {
-    if (!isset($input) || !$input) return array();
+    if (!isset($input) || !$input) {
+        return array();
+    }
 
     $pairs = explode('&', $input);
 
@@ -1022,7 +1032,9 @@ 
   }
 
   public static function build_http_query($params) {
-    if (!$params) return '';
+    if (!$params) {
+        return '';
+    }
 
     // Urlencode both keys and values
     $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));

htdocs/okapi/datastore.php

Braces +18 added lines, -16 removed lines

@@ -13,8 +13,9 @@ 
             from okapi_consumers
             where `key` = '".Db::escape_string($consumer_key)."'
         ");
-        if (!$row)
-            return null;
+        if (!$row) {
+                    return null;
+        }
         return new OkapiConsumer($row['key'], $row['secret'], $row['name'],
             $row['url'], $row['email'], $row['bflags']);
     }
@@ -29,8 +30,9 @@ 
                 and token_type = '".Db::escape_string($token_type)."'
                 and `key` = '".Db::escape_string($token)."'
         ");
-        if (!$row)
-            return null;
+        if (!$row) {
+                    return null;
+        }
         switch ($row['token_type'])
         {
             case 'request':
@@ -71,8 +73,7 @@ 
                 );
             ");
             return null;
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             # INSERT failed. This nonce was already used.
 
@@ -84,8 +85,7 @@ 
     {
         if ((preg_match("#^[a-z][a-z0-9_.-]*://#", $callback) > 0) ||
             $callback == "oob")
-        { /* ok */ }
-        else { throw new BadRequest("oauth_callback should begin with lower case <scheme>://, or should equal 'oob'."); }
+        { /* ok */ } else { throw new BadRequest("oauth_callback should begin with lower case <scheme>://, or should equal 'oob'."); }
         $token = new OkapiRequestToken(Okapi::generate_key(20), Okapi::generate_key(40),
             $consumer->key, $callback, null, Okapi::generate_key(8, true));
         Db::execute("
@@ -111,12 +111,15 @@ 
 
     public function new_access_token($token, $consumer, $verifier = null)
     {
-        if ($token->consumer_key != $consumer->key)
-            throw new BadRequest("Request Token given is not associated with the Consumer who signed the request.");
-        if (!$token->authorized_by_user_id)
-            throw new BadRequest("Request Token given has not been authorized.");
-        if ($token->verifier != $verifier)
-            throw new BadRequest("Invalid verifier.");
+        if ($token->consumer_key != $consumer->key) {
+                    throw new BadRequest("Request Token given is not associated with the Consumer who signed the request.");
+        }
+        if (!$token->authorized_by_user_id) {
+                    throw new BadRequest("Request Token given has not been authorized.");
+        }
+        if ($token->verifier != $verifier) {
+                    throw new BadRequest("Invalid verifier.");
+        }
 
         # Invalidate the Request Token.
 
@@ -144,8 +147,7 @@ 
 
             $access_token = new OkapiAccessToken($row['key'], $row['secret'],
                 $consumer->key, $token->authorized_by_user_id);
-        }
-        else
+        } else
         {
             # Generate a new Access Token.
 

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

Braces +12 added lines, -8 removed lines

@@ -20,8 +20,9 @@ 
     public static function get_required_locales()
     {
         $arr = array('POSIX');
-        foreach (self::$languages as $key => $value)
-            $arr[] = $value['locale'];
+        foreach (self::$languages as $key => $value) {
+                    $arr[] = $value['locale'];
+        }
         return $arr;
     }
 
@@ -31,16 +32,18 @@ 
     public static function get_installed_locales()
     {
         $arr = array();
-        foreach (explode("\n", shell_exec("locale -a")) as $item)
-            if ($item)
+        foreach (explode("\n", shell_exec("locale -a")) as $item) {
+                    if ($item)
                 $arr[] = $item;
+        }
         return $arr;
     }
 
     private static function get_locale_for_language($lang)
     {
-        if (isset(self::$languages[$lang]))
-            return self::$languages[$lang]['locale'];
+        if (isset(self::$languages[$lang])) {
+                    return self::$languages[$lang]['locale'];
+        }
         return null;
     }
 
@@ -49,8 +52,9 @@ 
         foreach ($langprefs as $lang)
         {
             $locale = self::get_locale_for_language($lang);
-            if ($locale != null)
-                return $locale;
+            if ($locale != null) {
+                            return $locale;
+            }
         }
         return self::$languages['en']['locale'];
     }

htdocs/okapi/core.php

Braces +351 added lines, -253 removed lines

@@ -29,14 +29,15 @@ 
     {
         try
         {
-            foreach (Settings::get('ADMINS') as $email)
-                if (!in_array($email, $emails))
+            foreach (Settings::get('ADMINS') as $email) {
+                            if (!in_array($email, $emails))
                     $emails[] = $email;
-        }
-        catch (Exception $e) { /* pass */ }
+            }
+        } catch (Exception $e) { /* pass */ }
+    }
+    if (count($emails) == 0) {
+            $emails[] = 'root@localhost';
     }
-    if (count($emails) == 0)
-        $emails[] = 'root@localhost';
     return $emails;
 }
 
@@ -81,16 +82,16 @@ 
             # of this exception. All of them result in HTTP 400 or HTTP 401 error
             # code. See also: http://oauth.net/core/1.0a/#http_codes
 
-            if ($e instanceof OAuthServer400Exception)
-                header("HTTP/1.0 400 Bad Request");
-            else
-                header("HTTP/1.0 401 Unauthorized");
+            if ($e instanceof OAuthServer400Exception) {
+                            header("HTTP/1.0 400 Bad Request");
+            } else {
+                            header("HTTP/1.0 401 Unauthorized");
+            }
             header("Access-Control-Allow-Origin: *");
             header("Content-Type: application/json; charset=utf-8");
 
             print $e->getOkapiJSON();
-        }
-        elseif ($e instanceof BadRequest)
+        } elseif ($e instanceof BadRequest)
         {
             # Intentionally thrown from within the OKAPI method code.
             # Consumer (aka external developer) had something wrong with his
@@ -105,8 +106,7 @@ 
             }
 
             print $e->getOkapiJSON();
-        }
-        else # (ErrorException, MySQL exception etc.)
+        } else # (ErrorException, MySQL exception etc.)
         {
             # This one is thrown on PHP notices and warnings - usually this
             # indicates an error in OKAPI method. If thrown, then something
@@ -137,8 +137,7 @@ 
             {
                 # Sending emails was blocked on admin's demand.
                 # This is possible only on development environment.
-            }
-            else
+            } else
             {
                 $subject = "OKAPI Method Error - ".substr(
                     $_SERVER['REQUEST_URI'], 0, strpos(
@@ -153,16 +152,16 @@ 
                 try
                 {
                     Okapi::mail_admins($subject, $message);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     # Unable to use full-featured mail_admins version. We'll use a backup.
                     # We need to make sure we're not spamming.
 
                     $lock_file = "/tmp/okapi-fatal-error-mode";
                     $last_email = false;
-                    if (file_exists($lock_file))
-                        $last_email = filemtime($lock_file);
+                    if (file_exists($lock_file)) {
+                                            $last_email = filemtime($lock_file);
+                    }
                     if ($last_email === false) {
                         # Assume this is the first email.
                         $last_email = 0;
@@ -219,8 +218,7 @@ 
             # the file and line.
 
             $exception_info .= "File: ".$e->getFile()."\nLine: ".$e->getLine()."\n\n";
-        }
-        else
+        } else
         {
             $exception_info .= "--- Stack trace ---\n".
                 self::removeSensitiveData($e->getTraceAsString())."\n\n";
@@ -254,7 +252,9 @@ 
     /** Handle error encountered while executing OKAPI request. */
     public static function handle($severity, $message, $filename, $lineno)
     {
-        if ($severity == E_STRICT || $severity == E_DEPRECATED) return false;
+        if ($severity == E_STRICT || $severity == E_DEPRECATED) {
+            return false;
+        }
         if (($severity == E_NOTICE) && !self::$treat_notices_as_errors) {
             return false;
         }
@@ -340,10 +340,11 @@ 
     {
         $this->paramName = $paramName;
         $this->whats_wrong_about_it = $whats_wrong_about_it;
-        if ($whats_wrong_about_it)
-            parent::__construct("Parameter '$paramName' has invalid value: ".$whats_wrong_about_it, $code);
-        else
-            parent::__construct("Parameter '$paramName' has invalid value.", $code);
+        if ($whats_wrong_about_it) {
+                    parent::__construct("Parameter '$paramName' has invalid value: ".$whats_wrong_about_it, $code);
+        } else {
+                    parent::__construct("Parameter '$paramName' has invalid value.", $code);
+        }
     }
 }
 
@@ -369,9 +370,9 @@ 
             mysql_select_db(Settings::get('DB_NAME'));
             mysql_query("set names '" . Settings::get('DB_CHARSET') . "'");
             self::$connected = true;
+        } else {
+                    throw new Exception("Could not connect to MySQL: ".mysql_error());
         }
-        else
-            throw new Exception("Could not connect to MySQL: ".mysql_error());
     }
 
     /** Fetch [{row}], return {row}. */
@@ -402,12 +403,14 @@ 
         while (true)
         {
             $row = Db::fetch_assoc($rs);
-            if ($row === false)
-                break;
-            if ($keyField == null)
-                $arr[] = $row;
-            else
-                $arr[$row[$keyField]] = $row;
+            if ($row === false) {
+                            break;
+            }
+            if ($keyField == null) {
+                            $arr[] = $row;
+            } else {
+                            $arr[$row[$keyField]] = $row;
+            }
         }
         Db::free_result($rs);
     }
@@ -420,8 +423,9 @@ 
         while (true)
         {
             $row = Db::fetch_assoc($rs);
-            if ($row === false)
-                break;
+            if ($row === false) {
+                            break;
+            }
             $groups[$row[$keyField]][] = $row;
         }
         Db::free_result($rs);
@@ -432,10 +436,12 @@ 
     public static function select_value($query)
     {
         $column = self::select_column($query);
-        if ($column == null)
-            return null;
-        if (count($column) == 1)
-            return $column[0];
+        if ($column == null) {
+                    return null;
+        }
+        if (count($column) == 1) {
+                    return $column[0];
+        }
         throw new DbException("Invalid query. Db::select_value returned more than one row for:\n\n".$query."\n");
     }
 
@@ -447,8 +453,9 @@ 
         while (true)
         {
             $values = Db::fetch_row($rs);
-            if ($values === false)
-                break;
+            if ($values === false) {
+                            break;
+            }
             array_push($column, $values[0]);
         }
         Db::free_result($rs);
@@ -488,15 +495,17 @@ 
     public static function execute($query)
     {
         $rs = self::query($query);
-        if ($rs !== true)
-            throw new DbException("Db::execute returned a result set for your query. ".
+        if ($rs !== true) {
+                    throw new DbException("Db::execute returned a result set for your query. ".
                 "You should use Db::select_* or Db::query for SELECT queries!");
+        }
     }
 
     public static function query($query)
     {
-        if (!self::$connected)
-            self::connect();
+        if (!self::$connected) {
+                    self::connect();
+        }
         $rs = mysql_query($query);
         if (!$rs)
         {
@@ -555,8 +564,9 @@ 
 
     public static function field_exists($table, $field)
     {
-        if (!preg_match("/[a-z0-9_]+/", $table.$field))
-            return false;
+        if (!preg_match("/[a-z0-9_]+/", $table.$field)) {
+                    return false;
+        }
         try {
             $spec = self::select_all("desc ".$table.";");
         } catch (Exception $e) {
@@ -564,8 +574,9 @@ 
             return false;
         }
         foreach ($spec as &$row_ref) {
-            if (strtoupper($row_ref['Field']) == strtoupper($field))
-                return true;
+            if (strtoupper($row_ref['Field']) == strtoupper($field)) {
+                            return true;
+            }
         }
         return false;
     }
@@ -765,10 +776,11 @@ 
         } catch (OAuthMissingParameterException $e) {
             # Note, that exception will be different if token is supplied
             # and is invalid. We catch only a completely MISSING token parameter.
-            if (($e->getParamName() == 'oauth_token') && (!$token_required))
-                $token = null;
-            else
-                throw $e;
+            if (($e->getParamName() == 'oauth_token') && (!$token_required)) {
+                            $token = null;
+            } else {
+                            throw $e;
+            }
         }
         $this->check_signature($request, $consumer, $token);
         return array($consumer, $token);
@@ -798,8 +810,9 @@ 
 
     public function get_length()
     {
-        if (is_resource($this->body))
-            return $this->stream_length;
+        if (is_resource($this->body)) {
+                    return $this->stream_length;
+        }
         return strlen($this->body);
     }
 
@@ -808,11 +821,12 @@ 
     {
         if (is_resource($this->body))
         {
-            while (!feof($this->body))
-                print fread($this->body, 1024*1024);
+            while (!feof($this->body)) {
+                            print fread($this->body, 1024*1024);
+            }
+        } else {
+                    print $this->body;
         }
-        else
-            print $this->body;
     }
 
     /**
@@ -826,9 +840,9 @@ 
             ob_start();
             fpassthru($this->body);
             return ob_get_clean();
+        } else {
+                    return $this->body;
         }
-        else
-            return $this->body;
     }
 
     /**
@@ -840,17 +854,21 @@ 
         header("Access-Control-Allow-Origin: *");
         header("Content-Type: ".$this->content_type);
         header("Cache-Control: ".$this->cache_control);
-        if ($this->connection_close)
-            header("Connection: close");
-        if ($this->content_disposition)
-            header("Content-Disposition: ".$this->content_disposition);
-        if ($this->etag)
-            header("ETag: $this->etag");
+        if ($this->connection_close) {
+                    header("Connection: close");
+        }
+        if ($this->content_disposition) {
+                    header("Content-Disposition: ".$this->content_disposition);
+        }
+        if ($this->etag) {
+                    header("ETag: $this->etag");
+        }
 
         # Make sure that gzip is supported by the client.
         $use_gzip = $this->allow_gzip;
-        if (empty($_SERVER["HTTP_ACCEPT_ENCODING"]) || (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") === false))
-            $use_gzip = false;
+        if (empty($_SERVER["HTTP_ACCEPT_ENCODING"]) || (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") === false)) {
+                    $use_gzip = false;
+        }
 
         # We will gzip the data ourselves, while disabling gziping by Apache. This way, we can
         # set the Content-Length correctly which is handy in some scenarios.
@@ -863,8 +881,7 @@ 
             $gzipped = gzencode($this->body, 5);
             header("Content-Length: ".strlen($gzipped));
             print $gzipped;
-        }
-        else
+        } else
         {
             # We don't want Apache to gzip this response. Tell it so.
 
@@ -873,8 +890,9 @@ 
             }
 
             $length = $this->get_length();
-            if ($length)
-                header("Content-Length: ".$length);
+            if ($length) {
+                            header("Content-Length: ".$length);
+            }
             $this->print_body();
         }
     }
@@ -954,8 +972,7 @@ 
             # Using semaphores is forbidden on this server by its admin.
             # This is possible only on development environment.
             $this->lock = null;
-        }
-        else
+        } else
         {
             $this->lockfile = Okapi::get_var_dir()."/okapi-lock-".$name;
             $this->lock = fopen($this->lockfile, "wb");
@@ -964,22 +981,26 @@ 
 
     public function acquire()
     {
-        if ($this->lock !== null)
-            flock($this->lock, LOCK_EX);
+        if ($this->lock !== null) {
+                    flock($this->lock, LOCK_EX);
+        }
     }
 
     public function try_acquire()
     {
-        if ($this->lock !== null)
-            return flock($this->lock, LOCK_EX | LOCK_NB);
-        else
-            return true;  # $lock can be null only when debugging
+        if ($this->lock !== null) {
+                    return flock($this->lock, LOCK_EX | LOCK_NB);
+        } else {
+                    return true;
+        }
+        # $lock can be null only when debugging
     }
 
     public function release()
     {
-        if ($this->lock !== null)
-            flock($this->lock, LOCK_UN);
+        if ($this->lock !== null) {
+                    flock($this->lock, LOCK_UN);
+        }
     }
 
     /**
@@ -1040,11 +1061,13 @@ 
                 from okapi_vars
             ");
             self::$okapi_vars = array();
-            while ($row = Db::fetch_assoc($rs))
-                self::$okapi_vars[$row['var']] = $row['value'];
+            while ($row = Db::fetch_assoc($rs)) {
+                            self::$okapi_vars[$row['var']] = $row['value'];
+            }
+        }
+        if (isset(self::$okapi_vars[$varname])) {
+                    return self::$okapi_vars[$varname];
         }
-        if (isset(self::$okapi_vars[$varname]))
-            return self::$okapi_vars[$varname];
         return $default;
     }
 
@@ -1100,8 +1123,9 @@ 
 
             return;
         }
-        if ($counter === null)
-            $counter = 0;
+        if ($counter === null) {
+                    $counter = 0;
+        }
         $counter++;
         try {
             Cache::set($cache_key, $counter, 3600);
@@ -1114,8 +1138,7 @@ 
             # We're not spamming yet.
 
             self::mail_from_okapi(get_admin_emails(), $subject, $message);
-        }
-        else
+        } else
         {
             # We are spamming. Prevent sending more emails.
 
@@ -1148,8 +1171,9 @@ 
             # This is possible only on development environment.
             return;
         }
-        if (!is_array($email_addresses))
-            $email_addresses = array($email_addresses);
+        if (!is_array($email_addresses)) {
+                    $email_addresses = array($email_addresses);
+        }
         $sender_email = class_exists("okapi\\Settings") ? Settings::get('FROM_FIELD') : 'root@localhost';
         mail(implode(", ", $email_addresses), $subject, $message,
             "Content-Type: text/plain; charset=utf-8\n".
@@ -1162,16 +1186,18 @@ 
     public static function get_var_dir()
     {
         $dir = Settings::get('VAR_DIR');
-        if ($dir != null)
-            return rtrim($dir, "/");
+        if ($dir != null) {
+                    return rtrim($dir, "/");
+        }
         throw new Exception("You need to set a valid VAR_DIR.");
     }
 
     /** Returns something like "Opencaching.PL" or "Opencaching.DE". */
     public static function get_normalized_site_name($site_url = null)
     {
-        if ($site_url == null)
-            $site_url = Settings::get('SITE_URL');
+        if ($site_url == null) {
+                    $site_url = Settings::get('SITE_URL');
+        }
         $matches = null;
         if (preg_match("#^https?://(www.)?opencaching.([a-z.]+)/$#", $site_url, $matches)) {
             return "Opencaching.".strtoupper($matches[2]);
@@ -1320,11 +1346,13 @@ 
      */
     public static function pick_best_language($langdict, $langprefs)
     {
-        foreach ($langprefs as $pref)
-            if (isset($langdict[$pref]))
+        foreach ($langprefs as $pref) {
+                    if (isset($langdict[$pref]))
                 return $langdict[$pref];
-        foreach ($langdict as &$text_ref)
-            return $text_ref;
+        }
+        foreach ($langdict as &$text_ref) {
+                    return $text_ref;
+        }
         return "";
     }
 
@@ -1405,8 +1433,9 @@ 
     {
         # Put the langprefs on the stack.
 
-        if ($langprefs == null)
-            $langprefs = array(Settings::get('SITELANG'));
+        if ($langprefs == null) {
+                    $langprefs = array(Settings::get('SITELANG'));
+        }
         self::$gettext_langprefs_stack[] = $langprefs;
 
         if (count(self::$gettext_langprefs_stack) == 1)
@@ -1438,8 +1467,7 @@ 
         {
             $langprefs = self::$gettext_langprefs_stack[$size - 1];
             self::gettext_set_lang($langprefs);
-        }
-        else
+        } else
         {
             # The stack is empty. This means we're going out of OKAPI code and
             # we want the original textdomain reestablished.
@@ -1455,20 +1483,25 @@ 
     public static function init_internals($allow_cronjobs = true)
     {
         static $init_made = false;
-        if ($init_made)
-            return;
+        if ($init_made) {
+                    return;
+        }
         ini_set('memory_limit', '256M');
         # The memory limit is - among other - crucial for the maximum size
         # of processable images; see services/logs/images/add.php: max_pixels()
         Db::connect();
-        if (Settings::get('TIMEZONE') !== null)
-            date_default_timezone_set(Settings::get('TIMEZONE'));
-        if (!self::$data_store)
-            self::$data_store = new OkapiDataStore();
-        if (!self::$server)
-            self::$server = new OkapiOAuthServer(self::$data_store);
-        if ($allow_cronjobs)
-            self::execute_prerequest_cronjobs();
+        if (Settings::get('TIMEZONE') !== null) {
+                    date_default_timezone_set(Settings::get('TIMEZONE'));
+        }
+        if (!self::$data_store) {
+                    self::$data_store = new OkapiDataStore();
+        }
+        if (!self::$server) {
+                    self::$server = new OkapiOAuthServer(self::$data_store);
+        }
+        if ($allow_cronjobs) {
+                    self::execute_prerequest_cronjobs();
+        }
         $init_made = true;
     }
 
@@ -1479,10 +1512,11 @@ 
      */
     public static function generate_key($length, $user_friendly = false)
     {
-        if ($user_friendly)
-            $chars = "0123456789";
-        else
-            $chars = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+        if ($user_friendly) {
+                    $chars = "0123456789";
+        } else {
+                    $chars = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+        }
         $max = strlen($chars);
         $key = "";
         for ($i=0; $i<$length; $i++)
@@ -1504,10 +1538,11 @@ 
             $appname, $appurl, $email);
         $sample_cache = OkapiServiceRunner::call("services/caches/search/all",
             new OkapiInternalRequest($consumer, null, array('limit', 1)));
-        if (count($sample_cache['results']) > 0)
-            $sample_cache_code = $sample_cache['results'][0];
-        else
-            $sample_cache_code = "CACHECODE";
+        if (count($sample_cache['results']) > 0) {
+                    $sample_cache_code = $sample_cache['results'][0];
+        } else {
+                    $sample_cache_code = "CACHECODE";
+        }
 
         # Message for the Consumer.
         ob_start();
@@ -1558,7 +1593,9 @@ 
         # to floating point precision limits. See issue #351 for details.
         #
         $d = acos(min(1, cos($x1) * cos($x2) + sin($x1) * sin($x2) * cos(($lon1-$lon2) * 3.14159 / 180))) * 6371000;
-        if ($d < 0) $d = 0;
+        if ($d < 0) {
+            $d = 0;
+        }
         return $d;
     }
 
@@ -1581,10 +1618,15 @@ 
     /** Return bearing (float 0..360) from geopoint 1 to 2. */
     public static function get_bearing($lat1, $lon1, $lat2, $lon2)
     {
-        if ($lat1 == $lat2 && $lon1 == $lon2)
-            return null;
-        if ($lat1 == $lat2) $lat1 += 0.0000166;
-        if ($lon1 == $lon2) $lon1 += 0.0000166;
+        if ($lat1 == $lat2 && $lon1 == $lon2) {
+                    return null;
+        }
+        if ($lat1 == $lat2) {
+            $lat1 += 0.0000166;
+        }
+        if ($lon1 == $lon2) {
+            $lon1 += 0.0000166;
+        }
 
         $rad_lat1 = $lat1 / 180.0 * 3.14159;
         $rad_lon1 = $lon1 / 180.0 * 3.14159;
@@ -1595,7 +1637,9 @@ 
         $bearing = atan2(sin($delta_lon) * cos($rad_lat2),
             cos($rad_lat1) * sin($rad_lat2) - sin($rad_lat1) * cos($rad_lat2) * cos($delta_lon));
         $bearing = 180.0 * $bearing / 3.14159;
-        if ( $bearing < 0.0 ) $bearing = $bearing + 360.0;
+        if ( $bearing < 0.0 ) {
+            $bearing = $bearing + 360.0;
+        }
 
         return $bearing;
     }
@@ -1604,7 +1648,9 @@ 
     public static function bearing_as_two_letters($b)
     {
         static $names = array('N', 'NE', 'E', 'SE', 'S', 'SW', 'W', 'NW');
-        if ($b === null) return 'n/a';
+        if ($b === null) {
+            return 'n/a';
+        }
         return $names[round(($b / 360.0) * 8.0) % 8];
     }
 
@@ -1613,7 +1659,9 @@ 
     {
         static $names = array('N', 'NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE',
             'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW');
-        if ($b === null) return 'n/a';
+        if ($b === null) {
+            return 'n/a';
+        }
         return $names[round(($b / 360.0) * 16.0) % 16];
     }
 
@@ -1641,46 +1689,48 @@ 
             return $object;
         }
         $format = $request->get_parameter('format');
-        if ($format == null) $format = 'json';
-        if (!in_array($format, array('json', 'jsonp', 'xmlmap', 'xmlmap2')))
-            throw new InvalidParam('format', "'$format'");
+        if ($format == null) {
+            $format = 'json';
+        }
+        if (!in_array($format, array('json', 'jsonp', 'xmlmap', 'xmlmap2'))) {
+                    throw new InvalidParam('format', "'$format'");
+        }
         $callback = $request->get_parameter('callback');
-        if ($callback && $format != 'jsonp')
-            throw new BadRequest("The 'callback' parameter is reserved to be used with the JSONP output format.");
+        if ($callback && $format != 'jsonp') {
+                    throw new BadRequest("The 'callback' parameter is reserved to be used with the JSONP output format.");
+        }
         if ($format == 'json')
         {
             $response = new OkapiHttpResponse();
             $response->content_type = "application/json; charset=utf-8";
             $response->body = json_encode($object);
             return $response;
-        }
-        elseif ($format == 'jsonp')
+        } elseif ($format == 'jsonp')
         {
-            if (!$callback)
-                throw new BadRequest("'callback' parameter is required for JSONP calls");
-            if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $callback))
-                throw new InvalidParam('callback', "'$callback' doesn't seem to be a valid JavaScript function name (should match /^[a-zA-Z_][a-zA-Z0-9_]*\$/).");
+            if (!$callback) {
+                            throw new BadRequest("'callback' parameter is required for JSONP calls");
+            }
+            if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $callback)) {
+                            throw new InvalidParam('callback', "'$callback' doesn't seem to be a valid JavaScript function name (should match /^[a-zA-Z_][a-zA-Z0-9_]*\$/).");
+            }
             $response = new OkapiHttpResponse();
             $response->content_type = "application/javascript; charset=utf-8";
             $response->body = $callback."(".json_encode($object).");";
             return $response;
-        }
-        elseif ($format == 'xmlmap')
+        } elseif ($format == 'xmlmap')
         {
             # Deprecated (see issue 128). Keeping this for backward-compatibility.
             $response = new OkapiHttpResponse();
             $response->content_type = "text/xml; charset=utf-8";
             $response->body = self::xmlmap_dumps($object);
             return $response;
-        }
-        elseif ($format == 'xmlmap2')
+        } elseif ($format == 'xmlmap2')
         {
             $response = new OkapiHttpResponse();
             $response->content_type = "text/xml; charset=utf-8";
             $response->body = self::xmlmap2_dumps($object);
             return $response;
-        }
-        else
+        } else
         {
             # Should not happen (as we do a proper check above).
             throw new Exception();
@@ -1694,24 +1744,19 @@ 
             $chunks[] = "<string>";
             $chunks[] = self::xmlescape($obj);
             $chunks[] = "</string>";
-        }
-        elseif (is_int($obj))
+        } elseif (is_int($obj))
         {
             $chunks[] = "<int>$obj</int>";
-        }
-        elseif (is_float($obj))
+        } elseif (is_float($obj))
         {
             $chunks[] = "<float>$obj</float>";
-        }
-        elseif (is_bool($obj))
+        } elseif (is_bool($obj))
         {
             $chunks[] = $obj ? "<bool>true</bool>" : "<bool>false</bool>";
-        }
-        elseif (is_null($obj))
+        } elseif (is_null($obj))
         {
             $chunks[] = "<null/>";
-        }
-        elseif (is_array($obj))
+        } elseif (is_array($obj))
         {
             # Have to check if this is associative or not! Shit. I hate PHP.
             if (array_keys($obj) === range(0, count($obj) - 1))
@@ -1725,8 +1770,7 @@ 
                     $chunks[] = "</item>";
                 }
                 $chunks[] = "</list>";
-            }
-            else
+            } else
             {
                 # Assoc.
                 $chunks[] = "<dict>";
@@ -1738,8 +1782,7 @@ 
                 }
                 $chunks[] = "</dict>";
             }
-        }
-        else
+        } else
         {
             # That's a bug.
             throw new Exception("Cannot encode as xmlmap: " + print_r($obj, true));
@@ -1754,24 +1797,19 @@ 
             $chunks[] = "<string$attrs>";
             $chunks[] = self::xmlescape($obj);
             $chunks[] = "</string>";
-        }
-        elseif (is_int($obj))
+        } elseif (is_int($obj))
         {
             $chunks[] = "<number$attrs>$obj</number>";
-        }
-        elseif (is_float($obj))
+        } elseif (is_float($obj))
         {
             $chunks[] = "<number$attrs>$obj</number>";
-        }
-        elseif (is_bool($obj))
+        } elseif (is_bool($obj))
         {
             $chunks[] = $obj ? "<boolean$attrs>true</boolean>" : "<boolean$attrs>false</boolean>";
-        }
-        elseif (is_null($obj))
+        } elseif (is_null($obj))
         {
             $chunks[] = "<null$attrs/>";
-        }
-        elseif (is_array($obj) || ($obj instanceof ArrayObject))
+        } elseif (is_array($obj) || ($obj instanceof ArrayObject))
         {
             # Have to check if this is associative or not! Shit. I hate PHP.
             if (is_array($obj) && (array_keys($obj) === range(0, count($obj) - 1)))
@@ -1783,8 +1821,7 @@ 
                     self::_xmlmap2_add($chunks, $item_ref, null);
                 }
                 $chunks[] = "</array>";
-            }
-            else
+            } else
             {
                 # Assoc.
                 $chunks[] = "<object$attrs>";
@@ -1794,8 +1831,7 @@ 
                 }
                 $chunks[] = "</object>";
             }
-        }
-        else
+        } else
         {
             # That's a bug.
             throw new Exception("Cannot encode as xmlmap2: " . print_r($obj, true));
@@ -1851,8 +1887,9 @@ 
     public static function cache_type_name2id($name)
     {
         $ref = &self::$cache_types[Settings::get('OC_BRANCH')];
-        if (isset($ref[$name]))
-            return $ref[$name];
+        if (isset($ref[$name])) {
+                    return $ref[$name];
+        }
         throw new Exception("Method cache_type_name2id called with unsupported cache ".
             "type name '$name'. You should not allow users to submit caches ".
             "of non-primary type.");
@@ -1865,11 +1902,13 @@ 
         if ($reversed == null)
         {
             $reversed = array();
-            foreach (self::$cache_types[Settings::get('OC_BRANCH')] as $key => $value)
-                $reversed[$value] = $key;
+            foreach (self::$cache_types[Settings::get('OC_BRANCH')] as $key => $value) {
+                            $reversed[$value] = $key;
+            }
+        }
+        if (isset($reversed[$id])) {
+                    return $reversed[$id];
         }
-        if (isset($reversed[$id]))
-            return $reversed[$id];
         return "Other";
     }
 
@@ -1880,8 +1919,9 @@ 
     /** E.g. 'Available' => 1. For unknown names throws an Exception. */
     public static function cache_status_name2id($name)
     {
-        if (isset(self::$cache_statuses[$name]))
-            return self::$cache_statuses[$name];
+        if (isset(self::$cache_statuses[$name])) {
+                    return self::$cache_statuses[$name];
+        }
         throw new Exception("Method cache_status_name2id called with invalid name '$name'.");
     }
 
@@ -1892,11 +1932,13 @@ 
         if ($reversed == null)
         {
             $reversed = array();
-            foreach (self::$cache_statuses as $key => $value)
-                $reversed[$value] = $key;
+            foreach (self::$cache_statuses as $key => $value) {
+                            $reversed[$value] = $key;
+            }
+        }
+        if (isset($reversed[$id])) {
+                    return $reversed[$id];
         }
-        if (isset($reversed[$id]))
-            return $reversed[$id];
         return 'Archived';
     }
 
@@ -1914,8 +1956,9 @@ 
     /** E.g. 'micro' => 2. For unknown names throw an Exception. */
     public static function cache_size2_to_sizeid($size2)
     {
-        if (isset(self::$cache_sizes[$size2]))
-            return self::$cache_sizes[$size2];
+        if (isset(self::$cache_sizes[$size2])) {
+                    return self::$cache_sizes[$size2];
+        }
         throw new Exception("Method cache_size2_to_sizeid called with invalid size2 '$size2'.");
     }
 
@@ -1926,11 +1969,13 @@ 
         if ($reversed == null)
         {
             $reversed = array();
-            foreach (self::$cache_sizes as $key => $value)
-                $reversed[$value] = $key;
+            foreach (self::$cache_sizes as $key => $value) {
+                            $reversed[$value] = $key;
+            }
+        }
+        if (isset($reversed[$id])) {
+                    return $reversed[$id];
         }
-        if (isset($reversed[$id]))
-            return $reversed[$id];
         return "other";
     }
 
@@ -1953,8 +1998,9 @@ 
      */
     public static function cache_size2_to_oxsize($size2)
     {
-        if (array_key_exists($size2, self::$cache_OX_sizes))
-            return self::$cache_OX_sizes[$size2];
+        if (array_key_exists($size2, self::$cache_OX_sizes)) {
+                    return self::$cache_OX_sizes[$size2];
+        }
         throw new Exception("Method cache_size2_to_oxsize called with invalid size2 '$size2'.");
     }
 
@@ -1963,12 +2009,24 @@ 
      */
     public static function logtypename2id($name)
     {
-        if ($name == 'Found it') return 1;
-        if ($name == "Didn't find it") return 2;
-        if ($name == 'Comment') return 3;
-        if ($name == 'Attended') return 7;
-        if ($name == 'Will attend') return 8;
-        if (($name == 'Needs maintenance') && (Settings::get('OC_BRANCH') == 'oc.pl')) return 5;
+        if ($name == 'Found it') {
+            return 1;
+        }
+        if ($name == "Didn't find it") {
+            return 2;
+        }
+        if ($name == 'Comment') {
+            return 3;
+        }
+        if ($name == 'Attended') {
+            return 7;
+        }
+        if ($name == 'Will attend') {
+            return 8;
+        }
+        if (($name == 'Needs maintenance') && (Settings::get('OC_BRANCH') == 'oc.pl')) {
+            return 5;
+        }
         throw new Exception("logtype2id called with invalid log type argument: $name");
     }
 
@@ -1981,21 +2039,47 @@ 
         # These names are officially documented and may never change!
 
         # Primary.
-        if ($id == 1) return "Found it";
-        if ($id == 2) return "Didn't find it";
-        if ($id == 3) return "Comment";
-        if ($id == 7) return "Attended";
-        if ($id == 8) return "Will attend";
+        if ($id == 1) {
+            return "Found it";
+        }
+        if ($id == 2) {
+            return "Didn't find it";
+        }
+        if ($id == 3) {
+            return "Comment";
+        }
+        if ($id == 7) {
+            return "Attended";
+        }
+        if ($id == 8) {
+            return "Will attend";
+        }
 
         # Other.
-        if ($id == 4) return "Moved";
-        if ($id == 5) return "Needs maintenance";
-        if ($id == 6) return "Maintenance performed";
-        if ($id == 9) return "Archived";
-        if ($id == 10) return "Ready to search";
-        if ($id == 11) return "Temporarily unavailable";
-        if ($id == 12) return "OC Team comment";
-        if ($id == 13 || $id == 14) return "Locked";
+        if ($id == 4) {
+            return "Moved";
+        }
+        if ($id == 5) {
+            return "Needs maintenance";
+        }
+        if ($id == 6) {
+            return "Maintenance performed";
+        }
+        if ($id == 9) {
+            return "Archived";
+        }
+        if ($id == 10) {
+            return "Ready to search";
+        }
+        if ($id == 11) {
+            return "Temporarily unavailable";
+        }
+        if ($id == 12) {
+            return "OC Team comment";
+        }
+        if ($id == 13 || $id == 14) {
+            return "Locked";
+        }
 
         # Important: This set is not closed. Other types may be introduced
         # in the future. This has to be documented in the public method
@@ -2047,8 +2131,9 @@ 
     function php_ini_get_bytes($variable)
     {
         $value = trim(ini_get($variable));
-        if (!preg_match("/^[0-9]+[KM]?$/", $value))
-            throw new Exception("Unexpected PHP setting: ".$variable. " = ".$value);
+        if (!preg_match("/^[0-9]+[KM]?$/", $value)) {
+                    throw new Exception("Unexpected PHP setting: ".$variable. " = ".$value);
+        }
         $value = str_replace('K', '*1024', $value);
         $value = str_replace('M', '*1024*1024', $value);
         $value = eval('return '.$value.';');
@@ -2116,8 +2201,9 @@ 
     /** Do 'set' on many keys at once. */
     public static function set_many($dict, $timeout)
     {
-        if (count($dict) == 0)
-            return;
+        if (count($dict) == 0) {
+                    return;
+        }
         if ($timeout == null)
         {
             # The current cache implementation is ALWAYS persistent, so we will
@@ -2153,15 +2239,18 @@ 
                 and expires > now()
         ");
         list($blob, $score) = Db::fetch_row($rs);
-        if (!$blob)
-            return null;
-        if ($score != null)  # Only non-null entries are scored.
+        if (!$blob) {
+                    return null;
+        }
+        if ($score != null) {
+            # Only non-null entries are scored.
         {
             Db::execute("
                 insert into okapi_cache_reads (`cache_key`)
                 values ('".Db::escape_string($key)."')
             ");
         }
+        }
         return unserialize(gzinflate($blob));
     }
 
@@ -2181,8 +2270,7 @@ 
             try
             {
                 $dict[$row['key']] = unserialize(gzinflate($row['value']));
-            }
-            catch (ErrorException $e)
+            } catch (ErrorException $e)
             {
                 unset($dict[$row['key']]);
                 Okapi::mail_admins("Debug: Unserialize error",
@@ -2192,10 +2280,11 @@ 
                     "Length of data, compressed: ".strlen($row['value']));
             }
         }
-        if (count($dict) < count($keys))
-            foreach ($keys as $key)
+        if (count($dict) < count($keys)) {
+                    foreach ($keys as $key)
                 if (!isset($dict[$key]))
                     $dict[$key] = null;
+        }
         return $dict;
     }
 
@@ -2210,8 +2299,9 @@ 
     /** Do 'delete' on many keys at once. */
     public static function delete_many($keys)
     {
-        if (count($keys) == 0)
-            return;
+        if (count($keys) == 0) {
+                    return;
+        }
         Db::execute("
             delete from okapi_cache
             where `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys))."')
@@ -2229,8 +2319,9 @@ 
     public static function get_file_path($key)
     {
         $filename = Okapi::get_var_dir()."/okapi_filecache_".md5($key);
-        if (!file_exists($filename))
-            return null;
+        if (!file_exists($filename)) {
+                    return null;
+        }
         return $filename;
     }
 
@@ -2316,17 +2407,19 @@ 
         $this->consumer = $consumer;
         $this->token = $token;
         $this->parameters = array();
-        foreach ($parameters as $key => $value)
-            if ($value !== null)
+        foreach ($parameters as $key => $value) {
+                    if ($value !== null)
                 $this->parameters[$key] = $value;
+        }
     }
 
     public function get_parameter($name)
     {
-        if (isset($this->parameters[$name]))
-            return $this->parameters[$name];
-        else
-            return null;
+        if (isset($this->parameters[$name])) {
+                    return $this->parameters[$name];
+        } else {
+                    return null;
+        }
     }
 
     public function get_all_parameters_including_unknown()
@@ -2377,7 +2470,9 @@ 
                     break;
             }
         }
-        if ($this->opt_min_auth_level === null) throw new Exception("Required 'min_auth_level' option is missing.");
+        if ($this->opt_min_auth_level === null) {
+            throw new Exception("Required 'min_auth_level' option is missing.");
+        }
 
         if ($DEBUG_AS_USERNAME != null)
         {
@@ -2416,24 +2511,23 @@ 
 
             list($this->consumer, $this->token) = Okapi::$server->
                 verify_request2($this->request, $this->opt_token_type, $this->opt_min_auth_level == 3);
-            if ($this->get_parameter('consumer_key') && $this->get_parameter('consumer_key') != $this->get_parameter('oauth_consumer_key'))
-                throw new BadRequest("Inproper mixing of authentication types. You used both 'consumer_key' ".
+            if ($this->get_parameter('consumer_key') && $this->get_parameter('consumer_key') != $this->get_parameter('oauth_consumer_key')) {
+                            throw new BadRequest("Inproper mixing of authentication types. You used both 'consumer_key' ".
                     "and 'oauth_consumer_key' parameters (Level 1 and Level 2), but they do not match with ".
                     "each other. Were you trying to hack me? ;)");
+            }
             if ($this->opt_min_auth_level == 3 && !$this->token)
             {
                 throw new BadRequest("This method requires a valid Token to be included (Level 3 ".
                     "Authentication). You didn't provide one.");
             }
-        }
-        else
+        } else
         {
             if ($this->opt_min_auth_level >= 2)
             {
                 throw new BadRequest("This method requires OAuth signature (Level ".
                     $this->opt_min_auth_level." Authentication). You didn't sign your request.");
-            }
-            else
+            } else
             {
                 $consumer_key = $this->get_parameter('consumer_key');
                 if ($consumer_key)
@@ -2443,9 +2537,10 @@ 
                         throw new InvalidParam('consumer_key', "Consumer does not exist.");
                     }
                 }
-                if (($this->opt_min_auth_level == 1) && (!$this->consumer))
-                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 ".
+                if (($this->opt_min_auth_level == 1) && (!$this->consumer)) {
+                                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 ".
                         "Authentication). You didn't provide one.");
+                }
             }
         }
 
@@ -2479,16 +2574,18 @@ 
 
             $debug_user_id = Db::select_value("select user_id from user where username='".
                 Db::escape_string($options['DEBUG_AS_USERNAME'])."'");
-            if ($debug_user_id == null)
-                throw new Exception("Invalid user name in DEBUG_AS_USERNAME: '".$options['DEBUG_AS_USERNAME']."'");
+            if ($debug_user_id == null) {
+                            throw new Exception("Invalid user name in DEBUG_AS_USERNAME: '".$options['DEBUG_AS_USERNAME']."'");
+            }
             $this->consumer = new OkapiDebugConsumer();
             $this->token = new OkapiDebugAccessToken($debug_user_id);
         }
 
         # Read the ETag.
 
-        if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-            $this->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+                    $this->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        }
     }
 
     private function init_request()
@@ -2536,8 +2633,9 @@ 
         # in OKAPI and should be reported back. See issue 85:
         # https://github.com/opencaching/okapi/issues/85
 
-        if (is_array($value))
-            throw new InvalidParam($name, "Make sure you are using '$name' no more than ONCE in your URL.");
+        if (is_array($value)) {
+                    throw new InvalidParam($name, "Make sure you are using '$name' no more than ONCE in your URL.");
+        }
         return $value;
     }
 

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)."'");
     }