OpencachingDeutschland / oc-server3

htdocs/okapi/services/caches/save_personal_notes.php

Spacing +24 added lines, -24 removed lines

@@ -85,7 +85,7 @@ 
 
             /* APPEND mode */
 
-            $ret_saved_value = trim($current_value)."\n\n".trim($new_value);
+            $ret_saved_value = trim($current_value) . "\n\n" . trim($new_value);
             self::update_notes($cache_id, $request->token->user_id, $ret_saved_value);
         }
 
@@ -123,11 +123,11 @@ 
                 from coordinates
                 where
                     type = 2  -- personal note
-                    and cache_id = '".Db::escape_string($cache_id)."'
-                    and user_id = '".Db::escape_string($user_id)."'
+                    and cache_id = '".Db::escape_string($cache_id) . "'
+                    and user_id = '".Db::escape_string($user_id) . "'
             ");
             $id = null;
-            if($row = Db::fetch_assoc($rs)) {
+            if ($row = Db::fetch_assoc($rs)) {
                 $id = $row['id'];
             }
             if ($id == null) {
@@ -137,17 +137,17 @@ 
                         description
                     ) values (
                         2, 0, 0,
-                        '".Db::escape_string($cache_id)."',
-                        '".Db::escape_string($user_id)."',
-                        '".Db::escape_string($new_notes)."'
+                        '".Db::escape_string($cache_id) . "',
+                        '".Db::escape_string($user_id) . "',
+                        '".Db::escape_string($new_notes) . "'
                     )
                 ");
             } else {
                 Db::query("
                     update coordinates
-                    set description = '".Db::escape_string($new_notes)."'
+                    set description = '".Db::escape_string($new_notes) . "'
                     where
-                        id = '".Db::escape_string($id)."'
+                        id = '".Db::escape_string($id) . "'
                         and type = 2
                 ");
             }
@@ -158,11 +158,11 @@ 
                 select max(note_id) as id
                 from cache_notes
                 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) . "'
             ");
             $id = null;
-            if($row = Db::fetch_assoc($rs)) {
+            if ($row = Db::fetch_assoc($rs)) {
                 $id = $row['id'];
             }
             if ($id == null) {
@@ -170,20 +170,20 @@ 
                     insert into cache_notes (
                         cache_id, user_id, date, desc_html, `desc`
                     ) values (
-                        '".Db::escape_string($cache_id)."',
-                        '".Db::escape_string($user_id)."',
+                        '".Db::escape_string($cache_id) . "',
+                        '".Db::escape_string($user_id) . "',
                         NOW(), 0,
-                        '".Db::escape_string($new_notes)."'
+                        '".Db::escape_string($new_notes) . "'
                     )
                 ");
             } else {
                 Db::query("
                     update cache_notes
                     set
-                        `desc` = '".Db::escape_string($new_notes)."',
+                        `desc` = '".Db::escape_string($new_notes) . "',
                         desc_html = 0,
                         date = NOW()
-                    where note_id = '".Db::escape_string($id)."'
+                    where note_id = '".Db::escape_string($id) . "'
                 ");
             }
         }
@@ -197,12 +197,12 @@ 
                 delete from coordinates
                 where
                     type = 2  -- personal note
-                    and cache_id = '".Db::escape_string($cache_id)."'
-                    and user_id = '".Db::escape_string($user_id)."'
+                    and cache_id = '".Db::escape_string($cache_id) . "'
+                    and user_id = '".Db::escape_string($user_id) . "'
                     and longitude = 0
                     and latitude = 0
             ");
-            if (Db::get_affected_row_count() <= 0){
+            if (Db::get_affected_row_count() <= 0) {
                 # no rows deleted - record either doesn't exist, or has coords
                 # remove only description
                 Db::execute("
@@ -210,16 +210,16 @@ 
                     set description = null
                     where
                         type = 2
-                        and cache_id = '".Db::escape_string($cache_id)."'
-                        and user_id = '".Db::escape_string($user_id)."'
+                        and cache_id = '".Db::escape_string($cache_id) . "'
+                        and user_id = '".Db::escape_string($user_id) . "'
                 ");
             }
         } else {  # oc.pl branch
             Db::execute("
                 delete from cache_notes
                 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) . "'
             ");
         }
     }

htdocs/okapi/services/caches/search/nearest.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
             throw new ParamMissing('center');
         $parts = explode('|', $tmp);
         if (count($parts) != 2)
-            throw new InvalidParam('center', "Expecting 2 pipe-separated parts, got ".count($parts).".");
+            throw new InvalidParam('center', "Expecting 2 pipe-separated parts, got " . count($parts) . ".");
         foreach ($parts as &$part_ref)
         {
             if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref))
