OpencachingDeutschland / oc-server3

htdocs/okapi/services/users/by_username.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         # Catch pipe chars here, because services/users/by_usernames would split up the name.
         # OC databases do not contain user names with pipe chars.
 
-        if (strstr($username,'|'))
+        if (strstr($username, '|'))
             throw new InvalidParam('username', "There is no user by this username.");
         $fields = $request->get_parameter('fields');
 

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))

htdocs/okapi/services/users/users.php

Spacing +10 added lines, -10 removed lines

@@ -31,8 +31,8 @@ 
         if (!$user_uuids) throw new ParamMissing('user_uuids');
         $user_uuids = explode("|", $user_uuids);
         if (count($user_uuids) > 500)
-            throw new InvalidParam('user_uuids', "Maximum allowed number of referenced users ".
-                "is 500. You provided ".count($user_uuids)." user IDs.");
+            throw new InvalidParam('user_uuids', "Maximum allowed number of referenced users " .
+                "is 500. You provided " . count($user_uuids) . " user IDs.");
         $fields = $request->get_parameter('fields');
         if (!$fields)
             throw new ParamMissing('fields');
@@ -43,7 +43,7 @@ 
         $rs = Db::query("
             select user_id, uuid, username, admin, latitude, longitude, date_created
             from user
-            where uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $user_uuids))."')
+            where uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $user_uuids)) . "')
         ");
         $results = array();
         $id2uuid = array();
@@ -59,7 +59,7 @@ 
                 {
                     case 'uuid': $entry['uuid'] = $row['uuid']; break;
                     case 'username': $entry['username'] = $row['username']; break;
-                    case 'profile_url': $entry['profile_url'] = Settings::get('SITE_URL')."viewprofile.php?userid=".$row['user_id']; break;
+                    case 'profile_url': $entry['profile_url'] = Settings::get('SITE_URL') . "viewprofile.php?userid=" . $row['user_id']; break;
                     case 'is_admin':
                         if (!$request->token) {
                             $entry['is_admin'] = null;
@@ -86,10 +86,10 @@ 
                             # does not make sense.
                             $entry['home_location'] = null;
                         } else {
-                            $entry['home_location'] = round($row['latitude'], 6)."|".round($row['longitude'], 6);
+                            $entry['home_location'] = round($row['latitude'], 6) . "|" . round($row['longitude'], 6);
                         }
                         break;
-                    default: throw new Exception("Missing field case: ".$field);
+                    default: throw new Exception("Missing field case: " . $field);
                 }
             }
             $results[$row['uuid']] = $entry;
@@ -113,7 +113,7 @@ 
                 $rs = Db::query("
                     select user_id, founds_count, notfounds_count, hidden_count
                     from user
-                    where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid)))."')
+                    where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid))) . "')
                 ");
             }
             else
@@ -130,13 +130,13 @@ 
                         user u
                         left join stat_user su
                             on su.user_id = u.user_id
-                    where u.user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid)))."')
+                    where u.user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid))) . "')
                 ");
             }
 
             while ($row = Db::fetch_assoc($rs))
             {
-                $extras[$row['user_id']] = array();;
+                $extras[$row['user_id']] = array(); ;
                 $extra_ref = &$extras[$row['user_id']];
                 $extra_ref['caches_found'] = 0 + $row['founds_count'];
                 $extra_ref['caches_notfound'] = 0 + $row['notfounds_count'];
@@ -149,7 +149,7 @@ 
                 $rs = Db::query("
                     select user_id, count(*) as rcmds_given
                     from cache_rating
-                    where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid)))."')
+                    where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($id2uuid))) . "')
                     group by user_id
                 ");
                 $rcmds_counts = array();

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);
     }
 }

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;
                 }

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";

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)
         {

htdocs/okapi/services/apisrv/stats.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                         from cache_logs
                         where
                             type in (1,2,7)
-                            and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
+                            and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
                         UNION DISTINCT
                         select distinct user_id
                         from caches