OpencachingDeutschland / oc-server3

htdocs/okapi/services/replicate/info.php

Braces +1 added lines, -2 removed lines

@@ -35,8 +35,7 @@
             'revision' => ReplicateCommon::get_revision(),
         );
         $dump = Cache::get("last_fulldump");
-        if ($dump)
-        {
+        if ($dump) {
             $result['latest_fulldump'] = array(
                 'revision' => $dump['revision'],
                 'generated_at' => $dump['meta']['generated_at'],

htdocs/okapi/services/replicate/replicate_common.inc.php

Braces +103 added lines, -112 removed lines

@@ -37,11 +37,11 @@ 
     public static function get_min_since()
     {
         static $cache = null;
-        if ($cache == null)
-        {
+        if ($cache == null) {
             $cache = Db::select_value("select min(id) from okapi_clog");
-            if ($cache === null)
-                $cache = 1;
+            if ($cache === null) {
+                            $cache = 1;
+            }
             $cache -= 1;
         }
         return $cache;
@@ -54,19 +54,21 @@ 
      */
     private static function get_diff($old, $new)
     {
-        if (!$old)
-            return $new;
+        if (!$old) {
+                    return $new;
+        }
         $changed_keys = array();
-        foreach ($new as $key => $value)
-        {
-            if (!array_key_exists($key, $old))
-                $changed_keys[] = $key;
-            elseif ($old[$key] != $new[$key])
-                $changed_keys[] = $key;
+        foreach ($new as $key => $value) {
+            if (!array_key_exists($key, $old)) {
+                            $changed_keys[] = $key;
+            } elseif ($old[$key] != $new[$key]) {
+                            $changed_keys[] = $key;
+            }
         }
         $changed = array();
-        foreach ($changed_keys as $key)
-            $changed[$key] = $new[$key];
+        foreach ($changed_keys as $key) {
+                    $changed[$key] = $new[$key];
+        }
         return $changed;
     }
 
@@ -75,8 +77,9 @@ 
     {
         $now = Db::select_value("select date_add(now(), interval -1 minute)");  # See issue 157.
         $last_update = Okapi::get_var('last_clog_update');
-        if ($last_update === null)
-            $last_update = Db::select_value("select date_add(now(), interval -1 day)");
+        if ($last_update === null) {
+                    $last_update = Db::select_value("select date_add(now(), interval -1 day)");
+        }
 
         # Usually this will be fast. But, for example, if admin changes ALL the
         # caches, this will take forever. But we still want it to finish properly
@@ -100,8 +103,7 @@ 
 
         # For each group, update the changelog table accordingly.
 
-        foreach ($cache_code_groups as $cache_codes)
-        {
+        foreach ($cache_code_groups as $cache_codes) {
             self::generate_changelog_entries('services/caches/geocaches', 'geocache', 'cache_codes',
                 'code', $cache_codes, self::$logged_cache_fields, false, true, null);
         }
@@ -109,27 +111,25 @@ 
         # Same as above, for log entries.
 
         $offset = 0;
-        while (true)
-        {
+        while (true) {
             $log_uuids = Db::select_column("
                 select uuid
                 from cache_logs
                 where okapi_syncbase > '".Db::escape_string($last_update)."'
                 limit $offset, 10000;
             ");
-            if (count($log_uuids) == 0)
-                break;
+            if (count($log_uuids) == 0) {
+                            break;
+            }
             $offset += 10000;
             $log_uuid_groups = Okapi::make_groups($log_uuids, 100);
             unset($log_uuids);
-            foreach ($log_uuid_groups as $log_uuids)
-            {
+            foreach ($log_uuid_groups as $log_uuids) {
                 self::generate_changelog_entries('services/logs/entries', 'log', 'log_uuids',
                     'uuid', $log_uuids, self::$logged_log_entry_fields, false, true, 3600);
             }
         }
-        if (Settings::get('OC_BRANCH') == 'oc.de')
-        {
+        if (Settings::get('OC_BRANCH') == 'oc.de') {
             # On OCDE branch, deleted log entries are MOVED to another table.
             # So the above queries won't detect them. We need to run one more.
             # We will assume there are not so many of them and we don't have to
@@ -142,8 +142,7 @@ 
             ");
             $deleted_uuid_groups = Okapi::make_groups($DELETED_uuids, 100);
             unset($DELETED_uuids);
-            foreach ($deleted_uuid_groups as $deleted_uuids)
-            {
+            foreach ($deleted_uuid_groups as $deleted_uuids) {
                 self::generate_changelog_entries('services/logs/entries', 'log', 'log_uuids',
                     'uuid', $deleted_uuids, self::$logged_log_entry_fields, false, true, 3600);
             }
@@ -168,8 +167,7 @@ 
      */
     public static function verify_clog_consistency(
         $force_all=false, $geocache_ignored_fields = null
-    )
-    {
+    ) {
         set_time_limit(0);
         ignore_user_abort(true);
 
@@ -194,16 +192,15 @@ 
 
         $sum = 0;
         $two_examples = array();
-        foreach ($cache_code_groups as $cache_codes)
-        {
+        foreach ($cache_code_groups as $cache_codes) {
             $entries = self::generate_changelog_entries(
                 'services/caches/geocaches', 'geocache', 'cache_codes',
                 'code', $cache_codes, self::$logged_cache_fields, true, true, null
             );
-            foreach ($entries as $entry)
-            {
-                if ($entry['object_type'] != 'geocache')
-                    continue;
+            foreach ($entries as $entry) {
+                if ($entry['object_type'] != 'geocache') {
+                                    continue;
+                }
                 $cache_code = $entry['object_key']['code'];
 
                 if (($entry['change_type'] == 'replace') && ($geocache_ignored_fields != null)) {
@@ -227,8 +224,10 @@ 
                 # We will story the first and the last entry in the $two_examples
                 # vars which is to be emailed to OKAPI developers.
 
-                if (count($two_examples) == 0)
-                    $two_examples[0] = $entry;  /* The first entry */
+                if (count($two_examples) == 0) {
+                                    $two_examples[0] = $entry;
+                }
+                /* The first entry */
                 $two_examples[1] = $entry;  /* The last entry */
 
                 Db::execute("
@@ -275,18 +274,18 @@ 
     {
         # Retrieve the previous versions of all objects from OKAPI cache.
 
-        if ($use_cache)
-        {
+        if ($use_cache) {
             $cache_keys1 = array();
             $cache_keys2 = array();
-            foreach ($key_values as $key)
-                $cache_keys1[] = 'clog#'.$object_type.'#'.$key;
-            foreach ($key_values as $key)
-                $cache_keys2[] = 'clogmd5#'.$object_type.'#'.$key;
+            foreach ($key_values as $key) {
+                            $cache_keys1[] = 'clog#'.$object_type.'#'.$key;
+            }
+            foreach ($key_values as $key) {
+                            $cache_keys2[] = 'clogmd5#'.$object_type.'#'.$key;
+            }
             $cached_values1 = Cache::get_many($cache_keys1);
             $cached_values2 = Cache::get_many($cache_keys2);
-            if (!$fulldump_mode)
-            {
+            if (!$fulldump_mode) {
                 Cache::delete_many($cache_keys1);
                 Cache::delete_many($cache_keys2);
             }
@@ -305,25 +304,20 @@ 
                 'attribution_append' => 'static'  # currently, this is for the "geocaches" method only
             )));
         $entries = array();
-        foreach ($current_values as $key => $object)
-        {
-            if ($object !== null)
-            {
+        foreach ($current_values as $key => $object) {
+            if ($object !== null) {
                 # Currently, the object exists.
-                if ($use_cache)
-                {
+                if ($use_cache) {
                     # First, compare the cached hash. The hash has much longer lifetime
                     # than the actual cached object.
                     $cached_md5 = $cached_values2['clogmd5#'.$object_type.'#'.$key];
                     $current_md5 = md5(serialize($object));
-                    if ($cached_md5 == $current_md5)
-                    {
+                    if ($cached_md5 == $current_md5) {
                         # The object was not changed since it was last replaced.
                         continue;
                     }
                     $diff = self::get_diff($cached_values1['clog#'.$object_type.'#'.$key], $object);
-                    if (count($diff) == 0)
-                    {
+                    if (count($diff) == 0) {
                         # Md5 differs, but diff does not. Weird, but it can happen
                         # (e.g. just after the md5 extension was introduced, or if
                         # md5 somehow expired before the actual object did).
@@ -336,18 +330,14 @@ 
                     'change_type' => 'replace',
                     'data' => ($use_cache ? $diff : $object),
                 );
-                if ($use_cache)
-                {
+                if ($use_cache) {
                     # Save the last-published state of the object, for future comparison.
                     $cached_values2['clogmd5#'.$object_type.'#'.$key] = $current_md5;
                     $cached_values1['clog#'.$object_type.'#'.$key] = $object;
                 }
-            }
-            else
-            {
+            } else {
                 # Currently, the object does not exist.
-                if ($use_cache && ($cached_values1['clog#'.$object_type.'#'.$key] === false))
-                {
+                if ($use_cache && ($cached_values1['clog#'.$object_type.'#'.$key] === false)) {
                     # No need to delete, we have already published its deletion.
                     continue;
                 }
@@ -356,8 +346,7 @@ 
                     'object_key' => array($key_name => $key),
                     'change_type' => 'delete',
                 );
-                if ($use_cache)
-                {
+                if ($use_cache) {
                     # Cache the fact, that the object was deleted.
                     $cached_values2['clogmd5#'.$object_type.'#'.$key] = false;
                     $cached_values1['clog#'.$object_type.'#'.$key] = false;
@@ -365,19 +354,16 @@ 
             }
         }
 
-        if ($fulldump_mode)
-        {
+        if ($fulldump_mode) {
             return $entries;
-        }
-        else
-        {
+        } else {
             # Save the entries to the clog table.
 
-            if (count($entries) > 0)
-            {
+            if (count($entries) > 0) {
                 $data_values = array();
-                foreach ($entries as $entry)
-                    $data_values[] = gzdeflate(serialize($entry));
+                foreach ($entries as $entry) {
+                                    $data_values[] = gzdeflate(serialize($entry));
+                }
                 Db::execute("
                     insert into okapi_clog (data)
                     values ('".implode("'),('", array_map('\okapi\Db::escape_string', $data_values))."');
@@ -386,8 +372,7 @@ 
 
             # Update the values kept in OKAPI cache.
 
-            if ($use_cache)
-            {
+            if ($use_cache) {
                 Cache::set_many($cached_values1, $cache_timeout);
                 Cache::set_many($cached_values2, null);  # make it persistent
             }
@@ -403,10 +388,14 @@ 
         $first_id = Db::select_value("
             select id from okapi_clog where id > '".Db::escape_string($since)."' limit 1
         ");
-        if ($first_id === null)
-            return true; # okay, since points to the newest revision
-        if ($first_id == $since + 1)
-            return true; # okay, revision $since + 1 is present
+        if ($first_id === null) {
+                    return true;
+        }
+        # okay, since points to the newest revision
+        if ($first_id == $since + 1) {
+                    return true;
+        }
+        # okay, revision $since + 1 is present
 
         # If we're here, then this means that $first_id > $since + 1.
         # Revision $since + 1 is already deleted, $since must be too old!
@@ -425,17 +414,17 @@ 
     {
         $current_revision = self::get_revision();
         $last_chunk_cut = $current_revision - ($current_revision % self::$chunk_size);
-        if ($since >= $last_chunk_cut)
-        {
+        if ($since >= $last_chunk_cut) {
             # If, for example, we have a choice to give user 50 items he wants, or 80 items
             # which we probably already have in cache (and this includes the 50 which the
             # user wants), then we'll give him 80. If user wants less than half of what we
             # have (ex. 30), then we'll give him only his 30.
 
-            if ($current_revision - $since > $since - $last_chunk_cut)
-                return array($last_chunk_cut + 1, $current_revision);
-            else
-                return array($since + 1, $current_revision);
+            if ($current_revision - $since > $since - $last_chunk_cut) {
+                            return array($last_chunk_cut + 1, $current_revision);
+            } else {
+                            return array($since + 1, $current_revision);
+            }
         }
         $prev_chunk_cut = $since - ($since % self::$chunk_size);
         return array($prev_chunk_cut + 1, $prev_chunk_cut + self::$chunk_size);
@@ -446,17 +435,18 @@ 
      */
     public static function get_chunk($from, $to)
     {
-        if ($to < $from)
-            return array();
-        if ($to - $from > self::$chunk_size)
-            throw new Exception("You should not get chunksize bigger than ".self::$chunk_size." entries at one time.");
+        if ($to < $from) {
+                    return array();
+        }
+        if ($to - $from > self::$chunk_size) {
+                    throw new Exception("You should not get chunksize bigger than ".self::$chunk_size." entries at one time.");
+        }
 
         # Check if we already have this chunk in cache.
 
         $cache_key = 'clog_chunk#'.$from.'-'.$to;
         $chunk = Cache::get($cache_key);
-        if ($chunk === null)
-        {
+        if ($chunk === null) {
             $rs = Db::query("
                 select id, data
                 from okapi_clog
@@ -464,8 +454,7 @@ 
                 order by id
             ");
             $chunk = array();
-            while ($row = Db::fetch_assoc($rs))
-            {
+            while ($row = Db::fetch_assoc($rs)) {
                 $chunk[] = unserialize(gzinflate($row['data']));
             }
 
@@ -475,10 +464,11 @@ 
             # be ever accessed after the next revision appears, so there is not point
             # in storing them that long.
 
-            if (($from % self::$chunk_size === 0) && ($to % self::$chunk_size === 0))
-                $timeout = 10 * 86400;
-            else
-                $timeout = 86400;
+            if (($from % self::$chunk_size === 0) && ($to % self::$chunk_size === 0)) {
+                            $timeout = 10 * 86400;
+            } else {
+                            $timeout = 86400;
+            }
             Cache::set($cache_key, $chunk, $timeout);
         }
 
@@ -511,16 +501,16 @@ 
         $cache_codes = Db::select_column("select wp_oc from caches");
         $cache_code_groups = Okapi::make_groups($cache_codes, self::$chunk_size);
         unset($cache_codes);
-        foreach ($cache_code_groups as $cache_codes)
-        {
+        foreach ($cache_code_groups as $cache_codes) {
             $basename = "part".str_pad($i, 5, "0", STR_PAD_LEFT);
             $json_files[] = $basename.".json";
             $entries = self::generate_changelog_entries('services/caches/geocaches', 'geocache', 'cache_codes',
                 'code', $cache_codes, self::$logged_cache_fields, true, false);
             $filtered = array();
-            foreach ($entries as $entry)
-                if ($entry['change_type'] == 'replace')
+            foreach ($entries as $entry) {
+                            if ($entry['change_type'] == 'replace')
                     $filtered[] = $entry;
+            }
             unset($entries);
             file_put_contents("$dir/$basename.json", json_encode($filtered));
             unset($filtered);
@@ -532,8 +522,7 @@ 
         # too much memory. Hence the offset/limit loop.
 
         $offset = 0;
-        while (true)
-        {
+        while (true) {
             $log_uuids = Db::select_column("
                 select uuid
                 from cache_logs
@@ -541,21 +530,22 @@ 
                 order by uuid
                 limit $offset, 10000
             ");
-            if (count($log_uuids) == 0)
-                break;
+            if (count($log_uuids) == 0) {
+                            break;
+            }
             $offset += 10000;
             $log_uuid_groups = Okapi::make_groups($log_uuids, 500);
             unset($log_uuids);
-            foreach ($log_uuid_groups as $log_uuids)
-            {
+            foreach ($log_uuid_groups as $log_uuids) {
                 $basename = "part".str_pad($i, 5, "0", STR_PAD_LEFT);
                 $json_files[] = $basename.".json";
                 $entries = self::generate_changelog_entries('services/logs/entries', 'log', 'log_uuids',
                     'uuid', $log_uuids, self::$logged_log_entry_fields, true, false);
                 $filtered = array();
-                foreach ($entries as $entry)
-                    if ($entry['change_type'] == 'replace')
+                foreach ($entries as $entry) {
+                                    if ($entry['change_type'] == 'replace')
                         $filtered[] = $entry;
+                }
                 unset($entries);
                 file_put_contents("$dir/$basename.json", json_encode($filtered));
                 unset($filtered);
@@ -581,8 +571,9 @@ 
         # Compute uncompressed size.
 
         $size = filesize("$dir/index.json");
-        foreach ($json_files as $filename)
-            $size += filesize("$dir/$filename");
+        foreach ($json_files as $filename) {
+                    $size += filesize("$dir/$filename");
+        }
 
         # Create JSON archive. We use tar options: -j for bzip2, -z for gzip
         # (bzip2 is MUCH slower).

htdocs/okapi/locale/locales.php

Braces +13 added lines, -10 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,26 +32,28 @@ 
     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;
     }
 
     public static function get_best_locale($langprefs)
     {
-        foreach ($langprefs as $lang)
-        {
+        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/controller.php

Braces +17 added lines, -19 removed lines

@@ -21,8 +21,7 @@ 
 OkapiErrorHandler::$treat_notices_as_errors = true;
 require_once($GLOBALS['rootpath'].'okapi/urls.php');
 
-if (ob_list_handlers() == array('default output handler'))
-{
+if (ob_list_handlers() == array('default output handler')) {
     # We will assume that this one comes from "output_buffering" being turned on
     # in PHP config. This is very common and probably is good for most other OC
     # pages. But we don't need it in OKAPI. We will just turn this off.
@@ -37,20 +36,23 @@ 
     {
         # Chop off the ?args=... part.
 
-        if (strpos($uri, '?') !== false)
-            $uri = substr($uri, 0, strpos($uri, '?'));
+        if (strpos($uri, '?') !== false) {
+                    $uri = substr($uri, 0, strpos($uri, '?'));
+        }
 
         # Chop off everything before "/okapi/". This should work for okay for most "weird"
         # server configurations. It will also address a more subtle issue described here:
         # http://stackoverflow.com/questions/8040461/request-uri-unexpectedly-contains-fqdn
 
-        if (strpos($uri, "/okapi/") !== false)
-            $uri = substr($uri, strpos($uri, "/okapi/"));
+        if (strpos($uri, "/okapi/") !== false) {
+                    $uri = substr($uri, strpos($uri, "/okapi/"));
+        }
 
         # Make sure we're in the right directory (.htaccess should make sure of that).
 
-        if (strpos($uri, "/okapi/") !== 0)
-            throw new Exception("'$uri' is outside of the /okapi/ path.");
+        if (strpos($uri, "/okapi/") !== 0) {
+                    throw new Exception("'$uri' is outside of the /okapi/ path.");
+        }
         $uri = substr($uri, 7);
 
         # Initializing internals and running pre-request cronjobs (we don't want
@@ -62,27 +64,23 @@ 
 
         # Checking for allowed patterns...
 
-        try
-        {
-            foreach (OkapiUrls::$mapping as $pattern => $namespace)
-            {
+        try {
+            foreach (OkapiUrls::$mapping as $pattern => $namespace) {
                 $matches = null;
-                if (preg_match("#$pattern#", $uri, $matches))
-                {
+                if (preg_match("#$pattern#", $uri, $matches)) {
                     # Pattern matched! Moving on to the proper View...
 
                     array_shift($matches);
                     require_once($GLOBALS['rootpath']."okapi/views/$namespace.php");
                     $response = call_user_func_array(array('\\okapi\\views\\'.
                         str_replace('/', '\\', $namespace).'\\View', 'call'), $matches);
-                    if ($response)
-                        $response->display();
+                    if ($response) {
+                                            $response->display();
+                    }
                     return;
                 }
             }
-        }
-        catch (Http404 $e)
-        {
+        } catch (Http404 $e) {
             /* pass */
         }
 

htdocs/okapi/settings.php

Braces +44 added lines, -32 removed lines

@@ -237,10 +237,8 @@ 
             throw new Exception("Could not import <rootpath>/okapi_settings.php:\n".$e->getMessage());
         }
         self::$SETTINGS = self::$DEFAULT_SETTINGS;
-        foreach (self::$SETTINGS as $key => $_)
-        {
-            if (isset($ref[$key]))
-            {
+        foreach (self::$SETTINGS as $key => $_) {
+            if (isset($ref[$key])) {
                 self::$SETTINGS[$key] = $ref[$key];
             }
         }
@@ -249,41 +247,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 +306,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/core.php

Braces +442 added lines, -417 removed lines

@@ -25,18 +25,18 @@ 
 function get_admin_emails()
 {
     $emails = array();
-    if (class_exists("okapi\\Settings"))
-    {
-        try
-        {
-            foreach (Settings::get('ADMINS') as $email)
-                if (!in_array($email, $emails))
+    if (class_exists("okapi\\Settings")) {
+        try {
+            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;
 }
 
@@ -45,12 +45,15 @@ 
 #
 
 /** A base class for all bad request exceptions. */
-class BadRequest extends Exception {
-    protected function provideExtras(&$extras) {
+class BadRequest extends Exception
+{
+    protected function provideExtras(&$extras)
+    {
         $extras['reason_stack'][] = 'bad_request';
         $extras['status'] = 400;
     }
-    public function getOkapiJSON() {
+    public function getOkapiJSON()
+    {
         $extras = array(
             'developer_message' => $this->getMessage(),
             'reason_stack' => array(),
@@ -62,7 +65,9 @@ 
 }
 
 /** Thrown on PHP's FATAL errors (detected in a shutdown function). */
-class FatalError extends ErrorException {}
+class FatalError extends ErrorException
+{
+}
 
 #
 # We'll try to make PHP into something more decent. Exception and
@@ -75,45 +80,40 @@ 
     /** Handle exception thrown while executing OKAPI request. */
     public static function handle($e)
     {
-        if ($e instanceof OAuthServerException)
-        {
+        if ($e instanceof OAuthServerException) {
             # This is thrown on invalid OAuth requests. There are many subclasses
             # 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
             # request and we want him to know that.
 
             # headers may have been sent e.g. by views/update
-            if (!headers_sent())
-            {
+            if (!headers_sent()) {
                 header("HTTP/1.0 400 Bad Request");
                 header("Access-Control-Allow-Origin: *");
                 header("Content-Type: application/json; charset=utf-8");
             }
 
             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
             # must be fixed on OUR part.
 
-            if (!headers_sent())
-            {
+            if (!headers_sent()) {
                 header("HTTP/1.0 500 Internal Server Error");
                 header("Access-Control-Allow-Origin: *");
                 header("Content-Type: text/plain; charset=utf-8");
@@ -127,19 +127,15 @@ 
 
             $exception_info = self::get_exception_info($e);
 
-            if (class_exists("okapi\\Settings") && (Settings::get('DEBUG')))
-            {
+            if (class_exists("okapi\\Settings") && (Settings::get('DEBUG'))) {
                 print "\n\nBUT! Since the DEBUG flag is on, then you probably ARE a developer yourself.\n";
                 print "Let's cut to the chase then:";
                 print "\n\n".$exception_info;
             }
-            if (class_exists("okapi\\Settings") && (Settings::get('DEBUG_PREVENT_EMAILS')))
-            {
+            if (class_exists("okapi\\Settings") && (Settings::get('DEBUG_PREVENT_EMAILS'))) {
                 # 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(
                     $_SERVER['REQUEST_URI'].'?', '?'));
@@ -150,19 +146,17 @@ 
                     "developer of the module that threw this error. Thanks!\n\n".
                     $exception_info
                 );
-                try
-                {
+                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;
@@ -212,16 +206,13 @@ 
         $exception_info = "===== ERROR MESSAGE =====\n"
             .trim(self::removeSensitiveData($e->getMessage()))
             ."\n=========================\n\n";
-        if ($e instanceof FatalError)
-        {
+        if ($e instanceof FatalError) {
             # This one doesn't have a stack trace. It is fed directly to OkapiExceptionHandler::handle
             # by OkapiErrorHandler::handle_shutdown. Instead of printing trace, we will just print
             # 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";
         }
@@ -234,8 +225,7 @@ 
         # This if-condition will solve some (but not all) problems when trying to execute
         # OKAPI code from command line;
         # see https://github.com/opencaching/okapi/issues/243.
-        if (function_exists('getallheaders'))
-        {
+        if (function_exists('getallheaders')) {
             $exception_info .= "--- Request headers ---\n".implode("\n", array_map(
                 function($k, $v) { return "$k: $v"; },
                 array_keys(getallheaders()), array_values(getallheaders())
@@ -254,7 +244,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;
         }
@@ -283,8 +275,7 @@ 
         # correctly. The only error which cannot be recovered from is E_ERROR, we have
         # to check the type then.
 
-        if (($error !== null) && ($error['type'] == E_ERROR))
-        {
+        if (($error !== null) && ($error['type'] == E_ERROR)) {
             $e = new FatalError($error['message'], 0, $error['type'], $error['file'], $error['line']);
             OkapiExceptionHandler::handle($e);
         }
@@ -304,13 +295,16 @@ 
 # the developer).
 #
 
-class Http404 extends BadRequest {}
+class Http404 extends BadRequest
+{
+}
 
 /** Common type of BadRequest: Required parameter is missing. */
 class ParamMissing extends BadRequest
 {
     private $paramName;
-    protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras)
+    {
         parent::provideExtras($extras);
         $extras['reason_stack'][] = 'missing_parameter';
         $extras['parameter'] = $this->paramName;
@@ -330,7 +324,8 @@ 
     /** What was wrong about the param? */
     public $whats_wrong_about_it;
 
-    protected function provideExtras(&$extras) {
+    protected function provideExtras(&$extras)
+    {
         parent::provideExtras($extras);
         $extras['reason_stack'][] = 'invalid_parameter';
         $extras['parameter'] = $this->paramName;
@@ -340,15 +335,18 @@ 
     {
         $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);
+        }
     }
 }
 
 /** Thrown on invalid SQL queries. */
-class DbException extends Exception {}
+class DbException extends Exception
+{
+}
 
 #
 # Database access abstraction layer.
@@ -364,22 +362,20 @@ 
 
     public static function connect()
     {
-        if (mysql_connect(Settings::get('DB_SERVER'), Settings::get('DB_USERNAME'), Settings::get('DB_PASSWORD')))
-        {
+        if (mysql_connect(Settings::get('DB_SERVER'), Settings::get('DB_USERNAME'), Settings::get('DB_PASSWORD'))) {
             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}. */
     public static function select_row($query)
     {
         $rows = self::select_all($query);
-        switch (count($rows))
-        {
+        switch (count($rows)) {
             case 0: return null;
             case 1: return $rows[0];
             default:
@@ -399,15 +395,16 @@ 
     private static function select_and_push($query, & $arr, $keyField = null)
     {
         $rs = self::query($query);
-        while (true)
-        {
+        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);
     }
@@ -417,11 +414,11 @@ 
     {
         $groups = array();
         $rs = self::query($query);
-        while (true)
-        {
+        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 +429,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");
     }
 
@@ -444,11 +443,11 @@ 
     {
         $column = array();
         $rs = self::query($query);
-        while (true)
-        {
+        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,18 +487,19 @@ 
     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)
-        {
+        if (!$rs) {
             $errno = mysql_errno();
             $msg = mysql_error();
 
@@ -555,8 +555,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 +565,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 +767,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,21 +801,22 @@ 
 
     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);
     }
 
     /** Note: You can call this only once! */
     public function print_body()
     {
-        if (is_resource($this->body))
-        {
-            while (!feof($this->body))
-                print fread($this->body, 1024*1024);
+        if (is_resource($this->body)) {
+            while (!feof($this->body)) {
+                            print fread($this->body, 1024*1024);
+            }
+        } else {
+                    print $this->body;
         }
-        else
-            print $this->body;
     }
 
     /**
@@ -821,14 +825,13 @@ 
      */
     public function get_body()
     {
-        if (is_resource($this->body))
-        {
+        if (is_resource($this->body)) {
             ob_start();
             fpassthru($this->body);
             return ob_get_clean();
+        } else {
+                    return $this->body;
         }
-        else
-            return $this->body;
     }
 
     /**
@@ -840,32 +843,33 @@ 
         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.
 
-        if ($use_gzip && is_string($this->body))
-        {
+        if ($use_gzip && is_string($this->body)) {
             # Apache won't gzip a response which is already gzipped.
 
             header("Content-Encoding: gzip");
             $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.
 
             if (function_exists('apache_setenv')) {
@@ -873,8 +877,9 @@ 
             }
 
             $length = $this->get_length();
-            if ($length)
-                header("Content-Length: ".$length);
+            if ($length) {
+                            header("Content-Length: ".$length);
+            }
             $this->print_body();
         }
     }
@@ -883,7 +888,9 @@ 
 class OkapiRedirectResponse extends OkapiHttpResponse
 {
     public $url;
-    public function __construct($url) { $this->url = $url; }
+    public function __construct($url)
+    {
+$this->url = $url; }
     public function display()
     {
         header("HTTP/1.1 303 See Other");
@@ -949,14 +956,11 @@ 
 
     private function __construct($name)
     {
-        if (Settings::get('DEBUG_PREVENT_SEMAPHORES'))
-        {
+        if (Settings::get('DEBUG_PREVENT_SEMAPHORES')) {
             # 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 +968,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);
+        }
     }
 
     /**
@@ -988,8 +996,7 @@ 
      */
     public function remove()
     {
-        if ($this->lock !== null)
-        {
+        if ($this->lock !== null) {
             fclose($this->lock);
             unlink($this->lockfile);
         }
@@ -1033,18 +1040,19 @@ 
     /** Get a variable stored in okapi_vars. If variable not found, return $default. */
     public static function get_var($varname, $default = null)
     {
-        if (self::$okapi_vars === null)
-        {
+        if (self::$okapi_vars === null) {
             $rs = Db::query("
                 select var, value
                 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 +1108,9 @@ 
 
             return;
         }
-        if ($counter === null)
-            $counter = 0;
+        if ($counter === null) {
+                    $counter = 0;
+        }
         $counter++;
         try {
             Cache::set($cache_key, $counter, 3600);
@@ -1109,20 +1118,16 @@ 
             # If `get` suceeded and `set` did not, then probably we're having
             # issue #156 scenario. We can ignore it here.
         }
-        if ($counter <= 5)
-        {
+        if ($counter <= 5) {
             # We're not spamming yet.
 
             self::mail_from_okapi(get_admin_emails(), $subject, $message);
-        }
-        else
-        {
+        } else {
             # We are spamming. Prevent sending more emails.
 
             $content_cache_key_prefix = 'mail_admins_spam/'.(floor(time() / 3600) * 3600).'/';
             $timeout = 86400;
-            if ($counter == 6)
-            {
+            if ($counter == 6) {
                 self::mail_from_okapi(get_admin_emails(), "Anti-spam mode activated for '$subject'",
                     "OKAPI has activated an \"anti-spam\" mode for the following subject:\n\n".
                     "\"$subject\"\n\n".
@@ -1142,14 +1147,14 @@ 
     /** Send an email message from OKAPI to the given recipients. */
     public static function mail_from_okapi($email_addresses, $subject, $message)
     {
-        if (class_exists("okapi\\Settings") && (Settings::get('DEBUG_PREVENT_EMAILS')))
-        {
+        if (class_exists("okapi\\Settings") && (Settings::get('DEBUG_PREVENT_EMAILS'))) {
             # Sending emails was blocked on admin's demand.
             # 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 +1167,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 +1327,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 "";
     }
 
@@ -1335,8 +1344,7 @@ 
     {
         $i = 0;
         $groups = array();
-        while ($i < count($array))
-        {
+        while ($i < count($array)) {
             $groups[] = array_slice($array, $i, $size);
             $i += $size;
         }
@@ -1350,8 +1358,7 @@ 
     public static function execute_prerequest_cronjobs()
     {
         $nearest_event = Okapi::get_var("cron_nearest_event");
-        if ($nearest_event + 0 <= time())
-        {
+        if ($nearest_event + 0 <= time()) {
             require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
             $nearest_event = CronJobController::run_jobs('pre-request');
             Okapi::set_var("cron_nearest_event", $nearest_event);
@@ -1365,8 +1372,7 @@ 
     public static function execute_cron5_cronjobs()
     {
         $nearest_event = Okapi::get_var("cron_nearest_event");
-        if ($nearest_event + 0 <= time())
-        {
+        if ($nearest_event + 0 <= time()) {
             set_time_limit(0);
             ignore_user_abort(true);
             require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
@@ -1384,8 +1390,7 @@ 
         # This way, we don't need to call the actual locale-switching code most
         # of the times.
 
-        if ($gettext_last_used_langprefs != $langprefs)
-        {
+        if ($gettext_last_used_langprefs != $langprefs) {
             $gettext_last_set_locale = call_user_func(Settings::get("GETTEXT_INIT"), $langprefs);
             $gettext_last_used_langprefs = $langprefs;
             textdomain(Settings::get("GETTEXT_DOMAIN"));
@@ -1405,12 +1410,12 @@ 
     {
         # 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)
-        {
+        if (count(self::$gettext_langprefs_stack) == 1) {
             # This is the first time gettext_domain_init is called. In order to
             # properly reinitialize the original settings after gettext_domain_restore
             # is called for the last time, we need to save current textdomain (which
@@ -1434,13 +1439,10 @@ 
         array_pop(self::$gettext_langprefs_stack);
 
         $size = count(self::$gettext_langprefs_stack);
-        if ($size > 0)
-        {
+        if ($size > 0) {
             $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 +1457,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,14 +1486,14 @@ 
      */
     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++)
-        {
+        for ($i=0; $i<$length; $i++) {
             $key .= $chars[rand(0, $max-1)];
         }
         return $key;
@@ -1504,10 +1511,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 +1566,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 +1591,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 +1610,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 +1621,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 +1632,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];
     }
 
@@ -1634,54 +1655,50 @@ 
      */
     public static function formatted_response(OkapiRequest $request, &$object)
     {
-        if ($request instanceof OkapiInternalRequest && (!$request->i_want_OkapiResponse))
-        {
+        if ($request instanceof OkapiInternalRequest && (!$request->i_want_OkapiResponse)) {
             # If you call a method internally, then you probably expect to get
             # the actual object instead of it's formatted representation.
             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 ($format == 'json')
-        {
+        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')
-        {
-            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_]*\$/).");
+        } 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_]*\$/).");
+            }
             $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();
         }
@@ -1689,58 +1706,40 @@ 
 
     private static function _xmlmap_add(&$chunks, &$obj)
     {
-        if (is_string($obj))
-        {
+        if (is_string($obj)) {
             $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))
-            {
+            if (array_keys($obj) === range(0, count($obj) - 1)) {
                 # Not assoc.
                 $chunks[] = "<list>";
-                foreach ($obj as &$item_ref)
-                {
+                foreach ($obj as &$item_ref) {
                     $chunks[] = "<item>";
                     self::_xmlmap_add($chunks, $item_ref);
                     $chunks[] = "</item>";
                 }
                 $chunks[] = "</list>";
-            }
-            else
-            {
+            } else {
                 # Assoc.
                 $chunks[] = "<dict>";
-                foreach ($obj as $key => &$item_ref)
-                {
+                foreach ($obj as $key => &$item_ref) {
                     $chunks[] = "<item key=\"".self::xmlescape($key)."\">";
                     self::_xmlmap_add($chunks, $item_ref);
                     $chunks[] = "</item>";
                 }
                 $chunks[] = "</dict>";
             }
-        }
-        else
-        {
+        } else {
             # That's a bug.
             throw new Exception("Cannot encode as xmlmap: " + print_r($obj, true));
         }
@@ -1749,54 +1748,36 @@ 
     private static function _xmlmap2_add(&$chunks, &$obj, $key)
     {
         $attrs = ($key !== null) ? " key=\"".self::xmlescape($key)."\"" : "";
-        if (is_string($obj))
-        {
+        if (is_string($obj)) {
             $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)))
-            {
+            if (is_array($obj) && (array_keys($obj) === range(0, count($obj) - 1))) {
                 # Not assoc.
                 $chunks[] = "<array$attrs>";
-                foreach ($obj as &$item_ref)
-                {
+                foreach ($obj as &$item_ref) {
                     self::_xmlmap2_add($chunks, $item_ref, null);
                 }
                 $chunks[] = "</array>";
-            }
-            else
-            {
+            } else {
                 # Assoc.
                 $chunks[] = "<object$attrs>";
-                foreach ($obj as $key => &$item_ref)
-                {
+                foreach ($obj as $key => &$item_ref) {
                     self::_xmlmap2_add($chunks, $item_ref, $key);
                 }
                 $chunks[] = "</object>";
             }
-        }
-        else
-        {
+        } else {
             # That's a bug.
             throw new Exception("Cannot encode as xmlmap2: " . print_r($obj, true));
         }
@@ -1851,8 +1832,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.");
@@ -1862,14 +1844,15 @@ 
     public static function cache_type_id2name($id)
     {
         static $reversed = null;
-        if ($reversed == null)
-        {
+        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 +1863,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'.");
     }
 
@@ -1889,14 +1873,15 @@ 
     public static function cache_status_id2name($id)
     {
         static $reversed = null;
-        if ($reversed == null)
-        {
+        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 +1899,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'.");
     }
 
@@ -1923,14 +1909,15 @@ 
     public static function cache_sizeid_to_size2($id)
     {
         static $reversed = null;
-        if ($reversed == null)
-        {
+        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 +1940,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 +1951,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 +1981,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 +2073,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.';');
@@ -2080,8 +2107,7 @@ 
      */
     public static function set($key, $value, $timeout)
     {
-        if ($timeout == null)
-        {
+        if ($timeout == null) {
             # The current cache implementation is ALWAYS persistent, so we will
             # just replace it with a big value.
             $timeout = 100*365*86400;
@@ -2116,17 +2142,16 @@ 
     /** Do 'set' on many keys at once. */
     public static function set_many($dict, $timeout)
     {
-        if (count($dict) == 0)
-            return;
-        if ($timeout == null)
-        {
+        if (count($dict) == 0) {
+                    return;
+        }
+        if ($timeout == null) {
             # The current cache implementation is ALWAYS persistent, so we will
             # just replace it with a big value.
             $timeout = 100*365*86400;
         }
         $entries_escaped = array();
-        foreach ($dict as $key => $value)
-        {
+        foreach ($dict as $key => $value) {
             $entries_escaped[] = "(
                 '".Db::escape_string($key)."',
                 '".Db::escape_string(gzdeflate(serialize($value)))."',
@@ -2153,15 +2178,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));
     }
 
@@ -2176,14 +2204,10 @@ 
                 `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys))."')
                 and expires > now()
         ");
-        while ($row = Db::fetch_assoc($rs))
-        {
-            try
-            {
+        while ($row = Db::fetch_assoc($rs)) {
+            try {
                 $dict[$row['key']] = unserialize(gzinflate($row['value']));
-            }
-            catch (ErrorException $e)
-            {
+            } catch (ErrorException $e) {
                 unset($dict[$row['key']]);
                 Okapi::mail_admins("Debug: Unserialize error",
                     "Could not unserialize key '".$row['key']."' from Cache.\n".
@@ -2192,10 +2216,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 +2235,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 +2255,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 +2343,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()
@@ -2334,7 +2363,9 @@ 
         return $this->parameters;
     }
 
-    public function is_http_request() { return $this->perceive_as_http_request; }
+    public function is_http_request()
+    {
+return $this->perceive_as_http_request; }
 }
 
 class OkapiHttpRequest extends OkapiRequest
@@ -2351,20 +2382,16 @@ 
         # Parsing options.
         #
         $DEBUG_AS_USERNAME = null;
-        foreach ($options as $key => $value)
-        {
-            switch ($key)
-            {
+        foreach ($options as $key => $value) {
+            switch ($key) {
                 case 'min_auth_level':
-                    if (!in_array($value, array(0, 1, 2, 3)))
-                    {
+                    if (!in_array($value, array(0, 1, 2, 3))) {
                         throw new Exception("'min_auth_level' option has invalid value: $value");
                     }
                     $this->opt_min_auth_level = $value;
                     break;
                 case 'token_type':
-                    if (!in_array($value, array("request", "access")))
-                    {
+                    if (!in_array($value, array("request", "access"))) {
                         throw new Exception("'token_type' option has invalid value: $value");
                     }
                     $this->opt_token_type = $value;
@@ -2377,15 +2404,15 @@ 
                     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)
-        {
+        if ($DEBUG_AS_USERNAME != null) {
             # Enables debugging Level 2 and Level 3 methods. Should not be committed
             # at any time! If run on production server, make it an error.
 
-            if (!Settings::get('DEBUG'))
-            {
+            if (!Settings::get('DEBUG')) {
                 throw new Exception("Attempted to use DEBUG_AS_USERNAME in ".
                     "non-debug environment. Accidental commit?");
             }
@@ -2400,8 +2427,7 @@ 
         # It it's not, check if it isn't against the rules defined in the $options.
         #
 
-        if ($this->get_parameter('oauth_signature'))
-        {
+        if ($this->get_parameter('oauth_signature')) {
             # User is using OAuth.
 
             # Check for duplicate keys in the parameters. (Datastore doesn't
@@ -2416,36 +2442,31 @@ 
 
             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)
-            {
+            }
+            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
-        {
-            if ($this->opt_min_auth_level >= 2)
-            {
+        } 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)
-                {
+                if ($consumer_key) {
                     $this->consumer = Okapi::$data_store->lookup_consumer($consumer_key);
                     if (!$this->consumer) {
                         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.");
+                }
             }
         }
 
@@ -2472,23 +2493,24 @@ 
 
         # When debugging, simulate as if been run using a proper Level 3 Authentication.
 
-        if ($DEBUG_AS_USERNAME != null)
-        {
+        if ($DEBUG_AS_USERNAME != null) {
             # Note, that this will override any other valid authentication the
             # developer might have issued.
 
             $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 +2558,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;
     }
 
@@ -2546,5 +2569,7 @@ 
         return $this->request->get_parameters();
     }
 
-    public function is_http_request() { return true; }
+    public function is_http_request()
+    {
+return true; }
 }

htdocs/okapi/views/apps/revoke_access.php

Braces +1 added lines, -2 removed lines

@@ -22,8 +22,7 @@
 
         # Ensure a user is logged in.
 
-        if ($OC_user_id == null)
-        {
+        if ($OC_user_id == null) {
             $after_login = "okapi/apps/"; # it is correct, if you're wondering
             $login_url = Settings::get('SITE_URL')."login.php?target=".urlencode($after_login);
             return new OkapiRedirectResponse($login_url);

htdocs/okapi/views/apps/authorize.php

Braces +13 added lines, -25 removed lines

@@ -20,8 +20,9 @@ 
         $langpref = isset($_GET['langpref']) ? $_GET['langpref'] : Settings::get('SITELANG');
         $langprefs = explode("|", $langpref);
         $locales = array();
-        foreach (Locales::$languages as $lang => $attrs)
-            $locales[$attrs['locale']] = $attrs;
+        foreach (Locales::$languages as $lang => $attrs) {
+                    $locales[$attrs['locale']] = $attrs;
+        }
 
         # Current implementation of the "interactivity" parameter is: If developer
         # wants to "confirm_user", then just log out the current user before we
@@ -48,8 +49,7 @@ 
 
         $callback_concat_char = (strpos($token['callback'], '?') === false) ? "?" : "&";
 
-        if (!$token)
-        {
+        if (!$token) {
             # Probably Request Token has expired. This will be usually viewed
             # by the user, who knows nothing on tokens and OAuth. Let's be nice then!
 
@@ -79,26 +79,21 @@ 
 
         # Ensure a user is logged in (or force re-login).
 
-        if ($force_relogin || ($OC_user_id == null))
-        {
+        if ($force_relogin || ($OC_user_id == null)) {
             # TODO: confirm_user should first ask the user if he's "the proper one",
             # and then offer to sign in as a different user.
 
             $login_page = 'login.php?';
 
-            if ($OC_user_id !== null)
-            {
-                if (Settings::get('OC_BRANCH') == 'oc.de')
-                {
+            if ($OC_user_id !== null) {
+                if (Settings::get('OC_BRANCH') == 'oc.de') {
                     # OCDE login.php?action=logout&target=... will NOT logout and
                     # then redirect to the target, but it will log out, prompt for
                     # login and then redirect to the target after logging in -
                     # that's exactly the relogin that we want.
 
                     $login_page .= 'action=logout&';
-                }
-                else
-                {
+                } else {
                     # OCPL uses REAL MAGIC for session handling. I don't get ANY of it.
                     # The logout.php DOES NOT support the "target" parameter, so we
                     # can't just call it. The only thing that comes to mind is...
@@ -141,15 +136,12 @@ 
                 and consumer_key = '".Db::escape_string($token['consumer_key'])."'
         ", 0);
 
-        if (!$authorized)
-        {
-            if (isset($_POST['authorization_result']))
-            {
+        if (!$authorized) {
+            if (isset($_POST['authorization_result'])) {
                 # Not yet authorized, but user have just submitted the authorization form.
                 # WRTODO: CSRF protection
 
-                if ($_POST['authorization_result'] == 'granted')
-                {
+                if ($_POST['authorization_result'] == 'granted') {
                     Db::execute("
                         insert ignore into okapi_authorizations (consumer_key, user_id)
                         values (
@@ -158,9 +150,7 @@ 
                         );
                     ");
                     $authorized = true;
-                }
-                else
-                {
+                } else {
                     # User denied access. Nothing sensible to do now. Will try to report
                     # back to the Consumer application with an error.
 
@@ -175,9 +165,7 @@ 
                         return new OkapiRedirectResponse(Settings::get('SITE_URL')."index.php");
                     }
                 }
-            }
-            else
-            {
+            } else {
                 # Not yet authorized. Display an authorization request.
                 $vars = array(
                     'okapi_base_url' => Settings::get('SITE_URL')."okapi/",

htdocs/okapi/views/apps/index.php

Braces +4 added lines, -4 removed lines

@@ -23,8 +23,7 @@ 
         require_once($GLOBALS['rootpath']."okapi/lib/oc_session.php");
         $OC_user_id = OCSession::get_user_id();
 
-        if ($OC_user_id == null)
-        {
+        if ($OC_user_id == null) {
             $after_login = "okapi/apps/".(($langpref != Settings::get('SITELANG'))?"?langpref=".$langpref:"");
             $login_url = Settings::get('SITE_URL')."login.php?target=".urlencode($after_login);
             return new OkapiRedirectResponse($login_url);
@@ -48,8 +47,9 @@ 
         $vars['site_name'] = Okapi::get_normalized_site_name();
         $vars['site_logo'] = Settings::get('SITE_LOGO');
         $vars['apps'] = array();
-        while ($row = Db::fetch_assoc($rs))
-            $vars['apps'][] = $row;
+        while ($row = Db::fetch_assoc($rs)) {
+                    $vars['apps'][] = $row;
+        }
         Db::free_result($rs);
 
         $response = new OkapiHttpResponse();