@@ -70,27 +70,27 @@ 
         {
             if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $tmp))
                 throw new InvalidParam('radius', "'$tmp' is not a valid float number.");
-            $radius = floatval($tmp);  # is given in kilometers
+            $radius = floatval($tmp); # is given in kilometers
             if ($radius <= 0)
                 throw new InvalidParam('radius', "Has to be a positive number.");
 
             # Apply a latitude-range prefilter if it looks promising.
             # See https://github.com/opencaching/okapi/issues/363 for more info.
 
-            $optimization_radius = 100;  # in kilometers, optimized for Opencaching.de
+            $optimization_radius = 100; # in kilometers, optimized for Opencaching.de
             $km2degrees_upper_estimate_factor = 0.01;
 
             if ($radius <= $optimization_radius)
             {
                 $radius_degrees = $radius * $km2degrees_upper_estimate_factor;
                 $where_conds[] = "
-                    caches.latitude >= '".Db::escape_string($center_lat - $radius_degrees)."'
-                    and caches.latitude <= '".Db::escape_string($center_lat + $radius_degrees)."'
+                    caches.latitude >= '".Db::escape_string($center_lat - $radius_degrees) . "'
+                    and caches.latitude <= '".Db::escape_string($center_lat + $radius_degrees) . "'
                     ";
             }
 
-            $radius *= 1000;  # convert from kilometers to meters
-            $where_conds[] = "$distance_formula <= '".Db::escape_string($radius)."'";
+            $radius *= 1000; # convert from kilometers to meters
+            $where_conds[] = "$distance_formula <= '" . Db::escape_string($radius) . "'";
         }
 
         $search_params = $search_assistant->get_search_params();

htdocs/okapi/services/caches/search/save.php

Spacing +12 added lines, -12 removed lines

@@ -34,8 +34,8 @@ 
                 unix_timestamp(expires) as expires
             from okapi_search_sets
             where
-                params_hash = '".Db::escape_string($params_hash)."'
-                and date_add(date_created, interval '".Db::escape_string($ref_max_age)."' second) > now()
+                params_hash = '".Db::escape_string($params_hash) . "'
+                and date_add(date_created, interval '".Db::escape_string($ref_max_age) . "' second) > now()
             order by id desc
             limit 1
         ");
@@ -51,7 +51,7 @@ 
         $tmp = $request->get_parameter('min_store');
         if ($tmp === null) $tmp = "300";
         $min_store = intval($tmp);
-        if (("$min_store" !== $tmp) ||($min_store < 0) || ($min_store > 64800))
+        if (("$min_store" !== $tmp) || ($min_store < 0) || ($min_store > 64800))
             throw new InvalidParam('min_store', "Has to be in the 0..64800 range.");
 
         $tmp = $request->get_parameter('ref_max_age');
@@ -128,7 +128,7 @@ 
                         values (
                             'processing in progress',
                             now(),
-                            date_add(now(), interval '".Db::escape_string($min_store + 60)."' second)
+                            date_add(now(), interval '".Db::escape_string($min_store + 60) . "' second)
                         )
                     ");
                     $set_id = Db::last_insert_id();
