OpencachingDeutschland / oc-server3

htdocs/okapi/services/users/by_internal_id.php

Braces +6 added lines, -3 removed lines

@@ -23,7 +23,9 @@ 
     public static function call(OkapiRequest $request)
     {
         $internal_id = $request->get_parameter('internal_id');
-        if (!$internal_id) throw new ParamMissing('internal_id');
+        if (!$internal_id) {
+            throw new ParamMissing('internal_id');
+        }
         $fields = $request->get_parameter('fields');
 
         # There's no need to validate the fields parameter.
@@ -32,8 +34,9 @@ 
             $request->consumer, $request->token, array('internal_ids' => $internal_id,
             'fields' => $fields)));
         $result = $results[$internal_id];
-        if ($result == null)
-            throw new InvalidParam('internal_id', "There is no user by this internal_id.");
+        if ($result == null) {
+                    throw new InvalidParam('internal_id', "There is no user by this internal_id.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }

htdocs/okapi/services/users/by_usernames.php

Spacing +3 added lines, -3 removed lines

@@ -27,8 +27,8 @@ 
         if (!$usernames) throw new ParamMissing('usernames');
         $usernames = explode("|", $usernames);
         if (count($usernames) > 500)
-            throw new InvalidParam('usernames', "Maximum allowed number of referenced users ".
-                "is 500. You provided ".count($usernames)." usernames.");
+            throw new InvalidParam('usernames', "Maximum allowed number of referenced users " .
+                "is 500. You provided " . count($usernames) . " usernames.");
         $fields = $request->get_parameter('fields');
         if (!$fields)
             throw new ParamMissing('fields');
@@ -39,7 +39,7 @@ 
         $rs = Db::query("
             select username, uuid
             from user
-            where username collate ".Settings::get('DB_CHARSET')."_general_ci in ('".implode("','", array_map('\okapi\Db::escape_string', $usernames))."')
+            where username collate ".Settings::get('DB_CHARSET') . "_general_ci in ('" . implode("','", array_map('\okapi\Db::escape_string', $usernames)) . "')
         ");
         $lower_username2useruuid = array();
         while ($row = Db::fetch_assoc($rs))

Braces +14 added lines, -9 removed lines

@@ -24,14 +24,18 @@ 
     public static function call(OkapiRequest $request)
     {
         $usernames = $request->get_parameter('usernames');
-        if (!$usernames) throw new ParamMissing('usernames');
+        if (!$usernames) {
+            throw new ParamMissing('usernames');
+        }
         $usernames = explode("|", $usernames);
-        if (count($usernames) > 500)
-            throw new InvalidParam('usernames', "Maximum allowed number of referenced users ".
+        if (count($usernames) > 500) {
+                    throw new InvalidParam('usernames', "Maximum allowed number of referenced users ".
                 "is 500. You provided ".count($usernames)." usernames.");
+        }
         $fields = $request->get_parameter('fields');
-        if (!$fields)
-            throw new ParamMissing('fields');
+        if (!$fields) {
+                    throw new ParamMissing('fields');
+        }
 
         # There's no need to validate the fields parameter as the 'users'
         # method does this (it will raise a proper exception on invalid values).
@@ -65,10 +69,11 @@ 
         $results = array();
         foreach ($usernames as $username)
         {
-            if (!isset($lower_username2useruuid[mb_strtolower($username, 'utf-8')]))
-                $results[$username] = null;
-            else
-                $results[$username] = $id_results[$lower_username2useruuid[mb_strtolower($username, 'utf-8')]];
+            if (!isset($lower_username2useruuid[mb_strtolower($username, 'utf-8')])) {
+                            $results[$username] = null;
+            } else {
+                            $results[$username] = $id_results[$lower_username2useruuid[mb_strtolower($username, 'utf-8')]];
+            }
         }
 
         return Okapi::formatted_response($request, $results);

htdocs/okapi/services/users/user.php

Braces +4 added lines, -4 removed lines

@@ -33,8 +33,7 @@ 
                 $tmp = OkapiServiceRunner::call('services/users/by_internal_id', new OkapiInternalRequest(
                     $request->consumer, null, array('internal_id' => $request->token->user_id, 'fields' => 'uuid')));
                 $user_uuid = $tmp['uuid'];
-            }
-            else
+            } else
             {
                 throw new BadRequest("You must either: 1. supply the user_uuid argument, or "
                     ."2. sign your request with an Access Token.");
@@ -49,8 +48,9 @@ 
             $request->consumer, $request->token, array('user_uuids' => $user_uuid,
             'fields' => $fields)));
         $result = $results[$user_uuid];
-        if ($result == null)
-            throw new InvalidParam('user_uuid', "There is no user by this ID.");
+        if ($result == null) {
+                    throw new InvalidParam('user_uuid', "There is no user by this ID.");
+        }
         return Okapi::formatted_response($request, $result);
     }
 }

