OpencachingDeutschland / oc-server3

htdocs/okapi/services/apiref/issue.php

Braces +9 added lines, -11 removed lines

@@ -26,19 +26,19 @@ 
     public static function call(OkapiRequest $request)
     {
         $issue_id = $request->get_parameter('issue_id');
-        if (!$issue_id)
-            throw new ParamMissing('issue_id');
-        if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6))
-            throw new InvalidParam('issue_id');
+        if (!$issue_id) {
+                    throw new ParamMissing('issue_id');
+        }
+        if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6)) {
+                    throw new InvalidParam('issue_id');
+        }
 
         $cache_key = "apiref/issue#".$issue_id;
         $result = Cache::get($cache_key);
-        if ($result == null)
-        {
+        if ($result == null) {
             # Download the number of comments from GitHub Issue Tracker.
 
-            try
-            {
+            try {
                 $extra_headers = array();
                 $extra_headers[] = "Accept: application/vnd.github.v3.html+json";
                 $extra_headers[] = "User-Agent: https://github.com/opencaching/okapi/";
@@ -55,9 +55,7 @@ 
                 $context = stream_context_create($opts);
                 $json = file_get_contents("https://api.github.com/repos/opencaching/okapi/issues/$issue_id",
                     false, $context);
-            }
-            catch (ErrorException $e)
-            {
+            } catch (ErrorException $e) {
                 throw new BadRequest("Sorry, we could not retrieve issue stats from the GitHub site. ".
                     "This is probably due to a temporary connection problem. Try again later or contact ".
                     "us if this seems permanent.");

htdocs/okapi/services/apiref/method.php

Spacing +2 added lines, -2 removed lines

@@ -185,14 +185,14 @@
                 if (($include_list === null) && (count($exclude_list) == 0))
                 {
                     $arg['description'] = "<i>Inherited from <a href='".$referenced_method_info['ref_url'].
-                        "#arg_". $arg['name'] . "'>".$referenced_method_info['name']."</a> method.</i>";
+                        "#arg_".$arg['name']."'>".$referenced_method_info['name']."</a> method.</i>";
                 }
                 elseif (
                     (($include_list === null) || in_array($arg['name'], $include_list))
                     && (!in_array($arg['name'], $exclude_list))
                 ) {
                     $arg['description'] = "<i>Same as in the <a href='".$referenced_method_info['ref_url'].
-                        "#arg_". $arg['name'] . "'>".$referenced_method_info['name']."</a> method.</i>";
+                        "#arg_".$arg['name']."'>".$referenced_method_info['name']."</a> method.</i>";
                 } else {
                     continue;
                 }

Braces +51 added lines, -44 removed lines

@@ -102,12 +102,10 @@ 
             case 'methodretref':
                 $elements = explode('#', $arr[1]);
                 $result = '';
-                if ($elements[0] != '')
-                {
+                if ($elements[0] != '') {
                     $result .= Settings::get('SITE_URL')."okapi/".$elements[0].'.html';
                 }
-                if (count($elements) > 1)
-                {
+                if (count($elements) > 1) {
                     $result .= '#';
                     switch ($plugin_name) {
                         case 'methodargref':
@@ -128,15 +126,19 @@ 
     public static function call(OkapiRequest $request)
     {
         $methodname = $request->get_parameter('name');
-        if (!$methodname)
-            throw new ParamMissing('name');
-        if (!preg_match("#^services/[0-9a-z_/]*$#", $methodname))
-            throw new InvalidParam('name');
-        if (!OkapiServiceRunner::exists($methodname))
-            throw new InvalidParam('name', "Method does not exist: '$methodname'.");
+        if (!$methodname) {
+                    throw new ParamMissing('name');
+        }
+        if (!preg_match("#^services/[0-9a-z_/]*$#", $methodname)) {
+                    throw new InvalidParam('name');
+        }
+        if (!OkapiServiceRunner::exists($methodname)) {
+                    throw new InvalidParam('name', "Method does not exist: '$methodname'.");
+        }
         $options = OkapiServiceRunner::options($methodname);
-        if (!isset($options['min_auth_level']))
-            throw new Exception("Method $methodname is missing a required 'min_auth_level' option!");
+        if (!isset($options['min_auth_level'])) {
+                    throw new Exception("Method $methodname is missing a required 'min_auth_level' option!");
+        }
         $docs = simplexml_load_string(OkapiServiceRunner::docs($methodname));
         $exploded = explode("/", $methodname);
         $result = array(
@@ -149,45 +151,49 @@ 
                 'oauth_token' => $options['min_auth_level'] >= 3,
             )
         );
-        if (!$docs->brief)
-            throw new Exception("Missing <brief> element in the $methodname.xml file.");
-        if ($docs->brief != self::get_inner_xml($docs->brief))
-            throw new Exception("The <brief> element may not contain HTML markup ($methodname.xml).");
-        if (strlen($docs->brief) > 80)
-            throw new Exception("The <brief> description may not be longer than 80 characters ($methodname.xml).");
-        if (strpos($docs->brief, "\n") !== false)
-            throw new Exception("The <brief> element may not contain new-lines ($methodname.xml).");
-        if (substr(trim($docs->brief), -1) == '.')
-            throw new Exception("The <brief> element should not end with a dot ($methodname.xml).");
+        if (!$docs->brief) {
+                    throw new Exception("Missing <brief> element in the $methodname.xml file.");
+        }
+        if ($docs->brief != self::get_inner_xml($docs->brief)) {
+                    throw new Exception("The <brief> element may not contain HTML markup ($methodname.xml).");
+        }
+        if (strlen($docs->brief) > 80) {
+                    throw new Exception("The <brief> description may not be longer than 80 characters ($methodname.xml).");
+        }
+        if (strpos($docs->brief, "\n") !== false) {
+                    throw new Exception("The <brief> element may not contain new-lines ($methodname.xml).");
+        }
+        if (substr(trim($docs->brief), -1) == '.') {
+                    throw new Exception("The <brief> element should not end with a dot ($methodname.xml).");
+        }
         $result['brief_description'] = self::get_inner_xml($docs->brief);
-        if ($docs->{'issue-id'})
-            $result['issue_id'] = (string)$docs->{'issue-id'};
-        else
-            $result['issue_id'] = null;
-        if (!$docs->desc)
-            throw new Exception("Missing <desc> element in the $methodname.xml file.");
+        if ($docs->{'issue-id'}) {
+                    $result['issue_id'] = (string)$docs->{'issue-id'};
+        } else {
+                    $result['issue_id'] = null;
+        }
+        if (!$docs->desc) {
+                    throw new Exception("Missing <desc> element in the $methodname.xml file.");
+        }
         $result['description'] = self::get_inner_xml($docs->desc);
         $result['arguments'] = array();
         foreach ($docs->req as $arg) { $result['arguments'][] = self::arg_desc($arg); }
         foreach ($docs->opt as $arg) { $result['arguments'][] = self::arg_desc($arg); }
-        foreach ($docs->{'import-params'} as $import_desc)
-        {
+        foreach ($docs->{'import-params'} as $import_desc) {
             $attrs = $import_desc->attributes();
             $referenced_methodname = $attrs['method'];
             $referenced_method_info = OkapiServiceRunner::call('services/apiref/method',
                 new OkapiInternalRequest(new OkapiInternalConsumer(), null, array('name' => $referenced_methodname)));
             $include_list = isset($attrs['params']) ? explode("|", $attrs['params']) : null;
             $exclude_list = isset($attrs['except']) ? explode("|", $attrs['except']) : array();
-            foreach ($referenced_method_info['arguments'] as $arg)
-            {
-                if ($arg['class'] == 'common-formatting')
-                    continue;
-                if (($include_list === null) && (count($exclude_list) == 0))
-                {
+            foreach ($referenced_method_info['arguments'] as $arg) {
+                if ($arg['class'] == 'common-formatting') {
+                                    continue;
+                }
+                if (($include_list === null) && (count($exclude_list) == 0)) {
                     $arg['description'] = "<i>Inherited from <a href='".$referenced_method_info['ref_url'].
                         "#arg_". $arg['name'] . "'>".$referenced_method_info['name']."</a> method.</i>";
-                }
-                elseif (
+                } elseif (
                     (($include_list === null) || in_array($arg['name'], $include_list))
                     && (!in_array($arg['name'], $exclude_list))
                 ) {
@@ -200,8 +206,7 @@ 
                 $result['arguments'][] = $arg;
             }
         }
-        if ($docs->{'common-format-params'})
-        {
+        if ($docs->{'common-format-params'}) {
             $result['arguments'][] = array(
                 'name' => 'format',
                 'is_required' => false,
@@ -217,12 +222,14 @@ 
                 'description' => "<i>Standard <a href='".Settings::get('SITE_URL')."okapi/introduction.html#common-formatting'>common formatting</a> argument.</i>"
             );
         }
-        foreach ($result['arguments'] as &$arg_ref)
-            if ($arg_ref['is_deprecated'])
+        foreach ($result['arguments'] as &$arg_ref) {
+                    if ($arg_ref['is_deprecated'])
                 $arg_ref['class'] .= " deprecated";
-        if (!$docs->returns)
-            throw new Exception("Missing <returns> element in the $methodname.xml file. ".
+        }
+        if (!$docs->returns) {
+                    throw new Exception("Missing <returns> element in the $methodname.xml file. ".
                 "If your method does not return anything, you should document in nonetheless.");
+        }
         $result['returns'] = self::get_inner_xml($docs->returns);
         return Okapi::formatted_response($request, $result);
     }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
             throw new InvalidParam('name', "Method does not exist: '$methodname'.");
         $options = OkapiServiceRunner::options($methodname);
         if (!isset($options['min_auth_level']))
-            throw new Exception("Method $methodname is missing a required 'min_auth_level' option!");
+            throw new Exception("method $methodname is missing a required 'min_auth_level' option!");
         $docs = simplexml_load_string(OkapiServiceRunner::docs($methodname));
         $exploded = explode("/", $methodname);
         $result = array(

htdocs/okapi/services/apiref/method_index.php

Braces +2 added lines, -4 removed lines

@@ -28,11 +28,9 @@
         sort($methodnames);
         $cache_key = "api_ref/method_index#".md5(implode("#", $methodnames));
         $results = Cache::get($cache_key);
-        if ($results == null)
-        {
+        if ($results == null) {
             $results = array();
-            foreach ($methodnames as $methodname)
-            {
+            foreach ($methodnames as $methodname) {
                 $info = OkapiServiceRunner::call('services/apiref/method', new OkapiInternalRequest(
                     new OkapiInternalConsumer(), null, array('name' => $methodname)));
                 $results[] = array(

htdocs/okapi/services/apisrv/stats.php

Braces +1 added lines, -2 removed lines

@@ -26,8 +26,7 @@
     {
         $cachekey = "apisrv/stats";
         $result = Cache::get($cachekey);
-        if (!$result)
-        {
+        if (!$result) {
             $result = array(
                 'cache_count' => 0 + Db::select_value("
                     select count(*) from caches where status in (1,2,3)

htdocs/okapi/services/apisrv/installations.php

Spacing +1 added lines, -1 removed lines

@@ -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 +19 added lines, -23 removed lines

@@ -30,12 +30,10 @@ 
         $cachekey = 'apisrv/installations';
         $backupkey = 'apisrv/installations-backup';
         $results = Cache::get($cachekey);
-        if (!$results)
-        {
+        if (!$results) {
             # Download the current list of OKAPI servers.
 
-            try
-            {
+            try {
                 $opts = array(
                     'http' => array(
                         'method' => "GET",
@@ -49,14 +47,11 @@ 
                 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.
 
                 $results = Cache::get($backupkey);
-                if ($results)
-                {
+                if ($results) {
                     Cache::set($cachekey, $results, 12 * 3600); # so to retry no earlier than after 12 hours
                     return Okapi::formatted_response($request, $results);
                 }
@@ -77,31 +72,32 @@ 
 
             $results = array();
             $i_was_included = false;
-            foreach ($doc->installation as $inst)
-            {
+            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
             # installation URL.
 
-            if (!$i_was_included)
-            {
+            if (!$i_was_included) {
                 $results[] = array(
                     'site_url' => Settings::get('SITE_URL'),
                     'site_name' => "DEVELSITE",

htdocs/okapi/services/replicate/fulldump.php

Braces +11 added lines, -11 removed lines

@@ -49,24 +49,24 @@
         require_once('replicate_common.inc.php');
 
         $data = Cache::get("last_fulldump");
-        if ($data == null)
-            throw new BadRequest("No fulldump found. Try again later. If this doesn't help ".
+        if ($data == null) {
+                    throw new BadRequest("No fulldump found. Try again later. If this doesn't help ".
                 "contact site administrator and/or OKAPI developers.");
+        }
 
         # Check consumer's quota
 
         $please = $request->get_parameter('pleeaase');
-        if ($please != 'true')
-        {
+        if ($please != 'true') {
             $not_good = 3 < self::count_calls($request->consumer->key, 30);
-            if ($not_good)
-                throw new BadRequest("Consumer's monthly quota exceeded. Try later or call with '&pleeaase=true'.");
-        }
-        else
-        {
+            if ($not_good) {
+                            throw new BadRequest("Consumer's monthly quota exceeded. Try later or call with '&pleeaase=true'.");
+            }
+        } else {
             $not_good = 5 < self::count_calls($request->consumer->key, 1);
-            if ($not_good)
-                throw new BadRequest("No more please. Seriously, dude...");
+            if ($not_good) {
+                            throw new BadRequest("No more please. Seriously, dude...");
+            }
         }
 
         $response = new OkapiHttpResponse();

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/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 */
         }