@@ -137,12 +137,12 @@ 
                     Db::execute("
                         insert into okapi_search_results (set_id, cache_id)
                         select distinct
-                            '".Db::escape_string($set_id)."',
+                            '".Db::escape_string($set_id) . "',
                             caches.cache_id
                         from
-                            ".implode(", ", $tables)."
-                            ".implode(" ", $joins)."
-                        where (".implode(") and (", $where_conds).")
+                            ".implode(", ", $tables) . "
+                            ".implode(" ", $joins) . "
+                        where (".implode(") and (", $where_conds) . ")
                     ");
 
                     # Lock barrier, to make sure the data is visible by other
@@ -153,8 +153,8 @@ 
 
                     Db::execute("
                         update okapi_search_sets
-                        set params_hash = '".Db::escape_string($params_hash)."'
-                        where id = '".Db::escape_string($set_id)."'
+                        set params_hash = '".Db::escape_string($params_hash) . "'
+                        where id = '".Db::escape_string($set_id) . "'
                     ");
                 } else {
                     # Some other thread acquired the lock before us and it has
@@ -178,8 +178,8 @@ 
         {
             Db::execute("
                 update okapi_search_sets
-                set expires = date_add(now(), interval '".Db::escape_string($min_store + 60)."' second)
-                where id = '".Db::escape_string($set_id)."'
+                set expires = date_add(now(), interval '".Db::escape_string($min_store + 60) . "' second)
+                where id = '".Db::escape_string($set_id) . "'
             ");
         }
 

htdocs/okapi/services/caches/search/by_urls.php

Spacing +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
                 select cache_id, wp_oc
                 from caches
                 where
-                    cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_ids))."')
+                    cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_ids)) . "')
                     and status in (1,2,3)
             ");
             $dict = array();
@@ -145,7 +145,7 @@ 
                 select uuid, wp_oc
                 from caches
                 where
-                    uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $uuids))."')
+                    uuid in ('".implode("','", array_map('\okapi\Db::escape_string', $uuids)) . "')
                     and status in (1,2,3)
             ");
             $dict = array();

htdocs/okapi/services/caches/search/bbox.php

Spacing +7 added lines, -7 removed lines

@@ -34,7 +34,7 @@ 
             throw new ParamMissing('bbox');
         $parts = explode('|', $tmp);
         if (count($parts) != 4)
-            throw new InvalidParam('bbox', "Expecting 4 pipe-separated parts, got ".count($parts).".");
+            throw new InvalidParam('bbox', "Expecting 4 pipe-separated parts, got " . count($parts) . ".");
         foreach ($parts as &$part_ref)
         {
             if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref))
@@ -61,15 +61,15 @@ 
         $lat = $search_assistant->get_latitude_expr();
         $lon = $search_assistant->get_longitude_expr();
         $where_conds[] = "(
-            $lat >= '".Db::escape_string($bbsouth)."'
-            and $lat < '".Db::escape_string($bbnorth)."'
+            $lat >= '" . Db::escape_string($bbsouth) . "'
+            and $lat < '" . Db::escape_string($bbnorth) . "'
         )";
         if ($bbeast > $bbwest)
         {
             # Easy one.
             $where_conds[] = "(
-                $lon >= '".Db::escape_string($bbwest)."'
-                and $lon < '".Db::escape_string($bbeast)."'
+                $lon >= '" . Db::escape_string($bbwest) . "'
+                and $lon < '" . Db::escape_string($bbeast) . "'
             )";
         }
         else
@@ -77,8 +77,8 @@ 
             # We'll have to assume that this bbox goes through the 180-degree meridian.
             # For example, $bbwest = 179 and $bbeast = -179.
             $where_conds[] = "(
-                $lon >= '".Db::escape_string($bbwest)."'
-                or $lon < '".Db::escape_string($bbeast)."'
+                $lon >= '" . Db::escape_string($bbwest) . "'
+                or $lon < '" . Db::escape_string($bbeast) . "'
             )";
         }
 

htdocs/okapi/services/caches/search/searching.inc.php

Spacing +41 added lines, -41 removed lines

@@ -153,7 +153,7 @@ 
                 }
             }
             if (count($types) > 0)
-                $where_conds[] = "caches.type $operator ('".implode("','", array_map('\okapi\Db::escape_string', $types))."')";
+                $where_conds[] = "caches.type $operator ('" . implode("','", array_map('\okapi\Db::escape_string', $types)) . "')";
             else if ($operator == "in")
                 $where_conds[] = "false";
         }
@@ -183,7 +183,7 @@ 
                     throw new InvalidParam('size2', "'$name' is not a valid cache size.");
                 }
             }
-            $where_conds[] = "caches.size $operator ('".implode("','", array_map('\okapi\Db::escape_string', $types))."')";
+            $where_conds[] = "caches.size $operator ('" . implode("','", array_map('\okapi\Db::escape_string', $types)) . "')";
         }
 
         #