htdocs/okapi/services/oauth/request_token.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 
         $response = new OkapiHttpResponse();
         $response->content_type = "text/plain; charset=utf-8";
-        $response->body = $new_token."&oauth_callback_confirmed=true";
+        $response->body = $new_token . "&oauth_callback_confirmed=true";
         return $response;
     }
 }

htdocs/okapi/services/oauth/authorize.php

Spacing +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@
         # done in the "services" folder. 2) "services" don't display
         # any interactive webpages, they just return the result.
 
-        return new OkapiRedirectResponse(Settings::get('SITE_URL')."okapi/apps/authorize".
-            "?oauth_token=".$token_key.(($langpref != null) ? "&langpref=".$langpref : "").
-            "&interactivity=".$interactivity);
+        return new OkapiRedirectResponse(Settings::get('SITE_URL') . "okapi/apps/authorize" .
+            "?oauth_token=" . $token_key . (($langpref != null) ? "&langpref=" . $langpref : "") .
+            "&interactivity=" . $interactivity);
     }
 }

Braces +9 added lines, -5 removed lines

@@ -21,13 +21,17 @@
     public static function call(OkapiRequest $request)
     {
         $token_key = $request->get_parameter('oauth_token');
-        if (!$token_key)
-            throw new ParamMissing("oauth_token");
+        if (!$token_key) {
+                    throw new ParamMissing("oauth_token");
+        }
         $langpref = $request->get_parameter('langpref');
         $interactivity = $request->get_parameter('interactivity');
-        if (!$interactivity) $interactivity = 'minimal';
-        if (!in_array($interactivity, array('minimal', 'confirm_user')))
-            throw new InvalidParam('interactivity', $interactivity);
+        if (!$interactivity) {
+            $interactivity = 'minimal';
+        }
+        if (!in_array($interactivity, array('minimal', 'confirm_user'))) {
+                    throw new InvalidParam('interactivity', $interactivity);
+        }
 
         # Redirect to the "apps" folder. This is done there (not here)
         # because: 1) we don't want any cookie or session-handling

htdocs/okapi/services/attrs/attribute_index.php

Braces +9 added lines, -3 removed lines

@@ -30,13 +30,19 @@
         # Read the parameters.
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "name";
+        if (!$fields) {
+            $fields = "name";
+        }
 
         $only_locally_used = $request->get_parameter('only_locally_used');
-        if (!$only_locally_used) $only_locally_used = "false";
+        if (!$only_locally_used) {
+            $only_locally_used = "false";
+        }
         $only_locally_used = ($only_locally_used == "true");
 
         # Get the list of attributes and filter the A-codes based on the

htdocs/okapi/services/attrs/attributes.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
             # Fill some other fields (not kept in the cached attrdict).
 
             $attr['is_locally_used'] = ($attr['internal_id'] !== null);
-            $attr['is_deprecated'] = $attr['is_discontinued'];  // deprecated and undocumetned field, see issue 70
+            $attr['is_deprecated'] = $attr['is_discontinued']; // deprecated and undocumetned field, see issue 70
 
             # Add to results.
 
@@ -119,7 +119,7 @@ 
                 $internal_id = $attr_ref['internal_id'];
                 if (isset($map[$internal_id])) {
                     $row = $map[$internal_id];
-                    $attr_ref['local_icon_url'] = $prefix.$row['icon_large'];
+                    $attr_ref['local_icon_url'] = $prefix . $row['icon_large'];
                 } else {
                     $attr_ref['local_icon_url'] = null;
                 }

Braces +21 added lines, -10 removed lines

@@ -35,26 +35,36 @@ 
         # Read the parameters.
 
         $acodes = $request->get_parameter('acodes');
-        if (!$acodes) throw new ParamMissing('acodes');
+        if (!$acodes) {
+            throw new ParamMissing('acodes');
+        }
         $acodes = explode("|", $acodes);
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref = explode("|", $langpref);
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "name";
+        if (!$fields) {
+            $fields = "name";
+        }
         $fields = explode("|", $fields);
         foreach ($fields as $field)
         {
-            if (!in_array($field, self::$valid_field_names))
-                throw new InvalidParam('fields', "'$field' is not a valid field code.");
+            if (!in_array($field, self::$valid_field_names)) {
+                            throw new InvalidParam('fields', "'$field' is not a valid field code.");
+            }
         }
 
         $forward_compatible = $request->get_parameter('forward_compatible');
-        if (!$forward_compatible) $forward_compatible = "true";
-        if (!in_array($forward_compatible, array("true", "false")))
-            throw new InvalidParam('forward_compatible');
+        if (!$forward_compatible) {
+            $forward_compatible = "true";
+        }
+        if (!in_array($forward_compatible, array("true", "false"))) {
+                    throw new InvalidParam('forward_compatible');
+        }
         $forward_compatible = ($forward_compatible == "true");
 
         # Load the attributes (all of them).
@@ -133,8 +143,9 @@ 
                 continue;
             }
             $clean_row = array();
