OpencachingDeutschland / oc-server3

htdocs/okapi/services/apisrv/installations.php

Spacing +4 added lines, -4 removed lines

@@ -68,7 +68,7 @@ 
                     array(
                         'site_url' => Settings::get('SITE_URL'),
                         'site_name' => "Unable to retrieve!",
-                        'okapi_base_url' => Settings::get('SITE_URL')."okapi/",
+                        'okapi_base_url' => Settings::get('SITE_URL') . "okapi/",
                     )
                 );
                 Cache::set($cachekey, $results, 12 * 3600); # so to retry no earlier than after 12 hours
@@ -83,7 +83,7 @@ 
                 if ($inst[0]['okapi_base_url'])
                     $okapi_base_url = (string)$inst[0]['okapi_base_url'];
                 else
-                    $okapi_base_url = $site_url."okapi/";
+                    $okapi_base_url = $site_url . "okapi/";
                 if ($inst[0]['site_name'])
                     $site_name = (string)$inst[0]['site_name'];
                 else
@@ -105,7 +105,7 @@ 
                 $results[] = array(
                     'site_url' => Settings::get('SITE_URL'),
                     'site_name' => "DEVELSITE",
-                    'okapi_base_url' => Settings::get('SITE_URL')."okapi/",
+                    'okapi_base_url' => Settings::get('SITE_URL') . "okapi/",
                 );
                 # Contact OKAPI developers in order to get added to the official sites list!
             }
@@ -113,7 +113,7 @@ 
             # Cache it for one day. Also, save a backup (valid for 30 days).
 
             Cache::set($cachekey, $results, 86400);
-            Cache::set($backupkey, $results, 86400*30);
+            Cache::set($backupkey, $results, 86400 * 30);
         }
 
         return Okapi::formatted_response($request, $results);

Braces +14 added lines, -12 removed lines

@@ -49,8 +49,7 @@ 
                 if (!$doc) {
                     throw new ErrorException(); # just to get to the catch block
                 }