@@ -204,7 +204,7 @@ 
                 throw new InvalidParam('status', "'$name' is not a valid cache status.");
             }
         }
-        $where_conds[] = "caches.status in ('".implode("','", array_map('\okapi\Db::escape_string', $codes))."')";
+        $where_conds[] = "caches.status in ('" . implode("','", array_map('\okapi\Db::escape_string', $codes)) . "')";
 
         #
         # owner_uuid
@@ -230,7 +230,7 @@ 
             $user_ids = array();
             foreach ($users as $user)
                 $user_ids[] = $user['internal_id'];
-            $where_conds[] = "caches.user_id $operator ('".implode("','", array_map('\okapi\Db::escape_string', $user_ids))."')";
+            $where_conds[] = "caches.user_id $operator ('" . implode("','", array_map('\okapi\Db::escape_string', $user_ids)) . "')";
         }
 
         #
@@ -282,8 +282,8 @@ 
                             # 'other' size caches will NOT be included (user must use the
                             # 'size2' parameter to search these). 'nano' caches will be
                             # included whenever 'micro' caches are included ($min=1).
-                            $where_conds[] = "(caches.size between $min+1 and $max+1)".
-                                ($allow_null ? " or caches.size=7" : "").
+                            $where_conds[] = "(caches.size between $min+1 and $max+1)" .
+                                ($allow_null ? " or caches.size=7" : "") .
                                 (($min == 1) ? " or caches.size=8" : "");
                         }
                         break;
@@ -296,7 +296,7 @@ 
                                 $divisors = array(-999, -1.0, 0.1, 1.4, 2.2, 999);
                                 $min = $divisors[$min - 1];
                                 $max = $divisors[$max];
-                                $where_conds[] = "($X_SCORE >= $min and $X_SCORE < $max and $X_VOTES >= 3)".
+                                $where_conds[] = "($X_SCORE >= $min and $X_SCORE < $max and $X_VOTES >= 3)" .
                                     ($allow_null ? " or ($X_VOTES < 3)" : "");
                             }
                         }
@@ -324,12 +324,12 @@ 
                 if ($tmp > 100 || $tmp < 0)
                     throw new InvalidParam('min_rcmds', "'$tmp'");
                 $tmp = floatval($tmp) / 100.0;
-                $where_conds[] = "$X_TOPRATINGS >= $X_FOUNDS * '".Db::escape_string($tmp)."'";
+                $where_conds[] = "$X_TOPRATINGS >= $X_FOUNDS * '" . Db::escape_string($tmp) . "'";
                 $where_conds[] = "$X_FOUNDS > 0";
             }
             if (!is_numeric($tmp))
                 throw new InvalidParam('min_rcmds', "'$tmp'");
-            $where_conds[] = "$X_TOPRATINGS >= '".Db::escape_string($tmp)."'";
+            $where_conds[] = "$X_TOPRATINGS >= '" . Db::escape_string($tmp) . "'";
         }
 
         #
@@ -340,7 +340,7 @@ 
         {
             if (!is_numeric($tmp))
                 throw new InvalidParam('min_founds', "'$tmp'");
-            $where_conds[] = "$X_FOUNDS >= '".Db::escape_string($tmp)."'";
+            $where_conds[] = "$X_FOUNDS >= '" . Db::escape_string($tmp) . "'";
         }
 
         #
@@ -352,7 +352,7 @@ 
         {
             if (!is_numeric($tmp))
                 throw new InvalidParam('max_founds', "'$tmp'");
-            $where_conds[] = "$X_FOUNDS <= '".Db::escape_string($tmp)."'";
+            $where_conds[] = "$X_FOUNDS <= '" . Db::escape_string($tmp) . "'";
         }
 
         #
@@ -363,7 +363,7 @@ 
         {
             $timestamp = strtotime($tmp);
             if ($timestamp)
-                $where_conds[] = "unix_timestamp(caches.last_modified) > '".Db::escape_string($timestamp)."'";
+                $where_conds[] = "unix_timestamp(caches.last_modified) > '" . Db::escape_string($timestamp) . "'";
             else
                 throw new InvalidParam('modified_since', "'$tmp' is not in a valid format or is not a valid date.");
         }