-            foreach ($fields as $field)
-                $clean_row[$field] = $attr_ref[$field];
+            foreach ($fields as $field) {
+                            $clean_row[$field] = $attr_ref[$field];
+            }
             $attr_ref = $clean_row;
         }
 

htdocs/okapi/services/attrs/attribute.php

Spacing +1 added lines, -1 removed lines

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

Braces +15 added lines, -5 removed lines

@@ -29,17 +29,27 @@
         # Read the parameters.
 
         $acode = $request->get_parameter('acode');
-        if ($acode === null) throw new ParamMissing('acode');
-        if (strstr($acode,'|')) throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        if ($acode === null) {
+            throw new ParamMissing('acode');
+        }
+        if (strstr($acode,'|')) {
+            throw new InvalidParam('acode', "Only a single A-code must be supplied.");
+        }
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "name";
+        if (!$fields) {
+            $fields = "name";
+        }
 
         $forward_compatible = $request->get_parameter('forward_compatible');
-        if (!$forward_compatible) $forward_compatible = "true";
+        if (!$forward_compatible) {
+            $forward_compatible = "true";
+        }
 
         # Pass them all to the attributes method.
 

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

Spacing +14 added lines, -14 removed lines

@@ -51,7 +51,7 @@ 
     {
         try
         {
-            $path = $GLOBALS['rootpath']."okapi/services/attrs/attribute-definitions.xml";
+            $path = $GLOBALS['rootpath'] . "okapi/services/attrs/attribute-definitions.xml";
             $xml = file_get_contents($path);
             self::refresh_from_string($xml);
         }
@@ -67,7 +67,7 @@ 
                 # That's bad! We don't have ANY copy of the data AND we failed
                 # to parse it. We will use a fake, empty data.
 
-                $cache_key = "attrhelper/dict#".Okapi::$git_revision.self::cache_key_suffix();
+                $cache_key = "attrhelper/dict#" . Okapi::$git_revision . self::cache_key_suffix();
                 $cachedvalue = array(
                     'attr_dict' => array(),
                 );
@@ -128,12 +128,12 @@ 
 
                     $internal_id = (int)$ocnode['id'];
                     if (isset($all_internal_ids[$internal_id]))
-                        throw new Exception("The internal attribute ".$internal_id.
+                        throw new Exception("The internal attribute " . $internal_id .
                             " has multiple assigments to OKAPI attributes.");
                     $all_internal_ids[$internal_id] = true;
                     if (!is_null($attr['internal_id']))
-                        throw new Exception("There are multiple internal IDs for the ".
-                            $attr['acode']." attribute.");
+                        throw new Exception("There are multiple internal IDs for the " .
+                            $attr['acode'] . " attribute.");
                     $attr['internal_id'] = $internal_id;
                 }
             }