-            }
-            catch (ErrorException $e)
+            } catch (ErrorException $e)
             {
                 # GitHub failed on us. Try to respond with a backup list.
 
@@ -80,21 +79,24 @@ 
             foreach ($doc->installation as $inst)
             {
                 $site_url = (string)$inst[0]['site_url'];
-                if ($inst[0]['okapi_base_url'])
-                    $okapi_base_url = (string)$inst[0]['okapi_base_url'];
-                else
-                    $okapi_base_url = $site_url."okapi/";
-                if ($inst[0]['site_name'])
-                    $site_name = (string)$inst[0]['site_name'];
-                else
-                    $site_name = Okapi::get_normalized_site_name($site_url);
+                if ($inst[0]['okapi_base_url']) {
+                                    $okapi_base_url = (string)$inst[0]['okapi_base_url'];
+                } else {
+                                    $okapi_base_url = $site_url."okapi/";
+                }
+                if ($inst[0]['site_name']) {
+                                    $site_name = (string)$inst[0]['site_name'];
+                } else {
+                                    $site_name = Okapi::get_normalized_site_name($site_url);
+                }
                 $results[] = array(
                     'site_url' => $site_url,
                     'site_name' => $site_name,
                     'okapi_base_url' => $okapi_base_url,
                 );
-                if ($site_url == Settings::get('SITE_URL'))
-                    $i_was_included = true;
+                if ($site_url == Settings::get('SITE_URL')) {
+                                    $i_was_included = true;
+                }
             }
 
             # If running on a local development installation, then include the local

htdocs/okapi/settings.php

Spacing +6 added lines, -6 removed lines

@@ -195,12 +195,12 @@ 
         /**
          * Maximum size of uploaded images in bytes
          */
-        'IMAGE_MAX_UPLOAD_SIZE' => 4194304,  # 4 MB
+        'IMAGE_MAX_UPLOAD_SIZE' => 4194304, # 4 MB
 
         /**
          * Maximum 'resolution' of saved images in pixels
          */
-        'IMAGE_MAX_PIXEL_COUNT' => 524288,  # 0.5 MP
+        'IMAGE_MAX_PIXEL_COUNT' => 524288, # 0.5 MP
 
         /**
          * Quality of saved JPEG images on a scale from 50 to 100. The higher the
@@ -229,12 +229,12 @@ 
             # We have to temporarilly disable our default error handler.
 
             OkapiErrorHandler::disable();
-            require_once($GLOBALS['rootpath']."okapi_settings.php");
+            require_once($GLOBALS['rootpath'] . "okapi_settings.php");
             $ref = get_okapi_settings();
             OkapiErrorHandler::reenable();
 
         } catch (Exception $e) {
-            throw new Exception("Could not import <rootpath>/okapi_settings.php:\n".$e->getMessage());
+            throw new Exception("Could not import <rootpath>/okapi_settings.php:\n" . $e->getMessage());
         }
         self::$SETTINGS = self::$DEFAULT_SETTINGS;
         foreach (self::$SETTINGS as $key => $_)
@@ -318,12 +318,12 @@ 
      */
     public static function default_gettext_init($langprefs)
     {
-        require_once($GLOBALS['rootpath']."okapi/locale/locales.php");
+        require_once($GLOBALS['rootpath'] . "okapi/locale/locales.php");
         $locale = Locales::get_best_locale($langprefs);
         putenv("LC_ALL=$locale");
         setlocale(LC_ALL, $locale);
         setlocale(LC_NUMERIC, "POSIX"); # We don't want *this one* to get out of control.
-        bindtextdomain("okapi_messages", $GLOBALS['rootpath'].'okapi/locale');
+        bindtextdomain("okapi_messages", $GLOBALS['rootpath'] . 'okapi/locale');
         return $locale;
     }
 

Braces +42 added lines, -28 removed lines

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

htdocs/okapi/datastore.php

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
         $row = Db::select_row("
             select `key`, secret, name, url, email, bflags
             from okapi_consumers
-            where `key` = '".Db::escape_string($consumer_key)."'
+            where `key` = '".Db::escape_string($consumer_key) . "'
         ");
         if (!$row)
             return null;
@@ -25,9 +25,9 @@ 
             select `key`, consumer_key, secret, token_type, user_id, verifier, callback
             from okapi_tokens
             where
-                consumer_key = '".Db::escape_string($consumer->key)."'
-                and token_type = '".Db::escape_string($token_type)."'
-                and `key` = '".Db::escape_string($token)."'
+                consumer_key = '".Db::escape_string($consumer->key) . "'
+                and token_type = '".Db::escape_string($token_type) . "'
+                and `key` = '".Db::escape_string($token) . "'
         ");
         if (!$row)
             return null;
@@ -65,9 +65,9 @@ 
             Db::execute("
                 insert into okapi_nonces (consumer_key, nonce_hash, timestamp)
                 values (
-                    '".Db::escape_string($consumer->key)."',
-                    '".Db::escape_string($nonce_hash)."',
-                    '".Db::escape_string($timestamp)."'
+                    '".Db::escape_string($consumer->key) . "',
+                    '".Db::escape_string($nonce_hash) . "',
+                    '".Db::escape_string($timestamp) . "'
                 );
             ");
             return null;
@@ -93,17 +93,17 @@ 
                 (`key`, secret, token_type, timestamp,
                 user_id, consumer_key, verifier, callback)
             values (
-                '".Db::escape_string($token->key)."',
-                '".Db::escape_string($token->secret)."',
+                '".Db::escape_string($token->key) . "',
+                '".Db::escape_string($token->secret) . "',
                 'request',
                 unix_timestamp(),
                 null,
-                '".Db::escape_string($consumer->key)."',
-                '".Db::escape_string($token->verifier)."',
+                '".Db::escape_string($consumer->key) . "',
+                '".Db::escape_string($token->verifier) . "',
                 ".(($token->callback_url == 'oob')
                     ? "null"
-                    : "'".Db::escape_string($token->callback_url)."'"
-                )."
+                    : "'" . Db::escape_string($token->callback_url) . "'"
+                ) . "
             );
         ");
         return $token;
@@ -122,7 +122,7 @@ 
 
         Db::execute("
             delete from okapi_tokens
-            where `key` = '".Db::escape_string($token->key)."'
+            where `key` = '".Db::escape_string($token->key) . "'
         ");
 
         # In OKAPI, all Access Tokens are long lived. Therefore, we don't want
@@ -135,8 +135,8 @@ 
             from okapi_tokens
             where
                 token_type = 'access'
-                and user_id = '".Db::escape_string($token->authorized_by_user_id)."'
-                and consumer_key = '".Db::escape_string($consumer->key)."'
+                and user_id = '".Db::escape_string($token->authorized_by_user_id) . "'
+                and consumer_key = '".Db::escape_string($consumer->key) . "'
         ");
         if ($row)
         {
@@ -155,12 +155,12 @@ 
                 insert into okapi_tokens
                     (`key`, secret, token_type, timestamp, user_id, consumer_key)
                 values (
-                    '".Db::escape_string($access_token->key)."',
-                    '".Db::escape_string($access_token->secret)."',
+                    '".Db::escape_string($access_token->key) . "',
+                    '".Db::escape_string($access_token->secret) . "',
                     'access',
                     unix_timestamp(),
-                    '".Db::escape_string($access_token->user_id)."',
-                    '".Db::escape_string($consumer->key)."'
+                    '".Db::escape_string($access_token->user_id) . "',
+                    '".Db::escape_string($consumer->key) . "'
                 );
             ");
         }

Braces +18 added lines, -16 removed lines

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

htdocs/okapi/facade.php

Spacing +14 added lines, -14 removed lines

@@ -36,9 +36,9 @@ 
 use okapi\OkapiFacadeAccessToken;
 use okapi\Cache;
 
-require_once($GLOBALS['rootpath']."okapi/core.php");
+require_once($GLOBALS['rootpath'] . "okapi/core.php");
 OkapiErrorHandler::$treat_notices_as_errors = true;
-require_once($GLOBALS['rootpath']."okapi/service_runner.php");
+require_once($GLOBALS['rootpath'] . "okapi/service_runner.php");
 Okapi::init_internals();
 
 /**
@@ -97,10 +97,10 @@ 
      */
     public static function import_search_set($temp_table, $min_store, $max_ref_age)
     {
-        require_once($GLOBALS['rootpath'].'okapi/services/caches/search/save.php');
+        require_once($GLOBALS['rootpath'] . 'okapi/services/caches/search/save.php');
         $tables = array('caches', $temp_table);
         $where_conds = array(
-            $temp_table.".cache_id = caches.cache_id",
+            $temp_table . ".cache_id = caches.cache_id",
             'caches.status in (1,2,3)',
         );
         return \okapi\services\caches\search\save\WebService::get_set(
@@ -123,7 +123,7 @@ 
         Db::execute("
             update caches
             set okapi_syncbase = now()
-            where wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+            where wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
         ");
     }
 
@@ -140,8 +140,8 @@ 
             update cache_logs
             set okapi_syncbase = now()
             where
-                cache_id = '".Db::escape_string($cache_id)."'
-                and user_id = '".Db::escape_string($user_id)."'
+                cache_id = '".Db::escape_string($cache_id) . "'
+                and user_id = '".Db::escape_string($user_id) . "'
         ");
     }
 
@@ -151,7 +151,7 @@ 
      */
     public static function database_update()
     {
-        require_once($GLOBALS['rootpath']."okapi/views/update.php");
+        require_once($GLOBALS['rootpath'] . "okapi/views/update.php");
         $update = new views\update\View;
         $update->call();
     }
@@ -201,7 +201,7 @@ 
      */
     public static function cache_set($key, $value, $timeout)
     {
-        Cache::set("facade#".$key, $value, $timeout);
+        Cache::set("facade#" . $key, $value, $timeout);
     }
 
     /** Same as `cache_set`, but works on many key->value pair at once. */
@@ -209,7 +209,7 @@ 
     {
         $prefixed_dict = array();
         foreach ($dict as $key => &$value_ref) {
-            $prefixed_dict["facade#".$key] = &$value_ref;
+            $prefixed_dict["facade#" . $key] = &$value_ref;
         }
         Cache::set_many($prefixed_dict, $timeout);
     }
@@ -220,7 +220,7 @@ 
      */
     public static function cache_get($key)
     {
-        return Cache::get("facade#".$key);
+        return Cache::get("facade#" . $key);
     }
 
     /** Same as `cache_get`, but it works on multiple keys at once. */
@@ -228,7 +228,7 @@ 
     {
         $prefixed_keys = array();
         foreach ($keys as $key) {
-            $prefixed_keys[] = "facade#".$key;
+            $prefixed_keys[] = "facade#" . $key;
         }
         $prefixed_result = Cache::get_many($prefixed_keys);
         $result = array();
@@ -243,7 +243,7 @@ 
      */
     public static function cache_delete($key)
     {
-        Cache::delete("facade#".$key);
+        Cache::delete("facade#" . $key);
     }
 
     /** Same as `cache_delete`, but works on many keys at once. */
@@ -251,7 +251,7 @@ 
     {
         $prefixed_keys = array();
         foreach ($keys as $key) {
-            $prefixed_keys[] = "facade#".$key;
+            $prefixed_keys[] = "facade#" . $key;
         }
         Cache::delete_many($prefixed_keys);
     }

Braces +6 added lines, -4 removed lines

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

htdocs/okapi/locale/locales.php

Braces +12 added lines, -8 removed lines

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

htdocs/okapi/lib/oc_session.php

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
         if (!$OC_sessionid)
             return null;
 
-        return Db::select_value("select user_id from sys_sessions where uuid='".Db::escape_string($OC_sessionid)."'");
+        return Db::select_value("select user_id from sys_sessions where uuid='" . Db::escape_string($OC_sessionid) . "'");
     }
 }
\ No newline at end of file

Braces +12 added lines, -8 removed lines

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

htdocs/okapi/lib/ocpl_access_logs.php

Spacing +8 added lines, -8 removed lines

@@ -22,14 +22,14 @@ 
         // traverse PHP call stack to find out who originally called us
         // first, find first service_runner.php invocation
         // then, find previous class invocation
-        for($i = count($trace)-1; $i >= 0; $i--)
+        for ($i = count($trace) - 1; $i >= 0; $i--)
         {
             $frame = $trace[$i];
             if ($break_next && isset($frame['class']))
             {
                 $class_elems = explode('\\', $frame['class']);
                 if (count($class_elems) >= 2)
-                    $org_caller = $class_elems[count($class_elems)-2];
+                    $org_caller = $class_elems[count($class_elems) - 2];
                 break;
             }
             if (isset($frame['file']) &&
@@ -51,7 +51,7 @@ 
     public static function log_geocache_access(OkapiRequest $request, $cache_ids)
     {
         if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true)
-            return ;
+            return;
 
         if (Settings::get('OC_BRANCH') == 'oc.pl')
         {
@@ -70,7 +70,7 @@ 
             if ($request->token != null)
                 $user_id = $request->token->user_id;
             $user_id_escaped = $user_id === null ? "null" : "'" . Db::escape_string($user_id) . "'";
-            if (is_array($cache_ids)){
+            if (is_array($cache_ids)) {
                 if (count($cache_ids) == 1)
                     $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
                 else
@@ -101,24 +101,24 @@ 
             if (is_array($cache_ids) && count($already_logged_cache_ids) == count($cache_ids)
                 || !is_array($cache_ids) && count($already_logged_cache_ids) == 1)
             {
-                return ;
+                return;
             }
 
-            if (is_array($cache_ids)){
+            if (is_array($cache_ids)) {
                 $tmp = array();
                 foreach ($cache_ids as $cache_id)
                     $tmp[$cache_id] = true;
                 foreach ($already_logged_cache_ids as $cache_id)
                     unset($tmp[$cache_id]);
                 if (count($tmp) <= 0)
-                    return ;
+                    return;
                 $cache_ids_filterd = array_keys($tmp);
                 unset($tmp);
             } else {
                 $cache_ids_filterd = $cache_ids;
             }
 
-            if (is_array($cache_ids_filterd)){
+            if (is_array($cache_ids_filterd)) {
                 if (count($cache_ids_filterd) == 1)
                     $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
                 else

Braces +28 added lines, -20 removed lines

@@ -28,8 +28,9 @@ 
             if ($break_next && isset($frame['class']))
             {
                 $class_elems = explode('\\', $frame['class']);
-                if (count($class_elems) >= 2)
-                    $org_caller = $class_elems[count($class_elems)-2];
+                if (count($class_elems) >= 2) {
+                                    $org_caller = $class_elems[count($class_elems)-2];
+                }
                 break;
             }
             if (isset($frame['file']) &&
@@ -50,8 +51,9 @@ 
      */
     public static function log_geocache_access(OkapiRequest $request, $cache_ids)
     {
-        if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true)
-            return ;
+        if (Settings::get('OCPL_ENABLE_GEOCACHE_ACCESS_LOGS') !== true) {
+                    return ;
+        }
 
         if (Settings::get('OC_BRANCH') == 'oc.pl')
         {
@@ -67,14 +69,16 @@ 
             $original_caller_escaped = "'" . Db::escape_string(self::get_original_caller()) . "'";
 
             $user_id = null;
-            if ($request->token != null)
-                $user_id = $request->token->user_id;
+            if ($request->token != null) {
+                            $user_id = $request->token->user_id;
+            }
             $user_id_escaped = $user_id === null ? "null" : "'" . Db::escape_string($user_id) . "'";
             if (is_array($cache_ids)){
-                if (count($cache_ids) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
-                else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids)) . "')";
+                if (count($cache_ids) == 1) {
+                                    $cache_ids_where = "= '" . Db::escape_string($cache_ids[0]) . "'";
+                } else {
+                                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids)) . "')";
+                }
             } else {
                 $cache_ids_where = "= '" . Db::escape_string($cache_ids) . "'";
             }
@@ -106,12 +110,15 @@ 
 
             if (is_array($cache_ids)){
                 $tmp = array();
-                foreach ($cache_ids as $cache_id)
-                    $tmp[$cache_id] = true;
-                foreach ($already_logged_cache_ids as $cache_id)
-                    unset($tmp[$cache_id]);
-                if (count($tmp) <= 0)
-                    return ;
+                foreach ($cache_ids as $cache_id) {
+                                    $tmp[$cache_id] = true;
+                }
+                foreach ($already_logged_cache_ids as $cache_id) {
+                                    unset($tmp[$cache_id]);
+                }
+                if (count($tmp) <= 0) {
+                                    return ;
+                }
                 $cache_ids_filterd = array_keys($tmp);
                 unset($tmp);
             } else {
@@ -119,10 +126,11 @@ 
             }
 
             if (is_array($cache_ids_filterd)){
-                if (count($cache_ids_filterd) == 1)
-                    $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
-                else
-                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd)) . "')";
+                if (count($cache_ids_filterd) == 1) {
+                                    $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd[0]) . "'";
+                } else {
+                                    $cache_ids_where = "in ('" . implode("','", array_map('\okapi\Db::escape_string', $cache_ids_filterd)) . "')";
+                }
             } else {
                 $cache_ids_where = "= '" . Db::escape_string($cache_ids_filterd) . "'";
             }

htdocs/okapi/service_runner.php

Spacing +18 added lines, -18 removed lines

@@ -73,15 +73,15 @@ 
     {
         if (!self::exists($service_name))
             throw new Exception();
-        require_once($GLOBALS['rootpath']."okapi/$service_name.php");
+        require_once($GLOBALS['rootpath'] . "okapi/$service_name.php");
         try
         {
-            return call_user_func(array('\\okapi\\'.
-                str_replace('/', '\\', $service_name).'\\WebService', 'options'));
+            return call_user_func(array('\\okapi\\' .
+                str_replace('/', '\\', $service_name) . '\\WebService', 'options'));
         } catch (Exception $e)
         {
-            throw new Exception("Make sure you've declared your WebService class ".
-                "in an valid namespace (".'okapi\\'.str_replace('/', '\\', $service_name)."); ".
+            throw new Exception("Make sure you've declared your WebService class " .
+                "in an valid namespace (" . 'okapi\\' . str_replace('/', '\\', $service_name) . "); " .
                 $e->getMessage());
         }
     }
@@ -120,13 +120,13 @@ 
         $options = self::options($service_name);
         if ($options['min_auth_level'] >= 2 && $request->consumer == null)
         {
-            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: ".
-                "\$request->consumer MAY NOT be empty for Level 2 and Level 3 methods. Provide ".
+            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: " .
+                "\$request->consumer MAY NOT be empty for Level 2 and Level 3 methods. Provide " .
                 "a dummy Consumer if you have to.");
         }
         if ($options['min_auth_level'] >= 3 && $request->token == null)
         {
-            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: ".
+            throw new Exception("Method '$service_name' called with mismatched OkapiRequest: " .
                 "\$request->token MAY NOT be empty for Level 3 methods.");
         }
 
@@ -134,14 +134,14 @@ 
         Okapi::gettext_domain_init();
         try
         {
-            require_once($GLOBALS['rootpath']."okapi/$service_name.php");
-            $response = call_user_func(array('\\okapi\\'.
-                str_replace('/', '\\', $service_name).'\\WebService', 'call'), $request);
+            require_once($GLOBALS['rootpath'] . "okapi/$service_name.php");
+            $response = call_user_func(array('\\okapi\\' .
+                str_replace('/', '\\', $service_name) . '\\WebService', 'call'), $request);
             if ($options['min_auth_level'] >= 3 && $request->token->token_type == "access")
             {
                 Db::execute("
                     update user set last_login=now()
-                    where user_id='".Db::escape_string($request->token->user_id)."'
+                    where user_id='".Db::escape_string($request->token->user_id) . "'
                 ");
             }
             Okapi::gettext_domain_restore();
@@ -166,7 +166,7 @@ 
      */
     public static function save_stats_extra($extra_name, $request, $runtime)
     {
-        self::save_stats("extra/".$extra_name, $request, $runtime);
+        self::save_stats("extra/" . $extra_name, $request, $runtime);
     }
 
     private static function save_stats($service_name, $request, $runtime)
@@ -195,11 +195,11 @@ 
             insert into okapi_stats_temp (`datetime`, consumer_key, user_id, service_name, calltype, runtime)
             values (
                 now(),
-                '".Db::escape_string($consumer_key)."',
-                '".Db::escape_string($user_id)."',
-                '".Db::escape_string($service_name)."',
-                '".Db::escape_string($calltype)."',
-                '".Db::escape_string($runtime)."'
+                '".Db::escape_string($consumer_key) . "',
+                '".Db::escape_string($user_id) . "',
+                '".Db::escape_string($service_name) . "',
+                '".Db::escape_string($calltype) . "',
+                '".Db::escape_string($runtime) . "'
             );
         ");
     }

Braces +17 added lines, -11 removed lines

@@ -71,8 +71,9 @@ 
     /** Get method options (is consumer required etc.). */
     public static function options($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         require_once($GLOBALS['rootpath']."okapi/$service_name.php");
         try
         {
@@ -92,8 +93,9 @@ 
      */
     public static function docs($service_name)
     {
-        if (!self::exists($service_name))
-            throw new Exception();
+        if (!self::exists($service_name)) {
+                    throw new Exception();
+        }
         try {
             return file_get_contents("$service_name.xml", true);
         } catch (Exception $e) {
@@ -114,8 +116,9 @@ 
     {
         Okapi::init_internals();
 
-        if (!self::exists($service_name))
-            throw new Exception("Method does not exist: '$service_name'");
+        if (!self::exists($service_name)) {
+                    throw new Exception("Method does not exist: '$service_name'");
+        }
 
         $options = self::options($service_name);
         if ($options['min_auth_level'] >= 2 && $request->consumer == null)
@@ -178,18 +181,21 @@ 
         if ($request !== null) {
             $consumer_key = ($request->consumer != null) ? $request->consumer->key : 'anonymous';
             $user_id = (($request->token != null) && ($request->token instanceof OkapiAccessToken)) ? $request->token->user_id : -1;
-            if ($request->is_http_request() && ($service_name[0] == 's'))  # 's' for "services/", we don't want "extra/" included
+            if ($request->is_http_request() && ($service_name[0] == 's')) {
+                # 's' for "services/", we don't want "extra/" included
                 $calltype = 'http';
-            else
-                $calltype = 'internal';
+            } else {
+                            $calltype = 'internal';
+            }
         } else {
             $consumer_key = 'internal';
             $user_id = -1;
             $calltype = 'internal';
         }
 
-        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1)
-            $user_id = 0;
+        if (Settings::get('OC_BRANCH') == 'oc.de' && $user_id != -1) {
+                    $user_id = 0;
+        }
 
         Db::execute("
             insert into okapi_stats_temp (`datetime`, consumer_key, user_id, service_name, calltype, runtime)

htdocs/okapi/controller.php

Spacing +6 added lines, -6 removed lines

@@ -17,9 +17,9 @@ 
 
 $GLOBALS['rootpath'] = '../'; # this is for OC-code compatibility
 
-require_once($GLOBALS['rootpath'].'okapi/core.php');
+require_once($GLOBALS['rootpath'] . 'okapi/core.php');
 OkapiErrorHandler::$treat_notices_as_errors = true;
-require_once($GLOBALS['rootpath'].'okapi/urls.php');
+require_once($GLOBALS['rootpath'] . 'okapi/urls.php');
 
 if (ob_list_handlers() == array('default output handler'))
 {
@@ -72,9 +72,9 @@ 
                     # 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);
+                    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();
                     return;
@@ -88,7 +88,7 @@ 
 
         # None of the patterns matched OR method threw the Http404 exception.
 
-        require_once($GLOBALS['rootpath']."okapi/views/http404.php");
+        require_once($GLOBALS['rootpath'] . "okapi/views/http404.php");
         $response = \okapi\views\http404\View::call();
         $response->display();
     }

Braces +13 added lines, -10 removed lines

@@ -37,20 +37,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
@@ -75,13 +78,13 @@ 
                     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 */
         }