@@ -382,7 +382,7 @@ 
             {
                 $found_cache_ids = self::get_found_cache_ids(array($this->request->token->user_id));
                 $operator = ($tmp == 'found_only') ? "in" : "not in";
-                $where_conds[] = "caches.cache_id $operator ('".implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids))."')";
+                $where_conds[] = "caches.cache_id $operator ('" . implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids)) . "')";
             }
         }
 
@@ -400,7 +400,7 @@ 
             }
             $internal_user_ids = array_map(create_function('$user', 'return $user["internal_id"];'), $users);
             $found_cache_ids = self::get_found_cache_ids($internal_user_ids);
-            $where_conds[] = "caches.cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids))."')";
+            $where_conds[] = "caches.cache_id in ('" . implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids)) . "')";
         }
 
         #
@@ -417,7 +417,7 @@ 
             }
             $internal_user_ids = array_map(create_function('$user', 'return $user["internal_id"];'), $users);
             $found_cache_ids = self::get_found_cache_ids($internal_user_ids);
-            $where_conds[] = "caches.cache_id not in ('".implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids))."')";
+            $where_conds[] = "caches.cache_id not in ('" . implode("','", array_map('\okapi\Db::escape_string', $found_cache_ids)) . "')";
         }
 
         #
@@ -435,7 +435,7 @@ 
                 $watched_cache_ids = Db::select_column("
                     select cache_id
                     from cache_watches
-                    where user_id = '".Db::escape_string($this->request->token->user_id)."'
+                    where user_id = '".Db::escape_string($this->request->token->user_id) . "'
                 ");
                 if (Settings::get('OC_BRANCH') == 'oc.de')
                 {
@@ -443,10 +443,10 @@ 
                         select cache_id
                         from cache_list_items cli, cache_list_watches clw
                         where cli.cache_list_id = clw.cache_list_id
-                        and clw.user_id = '".Db::escape_string($this->request->token->user_id)."'
+                        and clw.user_id = '".Db::escape_string($this->request->token->user_id) . "'
                     "));
                 }
-                $where_conds[] = "caches.cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', $watched_cache_ids))."')";
+                $where_conds[] = "caches.cache_id in ('" . implode("','", array_map('\okapi\Db::escape_string', $watched_cache_ids)) . "')";
             }
         }
 
@@ -485,10 +485,10 @@ 
             $ignored_cache_ids = Db::select_column("
                 select cache_id
                 from cache_ignore
-                where user_id = '".Db::escape_string($this->request->token->user_id)."'
+                where user_id = '".Db::escape_string($this->request->token->user_id) . "'
             ");
             $not = ($ignored_status == 'notignored_only' ? 'not' : '');
-            $where_conds[] = "caches.cache_id ".$not." in ('".implode("','", array_map('\okapi\Db::escape_string', $ignored_cache_ids))."')";
+            $where_conds[] = "caches.cache_id " . $not . " in ('" . implode("','", array_map('\okapi\Db::escape_string', $ignored_cache_ids)) . "')";
         }
 
         #
@@ -502,7 +502,7 @@ 
             if (!in_array($tmp, array('true', 'false')))
                 throw new InvalidParam('exclude_my_own', "'$tmp'");
             if ($tmp == 'true')
-                $where_conds[] = "caches.user_id != '".Db::escape_string($this->request->token->user_id)."'";
+                $where_conds[] = "caches.user_id != '" . Db::escape_string($this->request->token->user_id) . "'";
         }
 
         #
@@ -517,7 +517,7 @@ 
             if (strlen($tmp) > 100)
                 throw new InvalidParam('name', "Maximum length of 'name' parameter is 100 characters");
             $tmp = str_replace("*", "%", str_replace("%", "%%", $tmp));
-            $where_conds[] = "caches.name LIKE '".Db::escape_string($tmp)."'";
+            $where_conds[] = "caches.name LIKE '" . Db::escape_string($tmp) . "'";
         }
 
         #