@@ -143,13 +143,13 @@ 
                 foreach ($langnode->name as $namenode)
                 {
                     if (isset($attr['names'][$lang]))
-                        throw new Exception("Duplicate ".$lang." name of attribute ".$attr['acode']);
+                        throw new Exception("Duplicate " . $lang . " name of attribute " . $attr['acode']);
                     $attr['names'][$lang] = (string)$namenode;
                 }
                 foreach ($langnode->desc as $descnode)
                 {
                     if (isset($attr['descriptions'][$lang]))
-                        throw new Exception("Duplicate ".$lang." description of attribute ".$attr['acode']);
+                        throw new Exception("Duplicate " . $lang . " description of attribute " . $attr['acode']);
                     $xml = $descnode->asxml(); /* contains "<desc>" and "</desc>" */
                     $innerxml = preg_replace("/(^[^>]+>)|(<[^<]+$)/us", "", $xml);
                     $attr['descriptions'][$lang] = self::cleanup_string($innerxml);
@@ -158,7 +158,7 @@ 
             $cachedvalue['attr_dict'][$attr['acode']] = $attr;
         }
 
-        $cache_key = "attrhelper/dict#".Okapi::$git_revision.self::cache_key_suffix();
+        $cache_key = "attrhelper/dict#" . Okapi::$git_revision . self::cache_key_suffix();
         Cache::set($cache_key, $cachedvalue, self::ttl());
         self::$attr_dict = $cachedvalue['attr_dict'];
     }
@@ -177,9 +177,9 @@ 
             ),
             'descriptions' => array(
                 'en' => (
-                    "This attribute ($acode) is unknown at ".Okapi::get_normalized_site_name().
-                    ". It might not exist, or it may be a new attribute, recognized ".
-                    "only in newer OKAPI installations. Perhaps ".Okapi::get_normalized_site_name().
+                    "This attribute ($acode) is unknown at " . Okapi::get_normalized_site_name() .
+                    ". It might not exist, or it may be a new attribute, recognized " .
+                    "only in newer OKAPI installations. Perhaps " . Okapi::get_normalized_site_name() .
                     " needs to have its OKAPI updated?"
                 )
             ),
@@ -192,14 +192,14 @@ 
      * loads attribute values from the cache. If they are not present in the
      * cache, it will read and parse them from attribute-definitions.xml file.
      */
-    private static function init_from_cache($allow_refreshing=true)
+    private static function init_from_cache($allow_refreshing = true)
     {
         if (self::$attr_dict !== null)
         {
             /* Already initialized. */
             return;
         }
-        $cache_key = "attrhelper/dict#".Okapi::$git_revision.self::cache_key_suffix();
+        $cache_key = "attrhelper/dict#" . Okapi::$git_revision . self::cache_key_suffix();
         $cachedvalue = Cache::get($cache_key);
         if ($cachedvalue === null)
         {
@@ -247,7 +247,7 @@ 
         if ($mapping !== null)
             return $mapping;
 
-        $cache_key = "attrhelper/id2acode/".Okapi::$git_revision.self::cache_key_suffix();
+        $cache_key = "attrhelper/id2acode/" . Okapi::$git_revision . self::cache_key_suffix();
         $mapping = Cache::get($cache_key);
         if (!$mapping)
         {

Braces +23 added lines, -18 removed lines

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