@@ -580,9 +580,9 @@ 
                 $where_conds[] = "PowerTrail.id = powerTrail_caches.powerTrailId";
                 $where_conds[] = 'PowerTrail.status = 1';
                 if ($powertrail_ids) {
-                    $where_conds[] = "PowerTrail.id in ('".implode(
+                    $where_conds[] = "PowerTrail.id in ('" . implode(
                         "','", array_map('\okapi\Db::escape_string', explode("|", $powertrail_ids))
-                    )."')";
+                    ) . "')";
                 }
             } else {
                 $where_conds[] = "0=1";
@@ -601,13 +601,13 @@ 
             $exists = Db::select_value("
                 select 1
                 from okapi_search_sets
-                where id = '".Db::escape_string($tmp)."'
+                where id = '".Db::escape_string($tmp) . "'
             ");
             if (!$exists)
                 throw new InvalidParam('set_and', "Couldn't find a set by given ID.");
             $extra_tables[] = "okapi_search_results osr_and";
             $where_conds[] = "osr_and.cache_id = caches.cache_id";
-            $where_conds[] = "osr_and.set_id = '".Db::escape_string($tmp)."'";
+            $where_conds[] = "osr_and.set_id = '" . Db::escape_string($tmp) . "'";
         }
 
         #
@@ -682,8 +682,8 @@ 
         # To avoid join errors, put each of the $where_conds in extra paranthesis.
 
         $tmp = array();
-        foreach($where_conds as $cond)
-            $tmp[] = "(".$cond.")";
+        foreach ($where_conds as $cond)
+            $tmp[] = "(" . $cond . ")";
         $where_conds = $tmp;
         unset($tmp);
 
@@ -718,7 +718,7 @@ 
     public function get_common_search_result()
     {
         $tables = array_merge(
-            array('caches '.$this->search_params['caches_indexhint']),
+            array('caches ' . $this->search_params['caches_indexhint']),
             $this->search_params['extra_tables']
         );
         $where_conds = array_merge(
@@ -731,11 +731,11 @@ 
 
         $cache_codes = Db::select_column("
             select caches.wp_oc
-            from ".implode(", ", $tables)." ".
-            implode(" ", $this->search_params['extra_joins'])."
-            where ".implode(" and ", $where_conds)."
-            ".((count($this->search_params['order_by']) > 0) ? "order by ".implode(", ", $this->search_params['order_by']) : "")."
-            limit ".($this->search_params['offset']).", ".($this->search_params['limit'] + 1).";
+            from ".implode(", ", $tables) . " " .
+            implode(" ", $this->search_params['extra_joins']) . "
+            where ".implode(" and ", $where_conds) . "
+            ".((count($this->search_params['order_by']) > 0) ? "order by " . implode(", ", $this->search_params['order_by']) : "") . "
+            limit ".($this->search_params['offset']) . ", " . ($this->search_params['limit'] + 1) . ";
         ");
 
         if (count($cache_codes) > $this->search_params['limit'])
@@ -773,7 +773,7 @@ 
         # Make sure location_source has prefix alt_wpt:
         if ($location_source != 'default-coords' && strncmp($location_source, 'alt_wpt:', 8) != 0)
         {
-            throw new InvalidParam('location_source', '\''.$location_source.'\'');
+            throw new InvalidParam('location_source', '\'' . $location_source . '\'');
         }
 
         # Make sure we have sufficient authorization
@@ -800,7 +800,7 @@ 
                 $extra_joins = array("
                     left join cache_mod_cords
                         on cache_mod_cords.cache_id = caches.cache_id
-                        and cache_mod_cords.user_id = '".Db::escape_string($this->request->token->user_id)."'
+                        and cache_mod_cords.user_id = '".Db::escape_string($this->request->token->user_id) . "'
                 ");
             } else {
                 # oc.de
@@ -809,7 +809,7 @@ 
                 $extra_joins = array("
                     left join coordinates
                         on coordinates.cache_id = caches.cache_id
-                        and coordinates.user_id = '".Db::escape_string($this->request->token->user_id)."'
+                        and coordinates.user_id = '".Db::escape_string($this->request->token->user_id) . "'
                         and coordinates.type = 2
                         and coordinates.longitude != 0
                         and coordinates.latitude != 0
@@ -855,12 +855,12 @@ 
             select cache_id
             from cache_logs
             where
-                user_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_user_ids))."')
+                user_id in ('".implode("','", array_map('\okapi\Db::escape_string', $internal_user_ids)) . "')
                 and type in (
-                    '".Db::escape_string(Okapi::logtypename2id("Found it"))."',
-                    '".Db::escape_string(Okapi::logtypename2id("Attended"))."'
+                    '".Db::escape_string(Okapi::logtypename2id("Found it")) . "',
+                    '".Db::escape_string(Okapi::logtypename2id("Attended")) . "'
                 )
-                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
+                and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
         ");
     }
 }

htdocs/okapi/services/caches/shortcuts/search_and_retrieve.php

Spacing +5 added lines, -5 removed lines

@@ -68,8 +68,8 @@ 
         }
         catch (BadRequest $e)
         {
-            throw new InvalidParam('search_params', "Search method responded with the ".
-                "following error message: ".$e->getMessage());
+            throw new InvalidParam('search_params', "Search method responded with the " .
+                "following error message: " . $e->getMessage());
         }
 
         # Run retrieval method
@@ -81,8 +81,8 @@ 
         }
         catch (BadRequest $e)
         {
-            throw new InvalidParam('retr_params', "Retrieval method responded with the ".
-                "following error message: ".$e->getMessage());
+            throw new InvalidParam('retr_params', "Retrieval method responded with the " .
+                "following error message: " . $e->getMessage());
         }
 
         if ($wrap)
@@ -115,7 +115,7 @@ 
             if (is_numeric($val) || is_string($val))
                 $dict[$key] = (string)$val;
             else
-                throw new BadRequest("Invalid value format for key: ".$key);
+                throw new BadRequest("Invalid value format for key: " . $key);
         }
     }
 }

htdocs/okapi/services/caches/mark.php

Spacing +8 added lines, -8 removed lines

@@ -46,16 +46,16 @@ 
                 Db::execute("
                     insert ignore into cache_watches (cache_id, user_id)
                     values (
-                        '".Db::escape_string($geocache['internal_id'])."',
-                        '".Db::escape_string($request->token->user_id)."'
+                        '".Db::escape_string($geocache['internal_id']) . "',
+                        '".Db::escape_string($request->token->user_id) . "'
                     );
                 ");
             elseif ($tmp == 'false')
                 Db::execute("
                     delete from cache_watches
                     where
-                        cache_id = '".Db::escape_string($geocache['internal_id'])."'
-                        and user_id = '".Db::escape_string($request->token->user_id)."';
+                        cache_id = '".Db::escape_string($geocache['internal_id']) . "'
+                        and user_id = '".Db::escape_string($request->token->user_id) . "';
                 ");
         }
 
@@ -69,16 +69,16 @@ 
                 Db::execute("
                     insert ignore into cache_ignore (cache_id, user_id)
                     values (
-                        '".Db::escape_string($geocache['internal_id'])."',
-                        '".Db::escape_string($request->token->user_id)."'
+                        '".Db::escape_string($geocache['internal_id']) . "',
+                        '".Db::escape_string($request->token->user_id) . "'
                     );
                 ");
             elseif ($tmp == 'false')
                 Db::execute("
                     delete from cache_ignore
                     where
-                        cache_id = '".Db::escape_string($geocache['internal_id'])."'
-                        and user_id = '".Db::escape_string($request->token->user_id)."'
+                        cache_id = '".Db::escape_string($geocache['internal_id']) . "'
+                        and user_id = '".Db::escape_string($request->token->user_id) . "'
                 ");
         }
 

htdocs/okapi/services/apiref/issue.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         if ((!preg_match("/^[0-9]+$/", $issue_id)) || (strlen($issue_id) > 6))
             throw new InvalidParam('issue_id');
 
-        $cache_key = "apiref/issue#".$issue_id;
+        $cache_key = "apiref/issue#" . $issue_id;
         $result = Cache::get($cache_key);
         if ($result == null)
         {
@@ -43,7 +43,7 @@ 
                 $extra_headers[] = "Accept: application/vnd.github.v3.html+json";
                 $extra_headers[] = "User-Agent: https://github.com/opencaching/okapi/";
                 if (Settings::get('GITHUB_ACCESS_TOKEN')) {
-                    $extra_headers[] = "Authorization: token ".Settings::get('GITHUB_ACCESS_TOKEN');
+                    $extra_headers[] = "Authorization: token " . Settings::get('GITHUB_ACCESS_TOKEN');
                 }
                 $opts = array(
                     'http' => array(
@@ -58,8 +58,8 @@ 
             }
             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 ".
+                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.");
             }