OpencachingDeutschland / oc-server3

htdocs/okapi/core.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 use ArrayObject;
 use okapi\oauth\OAuthServerException;
 use okapi\oauth\OAuthServer400Exception;
-use okapi\oauth\OAuthServer401Exception;
 use okapi\oauth\OAuthMissingParameterException;
 use okapi\oauth\OAuthConsumer;
 use okapi\oauth\OAuthToken;

Braces +351 added lines, -253 removed lines

@@ -29,14 +29,15 @@ 
     {
         try
         {
-            foreach (Settings::get('ADMINS') as $email)
-                if (!in_array($email, $emails))
+            foreach (Settings::get('ADMINS') as $email) {
+                            if (!in_array($email, $emails))
                     $emails[] = $email;
-        }
-        catch (Exception $e) { /* pass */ }
+            }
+        } catch (Exception $e) { /* pass */ }
+    }
+    if (count($emails) == 0) {
+            $emails[] = 'root@localhost';
     }
-    if (count($emails) == 0)
-        $emails[] = 'root@localhost';
     return $emails;
 }
 
@@ -81,16 +82,16 @@ 
             # of this exception. All of them result in HTTP 400 or HTTP 401 error
             # code. See also: http://oauth.net/core/1.0a/#http_codes
 
-            if ($e instanceof OAuthServer400Exception)
-                header("HTTP/1.0 400 Bad Request");
-            else
-                header("HTTP/1.0 401 Unauthorized");
+            if ($e instanceof OAuthServer400Exception) {
+                            header("HTTP/1.0 400 Bad Request");
+            } else {
+                            header("HTTP/1.0 401 Unauthorized");
+            }
             header("Access-Control-Allow-Origin: *");
             header("Content-Type: application/json; charset=utf-8");
 
             print $e->getOkapiJSON();
-        }
-        elseif ($e instanceof BadRequest)
+        } elseif ($e instanceof BadRequest)
         {
             # Intentionally thrown from within the OKAPI method code.
             # Consumer (aka external developer) had something wrong with his
@@ -105,8 +106,7 @@ 
             }
 
             print $e->getOkapiJSON();
-        }
-        else # (ErrorException, MySQL exception etc.)
+        } else # (ErrorException, MySQL exception etc.)
         {
             # This one is thrown on PHP notices and warnings - usually this
             # indicates an error in OKAPI method. If thrown, then something
@@ -137,8 +137,7 @@ 
             {
                 # Sending emails was blocked on admin's demand.
                 # This is possible only on development environment.
-            }
-            else
+            } else
             {
                 $subject = "OKAPI Method Error - ".substr(
                     $_SERVER['REQUEST_URI'], 0, strpos(
@@ -153,16 +152,16 @@ 
                 try
                 {
                     Okapi::mail_admins($subject, $message);
-                }
-                catch (Exception $e)
+                } catch (Exception $e)
                 {
                     # Unable to use full-featured mail_admins version. We'll use a backup.
                     # We need to make sure we're not spamming.
 
                     $lock_file = "/tmp/okapi-fatal-error-mode";
                     $last_email = false;
-                    if (file_exists($lock_file))
-                        $last_email = filemtime($lock_file);
+                    if (file_exists($lock_file)) {
+                                            $last_email = filemtime($lock_file);
+                    }
                     if ($last_email === false) {
                         # Assume this is the first email.
                         $last_email = 0;
@@ -219,8 +218,7 @@ 
             # the file and line.
 
             $exception_info .= "File: ".$e->getFile()."\nLine: ".$e->getLine()."\n\n";
-        }
-        else
+        } else
         {
             $exception_info .= "--- Stack trace ---\n".
                 self::removeSensitiveData($e->getTraceAsString())."\n\n";
@@ -254,7 +252,9 @@ 
     /** Handle error encountered while executing OKAPI request. */
     public static function handle($severity, $message, $filename, $lineno)
     {
-        if ($severity == E_STRICT || $severity == E_DEPRECATED) return false;
+        if ($severity == E_STRICT || $severity == E_DEPRECATED) {
+            return false;
+        }
         if (($severity == E_NOTICE) && !self::$treat_notices_as_errors) {
             return false;
         }
@@ -340,10 +340,11 @@ 
     {
         $this->paramName = $paramName;
         $this->whats_wrong_about_it = $whats_wrong_about_it;
-        if ($whats_wrong_about_it)
-            parent::__construct("Parameter '$paramName' has invalid value: ".$whats_wrong_about_it, $code);
-        else
-            parent::__construct("Parameter '$paramName' has invalid value.", $code);
+        if ($whats_wrong_about_it) {
+                    parent::__construct("Parameter '$paramName' has invalid value: ".$whats_wrong_about_it, $code);
+        } else {
+                    parent::__construct("Parameter '$paramName' has invalid value.", $code);
+        }
     }
 }
 
@@ -369,9 +370,9 @@ 
             mysql_select_db(Settings::get('DB_NAME'));
             mysql_query("set names '" . Settings::get('DB_CHARSET') . "'");
             self::$connected = true;
+        } else {
+                    throw new Exception("Could not connect to MySQL: ".mysql_error());
         }
-        else
-            throw new Exception("Could not connect to MySQL: ".mysql_error());
     }
 
     /** Fetch [{row}], return {row}. */
@@ -402,12 +403,14 @@ 
         while (true)
         {
             $row = Db::fetch_assoc($rs);
-            if ($row === false)
-                break;
-            if ($keyField == null)
-                $arr[] = $row;
-            else
-                $arr[$row[$keyField]] = $row;
+            if ($row === false) {
+                            break;
+            }
+            if ($keyField == null) {
+                            $arr[] = $row;
+            } else {
+                            $arr[$row[$keyField]] = $row;
+            }
         }
         Db::free_result($rs);
     }
@@ -420,8 +423,9 @@ 
         while (true)
         {
             $row = Db::fetch_assoc($rs);
-            if ($row === false)
-                break;
+            if ($row === false) {
+                            break;
+            }
             $groups[$row[$keyField]][] = $row;
         }
         Db::free_result($rs);
@@ -432,10 +436,12 @@ 
     public static function select_value($query)
     {
         $column = self::select_column($query);
-        if ($column == null)
-            return null;
-        if (count($column) == 1)
-            return $column[0];
+        if ($column == null) {
+                    return null;
+        }
+        if (count($column) == 1) {
+                    return $column[0];
+        }
         throw new DbException("Invalid query. Db::select_value returned more than one row for:\n\n".$query."\n");
     }
 
@@ -447,8 +453,9 @@ 
         while (true)
         {
             $values = Db::fetch_row($rs);
-            if ($values === false)
-                break;
+            if ($values === false) {
+                            break;
+            }
             array_push($column, $values[0]);
         }
         Db::free_result($rs);
@@ -488,15 +495,17 @@ 
     public static function execute($query)
     {
         $rs = self::query($query);
-        if ($rs !== true)
-            throw new DbException("Db::execute returned a result set for your query. ".
+        if ($rs !== true) {
+                    throw new DbException("Db::execute returned a result set for your query. ".
                 "You should use Db::select_* or Db::query for SELECT queries!");
+        }
     }
 
     public static function query($query)
     {
-        if (!self::$connected)
-            self::connect();
+        if (!self::$connected) {
+                    self::connect();
+        }
         $rs = mysql_query($query);
         if (!$rs)
         {
@@ -555,8 +564,9 @@ 
 
     public static function field_exists($table, $field)
     {
-        if (!preg_match("/[a-z0-9_]+/", $table.$field))
-            return false;
+        if (!preg_match("/[a-z0-9_]+/", $table.$field)) {
+                    return false;
+        }
         try {
             $spec = self::select_all("desc ".$table.";");
         } catch (Exception $e) {
@@ -564,8 +574,9 @@ 
             return false;
         }
         foreach ($spec as &$row_ref) {
-            if (strtoupper($row_ref['Field']) == strtoupper($field))
-                return true;
+            if (strtoupper($row_ref['Field']) == strtoupper($field)) {
+                            return true;
+            }
         }
         return false;
     }
@@ -765,10 +776,11 @@ 
         } catch (OAuthMissingParameterException $e) {
             # Note, that exception will be different if token is supplied
             # and is invalid. We catch only a completely MISSING token parameter.
-            if (($e->getParamName() == 'oauth_token') && (!$token_required))
-                $token = null;
-            else
-                throw $e;
+            if (($e->getParamName() == 'oauth_token') && (!$token_required)) {
+                            $token = null;
+            } else {
+                            throw $e;
+            }
         }
         $this->check_signature($request, $consumer, $token);
         return array($consumer, $token);
@@ -798,8 +810,9 @@ 
 
     public function get_length()
     {
-        if (is_resource($this->body))
-            return $this->stream_length;
+        if (is_resource($this->body)) {
+                    return $this->stream_length;
+        }
         return strlen($this->body);
     }
 
@@ -808,11 +821,12 @@ 
     {
         if (is_resource($this->body))
         {
-            while (!feof($this->body))
-                print fread($this->body, 1024*1024);
+            while (!feof($this->body)) {
+                            print fread($this->body, 1024*1024);
+            }
+        } else {
+                    print $this->body;
         }
-        else
-            print $this->body;
     }
 
     /**
@@ -826,9 +840,9 @@ 
             ob_start();
             fpassthru($this->body);
             return ob_get_clean();
+        } else {
+                    return $this->body;
         }
-        else
-            return $this->body;
     }
 
     /**
@@ -840,17 +854,21 @@ 
         header("Access-Control-Allow-Origin: *");
         header("Content-Type: ".$this->content_type);
         header("Cache-Control: ".$this->cache_control);
-        if ($this->connection_close)
-            header("Connection: close");
-        if ($this->content_disposition)
-            header("Content-Disposition: ".$this->content_disposition);
-        if ($this->etag)
-            header("ETag: $this->etag");
+        if ($this->connection_close) {
+                    header("Connection: close");
+        }
+        if ($this->content_disposition) {
+                    header("Content-Disposition: ".$this->content_disposition);
+        }
+        if ($this->etag) {
+                    header("ETag: $this->etag");
+        }
 
         # Make sure that gzip is supported by the client.
         $use_gzip = $this->allow_gzip;
-        if (empty($_SERVER["HTTP_ACCEPT_ENCODING"]) || (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") === false))
-            $use_gzip = false;
+        if (empty($_SERVER["HTTP_ACCEPT_ENCODING"]) || (strpos($_SERVER["HTTP_ACCEPT_ENCODING"], "gzip") === false)) {
+                    $use_gzip = false;
+        }
 
         # We will gzip the data ourselves, while disabling gziping by Apache. This way, we can
         # set the Content-Length correctly which is handy in some scenarios.
@@ -863,8 +881,7 @@ 
             $gzipped = gzencode($this->body, 5);
             header("Content-Length: ".strlen($gzipped));
             print $gzipped;
-        }
-        else
+        } else
         {
             # We don't want Apache to gzip this response. Tell it so.
 
@@ -873,8 +890,9 @@ 
             }
 
             $length = $this->get_length();
-            if ($length)
-                header("Content-Length: ".$length);
+            if ($length) {
+                            header("Content-Length: ".$length);
+            }
             $this->print_body();
         }
     }
@@ -954,8 +972,7 @@ 
             # Using semaphores is forbidden on this server by its admin.
             # This is possible only on development environment.
             $this->lock = null;
-        }
-        else
+        } else
         {
             $this->lockfile = Okapi::get_var_dir()."/okapi-lock-".$name;
             $this->lock = fopen($this->lockfile, "wb");
@@ -964,22 +981,26 @@ 
 
     public function acquire()
     {
-        if ($this->lock !== null)
-            flock($this->lock, LOCK_EX);
+        if ($this->lock !== null) {
+                    flock($this->lock, LOCK_EX);
+        }
     }
 
     public function try_acquire()
     {
-        if ($this->lock !== null)
-            return flock($this->lock, LOCK_EX | LOCK_NB);
-        else
-            return true;  # $lock can be null only when debugging
+        if ($this->lock !== null) {
+                    return flock($this->lock, LOCK_EX | LOCK_NB);
+        } else {
+                    return true;
+        }
+        # $lock can be null only when debugging
     }
 
     public function release()
     {
-        if ($this->lock !== null)
-            flock($this->lock, LOCK_UN);
+        if ($this->lock !== null) {
+                    flock($this->lock, LOCK_UN);
+        }
     }
 
     /**
@@ -1040,11 +1061,13 @@ 
                 from okapi_vars
             ");
             self::$okapi_vars = array();
-            while ($row = Db::fetch_assoc($rs))
-                self::$okapi_vars[$row['var']] = $row['value'];
+            while ($row = Db::fetch_assoc($rs)) {
+                            self::$okapi_vars[$row['var']] = $row['value'];
+            }
+        }
+        if (isset(self::$okapi_vars[$varname])) {
+                    return self::$okapi_vars[$varname];
         }
-        if (isset(self::$okapi_vars[$varname]))
-            return self::$okapi_vars[$varname];
         return $default;
     }
 
@@ -1100,8 +1123,9 @@ 
 
             return;
         }
-        if ($counter === null)
-            $counter = 0;
+        if ($counter === null) {
+                    $counter = 0;
+        }
         $counter++;
         try {
             Cache::set($cache_key, $counter, 3600);
@@ -1114,8 +1138,7 @@ 
             # We're not spamming yet.
 
             self::mail_from_okapi(get_admin_emails(), $subject, $message);
-        }
-        else
+        } else
         {
             # We are spamming. Prevent sending more emails.
 
@@ -1148,8 +1171,9 @@ 
             # This is possible only on development environment.
             return;
         }
-        if (!is_array($email_addresses))
-            $email_addresses = array($email_addresses);
+        if (!is_array($email_addresses)) {
+                    $email_addresses = array($email_addresses);
+        }
         $sender_email = class_exists("okapi\\Settings") ? Settings::get('FROM_FIELD') : 'root@localhost';
         mail(implode(", ", $email_addresses), $subject, $message,
             "Content-Type: text/plain; charset=utf-8\n".
@@ -1162,16 +1186,18 @@ 
     public static function get_var_dir()
     {
         $dir = Settings::get('VAR_DIR');
-        if ($dir != null)
-            return rtrim($dir, "/");
+        if ($dir != null) {
+                    return rtrim($dir, "/");
+        }
         throw new Exception("You need to set a valid VAR_DIR.");
     }
 
     /** Returns something like "Opencaching.PL" or "Opencaching.DE". */
     public static function get_normalized_site_name($site_url = null)
     {
-        if ($site_url == null)
-            $site_url = Settings::get('SITE_URL');
+        if ($site_url == null) {
+                    $site_url = Settings::get('SITE_URL');
+        }
         $matches = null;
         if (preg_match("#^https?://(www.)?opencaching.([a-z.]+)/$#", $site_url, $matches)) {
             return "Opencaching.".strtoupper($matches[2]);
@@ -1320,11 +1346,13 @@ 
      */
     public static function pick_best_language($langdict, $langprefs)
     {
-        foreach ($langprefs as $pref)
-            if (isset($langdict[$pref]))
+        foreach ($langprefs as $pref) {
+                    if (isset($langdict[$pref]))
                 return $langdict[$pref];
-        foreach ($langdict as &$text_ref)
-            return $text_ref;
+        }
+        foreach ($langdict as &$text_ref) {
+                    return $text_ref;
+        }
         return "";
     }
 
@@ -1405,8 +1433,9 @@ 
     {
         # Put the langprefs on the stack.
 
-        if ($langprefs == null)
-            $langprefs = array(Settings::get('SITELANG'));
+        if ($langprefs == null) {
+                    $langprefs = array(Settings::get('SITELANG'));
+        }
         self::$gettext_langprefs_stack[] = $langprefs;
 
         if (count(self::$gettext_langprefs_stack) == 1)
@@ -1438,8 +1467,7 @@ 
         {
             $langprefs = self::$gettext_langprefs_stack[$size - 1];
             self::gettext_set_lang($langprefs);
-        }
-        else
+        } else
         {
             # The stack is empty. This means we're going out of OKAPI code and
             # we want the original textdomain reestablished.
@@ -1455,20 +1483,25 @@ 
     public static function init_internals($allow_cronjobs = true)
     {
         static $init_made = false;
-        if ($init_made)
-            return;
+        if ($init_made) {
+                    return;
+        }
         ini_set('memory_limit', '256M');
         # The memory limit is - among other - crucial for the maximum size
         # of processable images; see services/logs/images/add.php: max_pixels()
         Db::connect();
-        if (Settings::get('TIMEZONE') !== null)
-            date_default_timezone_set(Settings::get('TIMEZONE'));
-        if (!self::$data_store)
-            self::$data_store = new OkapiDataStore();
-        if (!self::$server)
-            self::$server = new OkapiOAuthServer(self::$data_store);
-        if ($allow_cronjobs)
-            self::execute_prerequest_cronjobs();
+        if (Settings::get('TIMEZONE') !== null) {
+                    date_default_timezone_set(Settings::get('TIMEZONE'));
+        }
+        if (!self::$data_store) {
+                    self::$data_store = new OkapiDataStore();
+        }
+        if (!self::$server) {
+                    self::$server = new OkapiOAuthServer(self::$data_store);
+        }
+        if ($allow_cronjobs) {
+                    self::execute_prerequest_cronjobs();
+        }
         $init_made = true;
     }
 
@@ -1479,10 +1512,11 @@ 
      */
     public static function generate_key($length, $user_friendly = false)
     {
-        if ($user_friendly)
-            $chars = "0123456789";
-        else
-            $chars = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+        if ($user_friendly) {
+                    $chars = "0123456789";
+        } else {
+                    $chars = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+        }
         $max = strlen($chars);
         $key = "";
         for ($i=0; $i<$length; $i++)
@@ -1504,10 +1538,11 @@ 
             $appname, $appurl, $email);
         $sample_cache = OkapiServiceRunner::call("services/caches/search/all",
             new OkapiInternalRequest($consumer, null, array('limit', 1)));
-        if (count($sample_cache['results']) > 0)
-            $sample_cache_code = $sample_cache['results'][0];
-        else
-            $sample_cache_code = "CACHECODE";
+        if (count($sample_cache['results']) > 0) {
+                    $sample_cache_code = $sample_cache['results'][0];
+        } else {
+                    $sample_cache_code = "CACHECODE";
+        }
 
         # Message for the Consumer.
         ob_start();
@@ -1558,7 +1593,9 @@ 
         # to floating point precision limits. See issue #351 for details.
         #
         $d = acos(min(1, cos($x1) * cos($x2) + sin($x1) * sin($x2) * cos(($lon1-$lon2) * 3.14159 / 180))) * 6371000;
-        if ($d < 0) $d = 0;
+        if ($d < 0) {
+            $d = 0;
+        }
         return $d;
     }
 
@@ -1581,10 +1618,15 @@ 
     /** Return bearing (float 0..360) from geopoint 1 to 2. */
     public static function get_bearing($lat1, $lon1, $lat2, $lon2)
     {
-        if ($lat1 == $lat2 && $lon1 == $lon2)
-            return null;
-        if ($lat1 == $lat2) $lat1 += 0.0000166;
-        if ($lon1 == $lon2) $lon1 += 0.0000166;
+        if ($lat1 == $lat2 && $lon1 == $lon2) {
+                    return null;
+        }
+        if ($lat1 == $lat2) {
+            $lat1 += 0.0000166;
+        }
+        if ($lon1 == $lon2) {
+            $lon1 += 0.0000166;
+        }
 
         $rad_lat1 = $lat1 / 180.0 * 3.14159;
         $rad_lon1 = $lon1 / 180.0 * 3.14159;
@@ -1595,7 +1637,9 @@ 
         $bearing = atan2(sin($delta_lon) * cos($rad_lat2),
             cos($rad_lat1) * sin($rad_lat2) - sin($rad_lat1) * cos($rad_lat2) * cos($delta_lon));
         $bearing = 180.0 * $bearing / 3.14159;
-        if ( $bearing < 0.0 ) $bearing = $bearing + 360.0;
+        if ( $bearing < 0.0 ) {
+            $bearing = $bearing + 360.0;
+        }
 
         return $bearing;
     }
@@ -1604,7 +1648,9 @@ 
     public static function bearing_as_two_letters($b)
     {
         static $names = array('N', 'NE', 'E', 'SE', 'S', 'SW', 'W', 'NW');
-        if ($b === null) return 'n/a';
+        if ($b === null) {
+            return 'n/a';
+        }
         return $names[round(($b / 360.0) * 8.0) % 8];
     }
 
@@ -1613,7 +1659,9 @@ 
     {
         static $names = array('N', 'NNE', 'NE', 'ENE', 'E', 'ESE', 'SE', 'SSE',
             'S', 'SSW', 'SW', 'WSW', 'W', 'WNW', 'NW', 'NNW');
-        if ($b === null) return 'n/a';
+        if ($b === null) {
+            return 'n/a';
+        }
         return $names[round(($b / 360.0) * 16.0) % 16];
     }
 
@@ -1641,46 +1689,48 @@ 
             return $object;
         }
         $format = $request->get_parameter('format');
-        if ($format == null) $format = 'json';
-        if (!in_array($format, array('json', 'jsonp', 'xmlmap', 'xmlmap2')))
-            throw new InvalidParam('format', "'$format'");
+        if ($format == null) {
+            $format = 'json';
+        }
+        if (!in_array($format, array('json', 'jsonp', 'xmlmap', 'xmlmap2'))) {
+                    throw new InvalidParam('format', "'$format'");
+        }
         $callback = $request->get_parameter('callback');
-        if ($callback && $format != 'jsonp')
-            throw new BadRequest("The 'callback' parameter is reserved to be used with the JSONP output format.");
+        if ($callback && $format != 'jsonp') {
+                    throw new BadRequest("The 'callback' parameter is reserved to be used with the JSONP output format.");
+        }
         if ($format == 'json')
         {
             $response = new OkapiHttpResponse();
             $response->content_type = "application/json; charset=utf-8";
             $response->body = json_encode($object);
             return $response;
-        }
-        elseif ($format == 'jsonp')
+        } elseif ($format == 'jsonp')
         {
-            if (!$callback)
-                throw new BadRequest("'callback' parameter is required for JSONP calls");
-            if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $callback))
-                throw new InvalidParam('callback', "'$callback' doesn't seem to be a valid JavaScript function name (should match /^[a-zA-Z_][a-zA-Z0-9_]*\$/).");
+            if (!$callback) {
+                            throw new BadRequest("'callback' parameter is required for JSONP calls");
+            }
+            if (!preg_match("/^[a-zA-Z_][a-zA-Z0-9_]*$/", $callback)) {
+                            throw new InvalidParam('callback', "'$callback' doesn't seem to be a valid JavaScript function name (should match /^[a-zA-Z_][a-zA-Z0-9_]*\$/).");
+            }
             $response = new OkapiHttpResponse();
             $response->content_type = "application/javascript; charset=utf-8";
             $response->body = $callback."(".json_encode($object).");";
             return $response;
-        }
-        elseif ($format == 'xmlmap')
+        } elseif ($format == 'xmlmap')
         {
             # Deprecated (see issue 128). Keeping this for backward-compatibility.
             $response = new OkapiHttpResponse();
             $response->content_type = "text/xml; charset=utf-8";
             $response->body = self::xmlmap_dumps($object);
             return $response;
-        }
-        elseif ($format == 'xmlmap2')
+        } elseif ($format == 'xmlmap2')
         {
             $response = new OkapiHttpResponse();
             $response->content_type = "text/xml; charset=utf-8";
             $response->body = self::xmlmap2_dumps($object);
             return $response;
-        }
-        else
+        } else
         {
             # Should not happen (as we do a proper check above).
             throw new Exception();
@@ -1694,24 +1744,19 @@ 
             $chunks[] = "<string>";
             $chunks[] = self::xmlescape($obj);
             $chunks[] = "</string>";
-        }
-        elseif (is_int($obj))
+        } elseif (is_int($obj))
         {
             $chunks[] = "<int>$obj</int>";
-        }
-        elseif (is_float($obj))
+        } elseif (is_float($obj))
         {
             $chunks[] = "<float>$obj</float>";
-        }
-        elseif (is_bool($obj))
+        } elseif (is_bool($obj))
         {
             $chunks[] = $obj ? "<bool>true</bool>" : "<bool>false</bool>";
-        }
-        elseif (is_null($obj))
+        } elseif (is_null($obj))
         {
             $chunks[] = "<null/>";
-        }
-        elseif (is_array($obj))
+        } elseif (is_array($obj))
         {
             # Have to check if this is associative or not! Shit. I hate PHP.
             if (array_keys($obj) === range(0, count($obj) - 1))
@@ -1725,8 +1770,7 @@ 
                     $chunks[] = "</item>";
                 }
                 $chunks[] = "</list>";
-            }
-            else
+            } else
             {
                 # Assoc.
                 $chunks[] = "<dict>";
@@ -1738,8 +1782,7 @@ 
                 }
                 $chunks[] = "</dict>";
             }
-        }
-        else
+        } else
         {
             # That's a bug.
             throw new Exception("Cannot encode as xmlmap: " + print_r($obj, true));
@@ -1754,24 +1797,19 @@ 
             $chunks[] = "<string$attrs>";
             $chunks[] = self::xmlescape($obj);
             $chunks[] = "</string>";
-        }
-        elseif (is_int($obj))
+        } elseif (is_int($obj))
         {
             $chunks[] = "<number$attrs>$obj</number>";
-        }
-        elseif (is_float($obj))
+        } elseif (is_float($obj))
         {
             $chunks[] = "<number$attrs>$obj</number>";
-        }
-        elseif (is_bool($obj))
+        } elseif (is_bool($obj))
         {
             $chunks[] = $obj ? "<boolean$attrs>true</boolean>" : "<boolean$attrs>false</boolean>";
-        }
-        elseif (is_null($obj))
+        } elseif (is_null($obj))
         {
             $chunks[] = "<null$attrs/>";
-        }
-        elseif (is_array($obj) || ($obj instanceof ArrayObject))
+        } elseif (is_array($obj) || ($obj instanceof ArrayObject))
         {
             # Have to check if this is associative or not! Shit. I hate PHP.
             if (is_array($obj) && (array_keys($obj) === range(0, count($obj) - 1)))
@@ -1783,8 +1821,7 @@ 
                     self::_xmlmap2_add($chunks, $item_ref, null);
                 }
                 $chunks[] = "</array>";
-            }
-            else
+            } else
             {
                 # Assoc.
                 $chunks[] = "<object$attrs>";
@@ -1794,8 +1831,7 @@ 
                 }
                 $chunks[] = "</object>";
             }
-        }
-        else
+        } else
         {
             # That's a bug.
             throw new Exception("Cannot encode as xmlmap2: " . print_r($obj, true));
@@ -1851,8 +1887,9 @@ 
     public static function cache_type_name2id($name)
     {
         $ref = &self::$cache_types[Settings::get('OC_BRANCH')];
-        if (isset($ref[$name]))
-            return $ref[$name];
+        if (isset($ref[$name])) {
+                    return $ref[$name];
+        }
         throw new Exception("Method cache_type_name2id called with unsupported cache ".
             "type name '$name'. You should not allow users to submit caches ".
             "of non-primary type.");
@@ -1865,11 +1902,13 @@ 
         if ($reversed == null)
         {
             $reversed = array();
-            foreach (self::$cache_types[Settings::get('OC_BRANCH')] as $key => $value)
-                $reversed[$value] = $key;
+            foreach (self::$cache_types[Settings::get('OC_BRANCH')] as $key => $value) {
+                            $reversed[$value] = $key;
+            }
+        }
+        if (isset($reversed[$id])) {
+                    return $reversed[$id];
         }
-        if (isset($reversed[$id]))
-            return $reversed[$id];
         return "Other";
     }
 
@@ -1880,8 +1919,9 @@ 
     /** E.g. 'Available' => 1. For unknown names throws an Exception. */
     public static function cache_status_name2id($name)
     {
-        if (isset(self::$cache_statuses[$name]))
-            return self::$cache_statuses[$name];
+        if (isset(self::$cache_statuses[$name])) {
+                    return self::$cache_statuses[$name];
+        }
         throw new Exception("Method cache_status_name2id called with invalid name '$name'.");
     }
 
@@ -1892,11 +1932,13 @@ 
         if ($reversed == null)
         {
             $reversed = array();
-            foreach (self::$cache_statuses as $key => $value)
-                $reversed[$value] = $key;
+            foreach (self::$cache_statuses as $key => $value) {
+                            $reversed[$value] = $key;
+            }
+        }
+        if (isset($reversed[$id])) {
+                    return $reversed[$id];
         }
-        if (isset($reversed[$id]))
-            return $reversed[$id];
         return 'Archived';
     }
 
@@ -1914,8 +1956,9 @@ 
     /** E.g. 'micro' => 2. For unknown names throw an Exception. */
     public static function cache_size2_to_sizeid($size2)
     {
-        if (isset(self::$cache_sizes[$size2]))
-            return self::$cache_sizes[$size2];
+        if (isset(self::$cache_sizes[$size2])) {
+                    return self::$cache_sizes[$size2];
+        }
         throw new Exception("Method cache_size2_to_sizeid called with invalid size2 '$size2'.");
     }
 
@@ -1926,11 +1969,13 @@ 
         if ($reversed == null)
         {
             $reversed = array();
-            foreach (self::$cache_sizes as $key => $value)
-                $reversed[$value] = $key;
+            foreach (self::$cache_sizes as $key => $value) {
+                            $reversed[$value] = $key;
+            }
+        }
+        if (isset($reversed[$id])) {
+                    return $reversed[$id];
         }
-        if (isset($reversed[$id]))
-            return $reversed[$id];
         return "other";
     }
 
@@ -1953,8 +1998,9 @@ 
      */
     public static function cache_size2_to_oxsize($size2)
     {
-        if (array_key_exists($size2, self::$cache_OX_sizes))
-            return self::$cache_OX_sizes[$size2];
+        if (array_key_exists($size2, self::$cache_OX_sizes)) {
+                    return self::$cache_OX_sizes[$size2];
+        }
         throw new Exception("Method cache_size2_to_oxsize called with invalid size2 '$size2'.");
     }
 
@@ -1963,12 +2009,24 @@ 
      */
     public static function logtypename2id($name)
     {
-        if ($name == 'Found it') return 1;
-        if ($name == "Didn't find it") return 2;
-        if ($name == 'Comment') return 3;
-        if ($name == 'Attended') return 7;
-        if ($name == 'Will attend') return 8;
-        if (($name == 'Needs maintenance') && (Settings::get('OC_BRANCH') == 'oc.pl')) return 5;
+        if ($name == 'Found it') {
+            return 1;
+        }
+        if ($name == "Didn't find it") {
+            return 2;
+        }
+        if ($name == 'Comment') {
+            return 3;
+        }
+        if ($name == 'Attended') {
+            return 7;
+        }
+        if ($name == 'Will attend') {
+            return 8;
+        }
+        if (($name == 'Needs maintenance') && (Settings::get('OC_BRANCH') == 'oc.pl')) {
+            return 5;
+        }
         throw new Exception("logtype2id called with invalid log type argument: $name");
     }
 
@@ -1981,21 +2039,47 @@ 
         # These names are officially documented and may never change!
 
         # Primary.
-        if ($id == 1) return "Found it";
-        if ($id == 2) return "Didn't find it";
-        if ($id == 3) return "Comment";
-        if ($id == 7) return "Attended";
-        if ($id == 8) return "Will attend";
+        if ($id == 1) {
+            return "Found it";
+        }
+        if ($id == 2) {
+            return "Didn't find it";
+        }
+        if ($id == 3) {
+            return "Comment";
+        }
+        if ($id == 7) {
+            return "Attended";
+        }
+        if ($id == 8) {
+            return "Will attend";
+        }
 
         # Other.
-        if ($id == 4) return "Moved";
-        if ($id == 5) return "Needs maintenance";
-        if ($id == 6) return "Maintenance performed";
-        if ($id == 9) return "Archived";
-        if ($id == 10) return "Ready to search";
-        if ($id == 11) return "Temporarily unavailable";
-        if ($id == 12) return "OC Team comment";
-        if ($id == 13 || $id == 14) return "Locked";
+        if ($id == 4) {
+            return "Moved";
+        }
+        if ($id == 5) {
+            return "Needs maintenance";
+        }
+        if ($id == 6) {
+            return "Maintenance performed";
+        }
+        if ($id == 9) {
+            return "Archived";
+        }
+        if ($id == 10) {
+            return "Ready to search";
+        }
+        if ($id == 11) {
+            return "Temporarily unavailable";
+        }
+        if ($id == 12) {
+            return "OC Team comment";
+        }
+        if ($id == 13 || $id == 14) {
+            return "Locked";
+        }
 
         # Important: This set is not closed. Other types may be introduced
         # in the future. This has to be documented in the public method
@@ -2047,8 +2131,9 @@ 
     function php_ini_get_bytes($variable)
     {
         $value = trim(ini_get($variable));
-        if (!preg_match("/^[0-9]+[KM]?$/", $value))
-            throw new Exception("Unexpected PHP setting: ".$variable. " = ".$value);
+        if (!preg_match("/^[0-9]+[KM]?$/", $value)) {
+                    throw new Exception("Unexpected PHP setting: ".$variable. " = ".$value);
+        }
         $value = str_replace('K', '*1024', $value);
         $value = str_replace('M', '*1024*1024', $value);
         $value = eval('return '.$value.';');
@@ -2116,8 +2201,9 @@ 
     /** Do 'set' on many keys at once. */
     public static function set_many($dict, $timeout)
     {
-        if (count($dict) == 0)
-            return;
+        if (count($dict) == 0) {
+                    return;
+        }
         if ($timeout == null)
         {
             # The current cache implementation is ALWAYS persistent, so we will
@@ -2153,15 +2239,18 @@ 
                 and expires > now()
         ");
         list($blob, $score) = Db::fetch_row($rs);
-        if (!$blob)
-            return null;
-        if ($score != null)  # Only non-null entries are scored.
+        if (!$blob) {
+                    return null;
+        }
+        if ($score != null) {
+            # Only non-null entries are scored.
         {
             Db::execute("
                 insert into okapi_cache_reads (`cache_key`)
                 values ('".Db::escape_string($key)."')
             ");
         }
+        }
         return unserialize(gzinflate($blob));
     }
 
@@ -2181,8 +2270,7 @@ 
             try
             {
                 $dict[$row['key']] = unserialize(gzinflate($row['value']));
-            }
-            catch (ErrorException $e)
+            } catch (ErrorException $e)
             {
                 unset($dict[$row['key']]);
                 Okapi::mail_admins("Debug: Unserialize error",
@@ -2192,10 +2280,11 @@ 
                     "Length of data, compressed: ".strlen($row['value']));
             }
         }
-        if (count($dict) < count($keys))
-            foreach ($keys as $key)
+        if (count($dict) < count($keys)) {
+                    foreach ($keys as $key)
                 if (!isset($dict[$key]))
                     $dict[$key] = null;
+        }
         return $dict;
     }
 
@@ -2210,8 +2299,9 @@ 
     /** Do 'delete' on many keys at once. */
     public static function delete_many($keys)
     {
-        if (count($keys) == 0)
-            return;
+        if (count($keys) == 0) {
+                    return;
+        }
         Db::execute("
             delete from okapi_cache
             where `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys))."')
@@ -2229,8 +2319,9 @@ 
     public static function get_file_path($key)
     {
         $filename = Okapi::get_var_dir()."/okapi_filecache_".md5($key);
-        if (!file_exists($filename))
-            return null;
+        if (!file_exists($filename)) {
+                    return null;
+        }
         return $filename;
     }
 
@@ -2316,17 +2407,19 @@ 
         $this->consumer = $consumer;
         $this->token = $token;
         $this->parameters = array();
-        foreach ($parameters as $key => $value)
-            if ($value !== null)
+        foreach ($parameters as $key => $value) {
+                    if ($value !== null)
                 $this->parameters[$key] = $value;
+        }
     }
 
     public function get_parameter($name)
     {
-        if (isset($this->parameters[$name]))
-            return $this->parameters[$name];
-        else
-            return null;
+        if (isset($this->parameters[$name])) {
+                    return $this->parameters[$name];
+        } else {
+                    return null;
+        }
     }
 
     public function get_all_parameters_including_unknown()
@@ -2377,7 +2470,9 @@ 
                     break;
             }
         }
-        if ($this->opt_min_auth_level === null) throw new Exception("Required 'min_auth_level' option is missing.");
+        if ($this->opt_min_auth_level === null) {
+            throw new Exception("Required 'min_auth_level' option is missing.");
+        }
 
         if ($DEBUG_AS_USERNAME != null)
         {
@@ -2416,24 +2511,23 @@ 
 
             list($this->consumer, $this->token) = Okapi::$server->
                 verify_request2($this->request, $this->opt_token_type, $this->opt_min_auth_level == 3);
-            if ($this->get_parameter('consumer_key') && $this->get_parameter('consumer_key') != $this->get_parameter('oauth_consumer_key'))
-                throw new BadRequest("Inproper mixing of authentication types. You used both 'consumer_key' ".
+            if ($this->get_parameter('consumer_key') && $this->get_parameter('consumer_key') != $this->get_parameter('oauth_consumer_key')) {
+                            throw new BadRequest("Inproper mixing of authentication types. You used both 'consumer_key' ".
                     "and 'oauth_consumer_key' parameters (Level 1 and Level 2), but they do not match with ".
                     "each other. Were you trying to hack me? ;)");
+            }
             if ($this->opt_min_auth_level == 3 && !$this->token)
             {
                 throw new BadRequest("This method requires a valid Token to be included (Level 3 ".
                     "Authentication). You didn't provide one.");
             }
-        }
-        else
+        } else
         {
             if ($this->opt_min_auth_level >= 2)
             {
                 throw new BadRequest("This method requires OAuth signature (Level ".
                     $this->opt_min_auth_level." Authentication). You didn't sign your request.");
-            }
-            else
+            } else
             {
                 $consumer_key = $this->get_parameter('consumer_key');
                 if ($consumer_key)
@@ -2443,9 +2537,10 @@ 
                         throw new InvalidParam('consumer_key', "Consumer does not exist.");
                     }
                 }
-                if (($this->opt_min_auth_level == 1) && (!$this->consumer))
-                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 ".
+                if (($this->opt_min_auth_level == 1) && (!$this->consumer)) {
+                                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 ".
                         "Authentication). You didn't provide one.");
+                }
             }
         }
 
@@ -2479,16 +2574,18 @@ 
 
             $debug_user_id = Db::select_value("select user_id from user where username='".
                 Db::escape_string($options['DEBUG_AS_USERNAME'])."'");
-            if ($debug_user_id == null)
-                throw new Exception("Invalid user name in DEBUG_AS_USERNAME: '".$options['DEBUG_AS_USERNAME']."'");
+            if ($debug_user_id == null) {
+                            throw new Exception("Invalid user name in DEBUG_AS_USERNAME: '".$options['DEBUG_AS_USERNAME']."'");
+            }
             $this->consumer = new OkapiDebugConsumer();
             $this->token = new OkapiDebugAccessToken($debug_user_id);
         }
 
         # Read the ETag.
 
-        if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-            $this->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
+                    $this->etag = $_SERVER['HTTP_IF_NONE_MATCH'];
+        }
     }
 
     private function init_request()
@@ -2536,8 +2633,9 @@ 
         # in OKAPI and should be reported back. See issue 85:
         # https://github.com/opencaching/okapi/issues/85
 
-        if (is_array($value))
-            throw new InvalidParam($name, "Make sure you are using '$name' no more than ONCE in your URL.");
+        if (is_array($value)) {
+                    throw new InvalidParam($name, "Make sure you are using '$name' no more than ONCE in your URL.");
+        }
         return $value;
     }
 

htdocs/okapi/services/caches/formatters/garmin.php

Unused Use Statements -5 removed lines

@@ -3,19 +3,14 @@
 namespace okapi\services\caches\formatters\garmin;
 
 
-use okapi\Okapi;
 use okapi\Cache;
 use okapi\Settings;
 use okapi\OkapiRequest;
-use okapi\OkapiHttpResponse;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiServiceRunner;
 use okapi\OkapiZIPHttpResponse;
-use okapi\BadRequest;
 use okapi\ParamMissing;
 use okapi\InvalidParam;
-use okapi\OkapiAccessToken;
-use okapi\services\caches\search\SearchAssistant;
 
 use \Exception;
 use \clsTbsZip;

Braces +39 added lines, -23 removed lines

@@ -32,22 +32,32 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_codes = $request->get_parameter('cache_codes');
-        if ($cache_codes === null) throw new ParamMissing('cache_codes');
+        if ($cache_codes === null) {
+            throw new ParamMissing('cache_codes');
+        }
 
         # Issue 106 requires us to allow empty list of cache codes to be passed into this method.
         # All of the queries below have to be ready for $cache_codes to be empty!
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref .= "|".Settings::get('SITELANG');
         $images = $request->get_parameter('images');
-        if (!$images) $images = "all";
-        if (!in_array($images, array("none", "all", "spoilers", "nonspoilers")))
-            throw new InvalidParam('images');
+        if (!$images) {
+            $images = "all";
+        }
+        if (!in_array($images, array("none", "all", "spoilers", "nonspoilers"))) {
+                    throw new InvalidParam('images');
+        }
         $format = $request->get_parameter('caches_format');
-        if (!$format) $format = "gpx";
-        if (!in_array($format, array("gpx", "ggz")))
-            throw new InvalidParam('caches_format');
+        if (!$format) {
+            $format = "gpx";
+        }
+        if (!in_array($format, array("gpx", "ggz"))) {
+                    throw new InvalidParam('caches_format');
+        }
 
         $location_source = $request->get_parameter('location_source');
         $location_change_prefix = $request->get_parameter('location_change_prefix');
@@ -97,25 +107,29 @@ 
         $caches = OkapiServiceRunner::call('services/caches/geocaches', new OkapiInternalRequest(
             $request->consumer, $request->token, array('cache_codes' => $cache_codes,
             'langpref' => $langpref, 'fields' => "images")));
-        if (count($caches) > 50)
-            throw new InvalidParam('cache_codes', "The maximum number of caches allowed to be downloaded with this method is 50.");
+        if (count($caches) > 50) {
+                    throw new InvalidParam('cache_codes', "The maximum number of caches allowed to be downloaded with this method is 50.");
+        }
         if ($images != 'none')
         {
             $supported_extensions = array('jpg', 'jpeg', 'gif', 'png', 'bmp');
             foreach ($caches as $cache_code => $dict)
             {
                 $imgs = $dict['images'];
-                if (count($imgs) == 0)
-                    continue;
+                if (count($imgs) == 0) {
+                                    continue;
+                }
                 $dir = "Garmin/GeocachePhotos/".$cache_code[strlen($cache_code) - 1];
                 $dir .= "/".$cache_code[strlen($cache_code) - 2];
                 $dir .= "/".$cache_code;
                 foreach ($imgs as $no => $img)
                 {
-                    if ($images == 'spoilers' && (!$img['is_spoiler']))
-                        continue;
-                    if ($images == 'nonspoilers' && $img['is_spoiler'])
-                        continue;
+                    if ($images == 'spoilers' && (!$img['is_spoiler'])) {
+                                            continue;
+                    }
+                    if ($images == 'nonspoilers' && $img['is_spoiler']) {
+                                            continue;
+                    }
                     $tmp = false;
                     foreach ($supported_extensions as $ext)
                     {
@@ -125,8 +139,10 @@ 
                             continue;
                         }
                     }
-                    if (!$tmp)
-                        continue;  # unsupported file extension
+                    if (!$tmp) {
+                                            continue;
+                    }
+                    # unsupported file extension
 
                     if ($img['is_spoiler']) {
                         $zippath = $dir."/Spoilers/".$img['unique_caption'].".jpg";
@@ -145,8 +161,7 @@ 
                     if (file_exists($syspath))
                     {
                         $response->zip->FileAdd($zippath, $syspath, clsTbsZip::TBSZIP_FILE, false);
-                    }
-                    else
+                    } else
                     {
                         # If file exists, but does not end with ".jpg", we will create
                         # JPEG version of it and store it in the cache.
@@ -167,8 +182,7 @@ 
                                         imagejpeg($image);
                                         $jpeg_contents = ob_get_clean();
                                         imagedestroy($image);
-                                    }
-                                    catch (Exception $e)
+                                    } catch (Exception $e)
                                     {
                                         # GD couldn't parse the file. We will skip it, and cache
                                         # the "false" value as the contents. This way, we won't
@@ -181,8 +195,10 @@ 
                                 }
                             }
                         }
-                        if ($jpeg_contents)  # This can be "null" *or* "false"!
+                        if ($jpeg_contents) {
+                            # This can be "null" *or* "false"!
                             $response->zip->FileAdd($zippath, $jpeg_contents, clsTbsZip::TBSZIP_STRING, false);
+                        }
                     }
                 }
             }

htdocs/okapi/services/caches/geocaches.php

Unused Use Statements -2 removed lines

@@ -13,8 +13,6 @@
 use okapi\BadRequest;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiAccessToken;
-use okapi\services\caches\search\SearchAssistant;
 use okapi\services\attrs\AttrHelper;
 
 class WebService

Braces +236 added lines, -171 removed lines

@@ -40,33 +40,42 @@ 
     public static function call(OkapiRequest $request)
     {
         $cache_codes = $request->get_parameter('cache_codes');
-        if ($cache_codes === null) throw new ParamMissing('cache_codes');
+        if ($cache_codes === null) {
+            throw new ParamMissing('cache_codes');
+        }
         if ($cache_codes === "")
         {
             # Issue 106 requires us to allow empty list of cache codes to be passed into this method.
             # All of the queries below have to be ready for $cache_codes to be empty!
             $cache_codes = array();
+        } else {
+                    $cache_codes = explode("|", $cache_codes);
         }
-        else
-            $cache_codes = explode("|", $cache_codes);
 
-        if ((count($cache_codes) > 500) && (!$request->skip_limits))
-            throw new InvalidParam('cache_codes', "Maximum allowed number of referenced ".
+        if ((count($cache_codes) > 500) && (!$request->skip_limits)) {
+                    throw new InvalidParam('cache_codes', "Maximum allowed number of referenced ".
                 "caches is 500. You provided ".count($cache_codes)." cache codes.");
-        if (count($cache_codes) != count(array_unique($cache_codes)))
-            throw new InvalidParam('cache_codes', "Duplicate codes detected (make sure each cache is referenced only once).");
+        }
+        if (count($cache_codes) != count(array_unique($cache_codes))) {
+                    throw new InvalidParam('cache_codes', "Duplicate codes detected (make sure each cache is referenced only once).");
+        }
 
         $langpref = $request->get_parameter('langpref');
-        if (!$langpref) $langpref = "en";
+        if (!$langpref) {
+            $langpref = "en";
+        }
         $langpref .= "|".Settings::get('SITELANG');
         $langpref = explode("|", $langpref);
 
         $fields = $request->get_parameter('fields');
-        if (!$fields) $fields = "code|name|location|type|status";
+        if (!$fields) {
+            $fields = "code|name|location|type|status";
+        }
         $fields = explode("|", $fields);
-        foreach ($fields as $field)
-            if (!in_array($field, self::$valid_field_names))
+        foreach ($fields as $field) {
+                    if (!in_array($field, self::$valid_field_names))
                 throw new InvalidParam('fields', "'$field' is not a valid field code.");
+        }
 
         # Some fields need to be temporarily included whenever the "description"
         # or "attribution_note" field are included. That's a little ugly, but
@@ -94,60 +103,77 @@ 
         }
 
         $attribution_append = $request->get_parameter('attribution_append');
-        if (!$attribution_append) $attribution_append = 'full';
-        if (!in_array($attribution_append, array('none', 'static', 'full')))
-            throw new InvalidParam('attribution_append');
+        if (!$attribution_append) {
+            $attribution_append = 'full';
+        }
+        if (!in_array($attribution_append, array('none', 'static', 'full'))) {
+                    throw new InvalidParam('attribution_append');
+        }
 
         $log_fields = $request->get_parameter('log_fields');
-        if (!$log_fields) $log_fields = "uuid|date|user|type|comment";  // validation is done on call
+        if (!$log_fields) {
+            $log_fields = "uuid|date|user|type|comment";
+        }
+        // validation is done on call
 
         $user_uuid = $request->get_parameter('user_uuid');
         if ($user_uuid != null)
         {
             $user_id = Db::select_value("select user_id from user where uuid='".Db::escape_string($user_uuid)."'");
-            if ($user_id == null)
-                throw new InvalidParam('user_uuid', "User not found.");
-            if (($request->token != null) && ($request->token->user_id != $user_id))
-                throw new InvalidParam('user_uuid', "User does not match the Access Token used.");
+            if ($user_id == null) {
+                            throw new InvalidParam('user_uuid', "User not found.");
+            }
+            if (($request->token != null) && ($request->token->user_id != $user_id)) {
+                            throw new InvalidParam('user_uuid', "User does not match the Access Token used.");
+            }
+        } elseif (($user_uuid == null) && ($request->token != null)) {
+                    $user_id = $request->token->user_id;
+        } else {
+                    $user_id = null;
         }
-        elseif (($user_uuid == null) && ($request->token != null))
-            $user_id = $request->token->user_id;
-        else
-            $user_id = null;
 
         $lpc = $request->get_parameter('lpc');
-        if ($lpc === null) $lpc = 10;
-        if ($lpc == 'all')
-            $lpc = null;
-        else
+        if ($lpc === null) {
+            $lpc = 10;
+        }
+        if ($lpc == 'all') {
+                    $lpc = null;
+        } else
         {
-            if (!is_numeric($lpc))
-                throw new InvalidParam('lpc', "Invalid number: '$lpc'");
+            if (!is_numeric($lpc)) {
+                            throw new InvalidParam('lpc', "Invalid number: '$lpc'");
+            }
             $lpc = intval($lpc);
-            if ($lpc < 0)
-                throw new InvalidParam('lpc', "Must be a positive value.");
+            if ($lpc < 0) {
+                            throw new InvalidParam('lpc', "Must be a positive value.");
+            }
         }
 
         if (in_array('distance', $fields) || in_array('bearing', $fields) || in_array('bearing2', $fields)
             || in_array('bearing3', $fields))
         {
             $tmp = $request->get_parameter('my_location');
-            if (!$tmp)
-                throw new BadRequest("When using 'distance' or 'bearing' fields, you have to supply 'my_location' parameter.");
+            if (!$tmp) {
+                            throw new BadRequest("When using 'distance' or 'bearing' fields, you have to supply 'my_location' parameter.");
+            }
             $parts = explode('|', $tmp);
-            if (count($parts) != 2)
-                throw new InvalidParam('my_location', "Expecting 2 pipe-separated parts, got ".count($parts).".");
+            if (count($parts) != 2) {
+                            throw new InvalidParam('my_location', "Expecting 2 pipe-separated parts, got ".count($parts).".");
+            }
             foreach ($parts as &$part_ref)
             {
-                if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref))
-                    throw new InvalidParam('my_location', "'$part_ref' is not a valid float number.");
+                if (!preg_match("/^-?[0-9]+(\.?[0-9]*)$/", $part_ref)) {
+                                    throw new InvalidParam('my_location', "'$part_ref' is not a valid float number.");
+                }
                 $part_ref = floatval($part_ref);
             }
             list($center_lat, $center_lon) = $parts;
-            if ($center_lat > 90 || $center_lat < -90)
-                throw new InvalidParam('current_position', "Latitudes have to be within -90..90 range.");
-            if ($center_lon > 180 || $center_lon < -180)
-                throw new InvalidParam('current_position', "Longitudes have to be within -180..180 range.");
+            if ($center_lat > 90 || $center_lat < -90) {
+                            throw new InvalidParam('current_position', "Latitudes have to be within -90..90 range.");
+            }
+            if ($center_lon > 180 || $center_lon < -180) {
+                            throw new InvalidParam('current_position', "Longitudes have to be within -180..180 range.");
+            }
         }
 
         if (Settings::get('OC_BRANCH') == 'oc.de')
@@ -181,8 +207,7 @@ 
                     wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                     and status in (1,2,3)
             ");
-        }
-        elseif (Settings::get('OC_BRANCH') == 'oc.pl')
+        } elseif (Settings::get('OC_BRANCH') == 'oc.pl')
         {
             # PL branch:
             # - Caches have ratings.
@@ -231,10 +256,11 @@ 
                         $wp_gc = $row['wp_gc_maintained'] ? $row['wp_gc_maintained'] : $row['wp_gc'];
                         // OC software allows entering anything here, and that's what users do.
                         // We do a formal verification so that only a valid GC code is returned:
-                        if (preg_match('/^\s*[Gg][Cc][A-Za-z0-9]+\s*$/', $wp_gc))
-                            $entry['gc_code'] = strtoupper(trim($wp_gc));
-                        else
-                            $entry['gc_code'] = null;
+                        if (preg_match('/^\s*[Gg][Cc][A-Za-z0-9]+\s*$/', $wp_gc)) {
+                                                    $entry['gc_code'] = strtoupper(trim($wp_gc));
+                        } else {
+                                                    $entry['gc_code'] = null;
+                        }
                         unset($wp_gc);
                         break;
                     case 'name': $entry['name'] = $row['name']; break;
@@ -312,12 +338,19 @@ 
                         $entry['trip_distance'] = $row['trip_distance'] === null ? null : round($row['trip_distance'],3); break;
                         break;
                     case 'rating':
-                        if ($row['votes'] < 3) $entry['rating'] = null;
-                        elseif ($row['score'] >= 2.2) $entry['rating'] = 5.0;
-                        elseif ($row['score'] >= 1.4) $entry['rating'] = 4.0;
-                        elseif ($row['score'] >= 0.1) $entry['rating'] = 3.0;
-                        elseif ($row['score'] >= -1.0) $entry['rating'] = 2.0;
-                        else $entry['rating'] = 1.0;
+                        if ($row['votes'] < 3) {
+                            $entry['rating'] = null;
+                        } elseif ($row['score'] >= 2.2) {
+                            $entry['rating'] = 5.0;
+                        } elseif ($row['score'] >= 1.4) {
+                            $entry['rating'] = 4.0;
+                        } elseif ($row['score'] >= 0.1) {
+                            $entry['rating'] = 3.0;
+                        } elseif ($row['score'] >= -1.0) {
+                            $entry['rating'] = 2.0;
+                        } else {
+                            $entry['rating'] = 1.0;
+                        }
                         break;
                     case 'rating_votes': $entry['rating_votes'] = $row['votes'] + 0; break;
                     case 'recommendations': $entry['recommendations'] = $row['topratings'] + 0; break;
@@ -352,8 +385,9 @@ 
                 }
             }
             $results[$row['wp_oc']] = $entry;
-            if ($row['listing_outdated'] > 0)
-                $outdated_listings[] = $row['wp_oc'];
+            if ($row['listing_outdated'] > 0) {
+                            $outdated_listings[] = $row['wp_oc'];
+            }
         }
         Db::free_result($rs);
 
@@ -367,8 +401,9 @@ 
                 where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_values($owner_ids)))."')
             ");
             $tmp = array();
-            while ($row = Db::fetch_assoc($rs))
-                $tmp[$row['user_id']] = $row;
+            while ($row = Db::fetch_assoc($rs)) {
+                            $tmp[$row['user_id']] = $row;
+            }
             foreach ($results as $cache_code => &$result_ref)
             {
                 $row = $tmp[$owner_ids[$cache_code]];
@@ -384,8 +419,9 @@ 
 
         if (in_array('is_found', $fields))
         {
-            if ($user_id == null)
-                throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_found' field.");
+            if ($user_id == null) {
+                            throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_found' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -401,18 +437,21 @@ 
                     ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_found'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_found'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_not_found
 
         if (in_array('is_not_found', $fields))
         {
-            if ($user_id == null)
-                throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_not_found' field.");
+            if ($user_id == null) {
+                            throw new BadRequest("Either 'user_uuid' parameter OR Level 3 Authentication is required to access 'is_not_found' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -425,18 +464,21 @@ 
                     ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_not_found'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_not_found'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_watched
 
         if (in_array('is_watched', $fields))
         {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'is_watched' field.");
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'is_watched' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -447,8 +489,9 @@ 
                     and cw.user_id = '".Db::escape_string($request->token->user_id)."'
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
 
             # OCDE caches can also be indirectly watched by watching cache lists:
             if (Settings::get('OC_BRANCH') == 'oc.de')
@@ -464,20 +507,23 @@ 
                       and clw.cache_list_id = cli.cache_list_id
                       and clw.user_id = '".Db::escape_string($request->token->user_id)."'
               ");
-              foreach ($tmp as $cache_code)
-                  $tmp2[$cache_code] = true;
+              foreach ($tmp as $cache_code) {
+                                $tmp2[$cache_code] = true;
+              }
             }
 
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_watched'] = isset($tmp2[$cache_code]);
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_watched'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # is_ignored
 
         if (in_array('is_ignored', $fields))
         {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'is_ignored' field.");
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'is_ignored' field.");
+            }
             $tmp = Db::select_column("
                 select c.wp_oc
                 from
@@ -488,10 +534,12 @@ 
                     and ci.user_id = '".Db::escape_string($request->token->user_id)."'
             ");
             $tmp2 = array();
-            foreach ($tmp as $cache_code)
-                $tmp2[$cache_code] = true;
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['is_ignored'] = isset($tmp2[$cache_code]);
+            foreach ($tmp as $cache_code) {
+                            $tmp2[$cache_code] = true;
+            }
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['is_ignored'] = isset($tmp2[$cache_code]);
+            }
         }
 
         # Descriptions and hints.
@@ -579,27 +627,31 @@ 
             foreach (array(
                 'short_description', 'short_descriptions', 'description', 'descriptions',
                 'hint', 'hints', 'hint2', 'hints2'
-            ) as $field)
-                if (!in_array($field, $fields))
+            ) as $field) {
+                            if (!in_array($field, $fields))
                     foreach ($results as &$result_ref)
                         unset($result_ref[$field]);
+            }
         }
 
         # Images.
 
         if (in_array('images', $fields) || in_array('preview_image', $fields))
         {
-            if (in_array('images', $fields))
-                foreach ($results as &$result_ref)
+            if (in_array('images', $fields)) {
+                            foreach ($results as &$result_ref)
                     $result_ref['images'] = array();
-            if (in_array('preview_image', $fields))
-                foreach ($results as &$result_ref)
+            }
+            if (in_array('preview_image', $fields)) {
+                            foreach ($results as &$result_ref)
                     $result_ref['preview_image'] = null;
+            }
 
-            if (Db::field_exists('pictures', 'mappreview'))
-                $preview_field = "mappreview";
-            else
-                $preview_field = "0";
+            if (Db::field_exists('pictures', 'mappreview')) {
+                            $preview_field = "mappreview";
+            } else {
+                            $preview_field = "0";
+            }
             $rs = Db::query("
                 select object_id, uuid, url, title, spoiler, ".$preview_field." as preview
                 from pictures
@@ -635,10 +687,12 @@ 
                     'unique_caption' => self::get_unique_caption($row['title']),
                     'is_spoiler' => ($row['spoiler'] ? true : false),
                 );
-                if (in_array('images', $fields))
-                    $results[$cache_code]['images'][] = $image;
-                if ($row['preview'] != 0 && in_array('preview_image', $fields))
-                    $results[$cache_code]['preview_image'] = $image;
+                if (in_array('images', $fields)) {
+                                    $results[$cache_code]['images'][] = $image;
+                }
+                if ($row['preview'] != 0 && in_array('preview_image', $fields)) {
+                                    $results[$cache_code]['preview_image'] = $image;
+                }
             }
         }
 
@@ -653,8 +707,9 @@ 
             {
                 $fields_to_remove_later[] = 'attr_acodes';
             }
-            foreach ($results as &$result_ref)
-                $result_ref['attr_acodes'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['attr_acodes'] = array();
+            }
 
             # Load internal_attr_id => acode mapping.
 
@@ -687,8 +742,9 @@ 
                 foreach ($results as &$result_ref)
                 {
                     $result_ref['attrnames'] = array();
-                    foreach ($result_ref['attr_acodes'] as $acode)
-                        $result_ref['attrnames'][] = $acode2bestname[$acode];
+                    foreach ($result_ref['attr_acodes'] as $acode) {
+                                            $result_ref['attrnames'][] = $acode2bestname[$acode];
+                    }
                 }
             }
         }
@@ -697,8 +753,9 @@ 
 
         if (in_array('latest_logs', $fields))
         {
-            foreach ($results as &$result_ref)
-                $result_ref['latest_logs'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['latest_logs'] = array();
+            }
 
             # Get all log IDs in proper order, then filter out the latest
             # ones. This should be the fastest technique ...
@@ -732,8 +789,9 @@ 
             {
                 # User wants some of the latest logs.
                 $tmp = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $tmp[$row['cache_id']][] = $row;
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $tmp[$row['cache_id']][] = $row;
+                }
                 foreach ($tmp as $cache_key => &$rowslist_ref)
                 {
                     for ($i = 0; $i < min(count($rowslist_ref), $lpc); $i++)
@@ -742,8 +800,7 @@ 
                         $log2cache_map[$rowslist_ref[$i]['uuid']] = $cacheid2wptcode[$rowslist_ref[$i]['cache_id']];
                     }
                 }
-            }
-            else
+            } else
             {
                 # User wants ALL logs.
                 while ($row = Db::fetch_assoc($rs))
@@ -773,18 +830,17 @@ 
                     );
                     foreach ($subset as $log_uuid)
                     {
-                        if ($entries[$log_uuid])
-                            $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                        if ($entries[$log_uuid]) {
+                                                    $results[$log2cache_map[$log_uuid]]['latest_logs'][] = $entries[$log_uuid];
+                        }
                     }
                 }
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 if (($e instanceof InvalidParam) && ($e->paramName == 'fields'))
                 {
                     throw new InvalidParam('log_fields', $e->whats_wrong_about_it);
-                }
-                else
+                } else
                 {
                     /* Something is wrong with OUR code. */
                     throw new Exception($e);
@@ -796,10 +852,12 @@ 
 
         if (in_array('my_notes', $fields))
         {
-            if ($request->token == null)
-                throw new BadRequest("Level 3 Authentication is required to access 'my_notes' field.");
-            foreach ($results as &$result_ref)
-                $result_ref['my_notes'] = null;
+            if ($request->token == null) {
+                            throw new BadRequest("Level 3 Authentication is required to access 'my_notes' field.");
+            }
+            foreach ($results as &$result_ref) {
+                            $result_ref['my_notes'] = null;
+            }
             if (Settings::get('OC_BRANCH') == 'oc.pl')
             {
                 # OCPL uses cache_notes table to store notes.
@@ -812,8 +870,7 @@ 
                         and user_id = '".Db::escape_string($request->token->user_id)."'
                     group by cache_id
                 ");
-            }
-            else
+            } else
             {
                 # OCDE uses coordinates table (with type == 2) to store notes (this is somewhat weird).
 
@@ -852,13 +909,15 @@ 
                     and gkiw.wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
             ");
             $trs = array();
-            while ($row = Db::fetch_assoc($rs))
-                $trs[$row['cache_code']][] = $row;
+            while ($row = Db::fetch_assoc($rs)) {
+                            $trs[$row['cache_code']][] = $row;
+            }
             foreach ($results as $cache_code => &$result_ref)
             {
                 $result_ref['trackables'] = array();
-                if (!isset($trs[$cache_code]))
-                    continue;
+                if (!isset($trs[$cache_code])) {
+                                    continue;
+                }
                 foreach ($trs[$cache_code] as $t)
                 {
                     $result_ref['trackables'][] = array(
@@ -875,10 +934,10 @@ 
             if (in_array('trackables', $fields))
             {
                 # We already got all trackables data, no need to query database again.
-                foreach ($results as $cache_code => &$result_ref)
-                    $result_ref['trackables_count'] = count($result_ref['trackables']);
-            }
-            else
+                foreach ($results as $cache_code => &$result_ref) {
+                                    $result_ref['trackables_count'] = count($result_ref['trackables']);
+                }
+            } else
             {
                 $rs = Db::query("
                     select wp as cache_code, count(*) as count
@@ -887,14 +946,16 @@ 
                     group by wp
                 ");
                 $tr_counts = new ArrayObject();
-                while ($row = Db::fetch_assoc($rs))
-                    $tr_counts[$row['cache_code']] = $row['count'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $tr_counts[$row['cache_code']] = $row['count'];
+                }
                 foreach ($results as $cache_code => &$result_ref)
                 {
-                    if (isset($tr_counts[$cache_code]))
-                        $result_ref['trackables_count'] = $tr_counts[$cache_code] + 0;
-                    else
-                        $result_ref['trackables_count'] = 0;
+                    if (isset($tr_counts[$cache_code])) {
+                                            $result_ref['trackables_count'] = $tr_counts[$cache_code] + 0;
+                    } else {
+                                            $result_ref['trackables_count'] = 0;
+                    }
                 }
                 unset($tr_counts);
             }
@@ -916,11 +977,11 @@ 
                         coordinates_type ct
                         left join sys_trans_text stt on stt.trans_id = ct.trans_id
                 ");
-                while ($row = Db::fetch_assoc($rs))
-                    $internal_wpt_type_id2names[$row['id']][$row['language']] = $row['text'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $internal_wpt_type_id2names[$row['id']][$row['language']] = $row['text'];
+                }
                 Db::free_result($rs);
-            }
-            else
+            } else
             {
                 $rs = Db::query("
                     select id, pl, en
@@ -934,8 +995,9 @@ 
                 }
             }
 
-            foreach ($results as &$result_ref)
-                $result_ref['alt_wpts'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['alt_wpts'] = array();
+            }
             $cache_codes_escaped_and_imploded = "'".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."'";
 
             if (Settings::get('OC_BRANCH') == 'oc.pl')
@@ -970,8 +1032,7 @@ 
                         and status = 1
                     order by cache_id, stage, `desc`
                 ");
-            }
-            else
+            } else
             {
                 # OCDE uses 'coordinates' table (with type=1) to store additional waypoints
                 # and defines waypoint types in 'coordinates_type' table.
@@ -1117,8 +1178,9 @@ 
                         c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
                 ");
                 $country_codes2names = array();
-                while ($row = Db::fetch_assoc($rs))
-                    $country_codes2names[$row['country']][$row['language']] = $row['text'];
+                while ($row = Db::fetch_assoc($rs)) {
+                                    $country_codes2names[$row['country']][$row['language']] = $row['text'];
+                }
                 Db::free_result($rs);
 
                 # get geocache countries and states
@@ -1135,15 +1197,15 @@ 
                 ");
                 while ($row = Db::fetch_assoc($rs))
                 {
-                    if (!isset($country_codes2names[$row['country_code']]))
-                        $countries[$row['cache_code']] = '';
-                    else
-                        $countries[$row['cache_code']] = Okapi::pick_best_language($country_codes2names[$row['country_code']], $langpref);
+                    if (!isset($country_codes2names[$row['country_code']])) {
+                                            $countries[$row['cache_code']] = '';
+                    } else {
+                                            $countries[$row['cache_code']] = Okapi::pick_best_language($country_codes2names[$row['country_code']], $langpref);
+                    }
                     $states[$row['cache_code']] = $row['state'];
                 }
                 Db::free_result($rs);
-            }
-            else
+            } else
             {
                 # OCPL:
                 #  - cache_location data is entered by the user.
@@ -1172,13 +1234,15 @@ 
 
             if (in_array('country', $fields))
             {
-                foreach ($results as $cache_code => &$row_ref)
-                    $row_ref['country'] = isset($countries[$cache_code]) ? $countries[$cache_code] : null;
+                foreach ($results as $cache_code => &$row_ref) {
+                                    $row_ref['country'] = isset($countries[$cache_code]) ? $countries[$cache_code] : null;
+                }
             }
             if (in_array('state', $fields))
             {
-                foreach ($results as $cache_code => &$row_ref)
-                    $row_ref['state'] = isset($states[$cache_code]) ? $states[$cache_code] : null;
+                foreach ($results as $cache_code => &$row_ref) {
+                                    $row_ref['state'] = isset($states[$cache_code]) ? $states[$cache_code] : null;
+                }
             }
             unset($countries);
             unset($states);
@@ -1191,12 +1255,13 @@ 
             /* Note, that the "owner" and "internal_id" fields are automatically included,
              * whenever the attribution_note is included. */
 
-            foreach ($results as $cache_code => &$result_ref)
-                $result_ref['attribution_note'] =
+            foreach ($results as $cache_code => &$result_ref) {
+                            $result_ref['attribution_note'] =
                     self::get_cache_attribution_note(
                         $result_ref['internal_id'], $langpref[0], $langpref,
                         $results[$cache_code]['owner'], 'full'
                     );
+            }
         }
 
         # Protection areas
@@ -1222,8 +1287,7 @@ 
                     group by npa_areas.type_id, npa_areas.name
                     order by npa_types.ordinal
                 ");
-            }
-            else if (in_array(Okapi::get_oc_schema_code(), array("OCPL", "OCNL")))
+            } else if (in_array(Okapi::get_oc_schema_code(), array("OCPL", "OCNL")))
             {
                 # Current OCPL table definitions use collation 'latin1' for parkipl
                 # and 'utf8' for np_areas. Union needs identical collations.
@@ -1255,8 +1319,7 @@ 
                         c.cache_id in (".$cache_ids_escaped_and_imploded.")
                         and cache_npa_areas.npa_id != 0
                 ");
-            }
-            else
+            } else
             {
                 # OC.US and .UK do not have a 'parkipl' table.
                 # OC.US has a 'us_parks' table instead.
@@ -1264,8 +1327,9 @@ 
                 $rs = null;
             }
 
-            foreach ($results as &$result_ref)
-                $result_ref['protection_areas'] = array();
+            foreach ($results as &$result_ref) {
+                            $result_ref['protection_areas'] = array();
+            }
             if ($rs)
             {
                 while ($row = Db::fetch_assoc($rs))
@@ -1280,18 +1344,20 @@ 
         }
 
         # Check which cache codes were not found and mark them with null.
-        foreach ($cache_codes as $cache_code)
-            if (!isset($results[$cache_code]))
+        foreach ($cache_codes as $cache_code) {
+                    if (!isset($results[$cache_code]))
                 $results[$cache_code] = null;
+        }
 
         if (count($fields_to_remove_later) > 0)
         {
             # Some of the fields in $results were added only temporarily
             # (the Consumer did not ask for them). We will remove these fields now.
 
-            foreach ($results as &$result_ref)
-                foreach ($fields_to_remove_later as $field)
+            foreach ($results as &$result_ref) {
+                            foreach ($fields_to_remove_later as $field)
                     unset($result_ref[$field]);
+            }
         }
 
         # Order the results in the same order as the input codes were given.
@@ -1301,8 +1367,9 @@ 
         # so we just have to rewrite it (sequentially).
 
         $ordered_results = new ArrayObject();
-        foreach ($cache_codes as $cache_code)
-            $ordered_results[$cache_code] = $results[$cache_code];
+        foreach ($cache_codes as $cache_code) {
+                    $ordered_results[$cache_code] = $results[$cache_code];
+        }
 
         /* Handle OCPL's "access logs" feature. */
 
@@ -1415,8 +1482,7 @@ 
                 _("This <a href='%s'>geocache</a> description comes from the <a href='%s'>%s</a> site."),
                 $cache_url, $site_url, $site_name
             );
-        }
-        else
+        } else
         {
             # OC.de wants the tld in lowercase here
             $site_name = ucfirst(strtolower($site_name));
@@ -1430,8 +1496,7 @@ 
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name, strftime('%x')
                 );
-            }
-            elseif ($type == 'static')
+            } elseif ($type == 'static')
             {
                 $note = sprintf(
                     _(

htdocs/okapi/services/caches/map/replicate_listener.inc.php

Unused Use Statements -10 removed lines

@@ -2,21 +2,11 @@
 
 namespace okapi\services\caches\map;
 
-use Exception;
-use okapi\Okapi;
-use okapi\Settings;
-use okapi\Cache;
 use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
 use okapi\InvalidParam;
-use okapi\BadRequest;
-use okapi\DoesNotExist;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiInternalConsumer;
 use okapi\OkapiServiceRunner;
-
 use okapi\services\caches\map\TileTree;
 
 require_once 'tiletree.inc.php';

Braces +28 added lines, -21 removed lines

@@ -33,10 +33,11 @@ 
         {
             if ($c['object_type'] == 'geocache')
             {
-                if ($c['change_type'] == 'replace')
-                    self::handle_geocache_replace($c);
-                else
-                    self::handle_geocache_delete($c);
+                if ($c['change_type'] == 'replace') {
+                                    self::handle_geocache_replace($c);
+                } else {
+                                    self::handle_geocache_delete($c);
+                }
             }
         }
     }
@@ -95,19 +96,18 @@ 
             # Aaah, a new geocache! How nice... ;)
 
             self::add_geocache_to_cached_tiles($theirs);
-        }
-        elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2]))  # z21x & z21y fields
+        } elseif (($ours[1] != $theirs[1]) || ($ours[2] != $theirs[2])) {
+            # z21x & z21y fields
         {
             # Location changed.
 
             self::remove_geocache_from_cached_tiles($ours[0]);
-            self::add_geocache_to_cached_tiles($theirs);
         }
-        elseif ($ours != $theirs)
+            self::add_geocache_to_cached_tiles($theirs);
+        } elseif ($ours != $theirs)
         {
             self::update_geocache_attributes_in_cached_tiles($theirs);
-        }
-        else
+        } else
         {
             # No need to update anything. This is very common (i.e. when the
             # cache was simply found, not actually changed). Replicate module generates
@@ -154,10 +154,13 @@ 
             # go with the simple approach and check all 1+8 bordering tiles.
 
             $tiles_in_this_region = array();
-            for ($x=$ex-1; $x<=$ex+1; $x++)
-                for ($y=$ey-1; $y<=$ey+1; $y++)
-                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
+            for ($x=$ex-1; $x<=$ex+1; $x++) {
+                            for ($y=$ey-1;
+            }
+            $y<=$ey+1; $y++) {
+                                    if (($x >= 0) && ($x < 1<<$zoom) && ($y >= 0) && ($y < 1<<$zoom))
                         $tiles_in_this_region[] = array($x, $y);
+                }
 
             foreach ($tiles_in_this_region as $coords)
             {
@@ -171,14 +174,18 @@ 
                 $top_z21y = ($y << $scale) - $margin;
                 $bottom_z21y = (($y + 1) << $scale) + $margin;
 
-                if ($z21x < $left_z21x)
-                    continue;
-                if ($z21x > $right_z21x)
-                    continue;
-                if ($z21y < $top_z21y)
-                    continue;
-                if ($z21y > $bottom_z21y)
-                    continue;
+                if ($z21x < $left_z21x) {
+                                    continue;
+                }
+                if ($z21x > $right_z21x) {
+                                    continue;
+                }
+                if ($z21y < $top_z21y) {
+                                    continue;
+                }
+                if ($z21y > $bottom_z21y) {
+                                    continue;
+                }
 
                 # We found a match. Store it for later.
 

htdocs/okapi/services/caches/map/tile.php

Unused Use Statements -8 removed lines

@@ -2,26 +2,18 @@
 
 namespace okapi\services\caches\map\tile;
 
-use Exception;
-use okapi\Okapi;
 use okapi\Settings;
 use okapi\Cache;
-use okapi\FileCache;
 use okapi\Db;
 use okapi\OkapiRequest;
 use okapi\OkapiHttpResponse;
 use okapi\ParamMissing;
 use okapi\InvalidParam;
 use okapi\BadRequest;
-use okapi\DoesNotExist;
 use okapi\OkapiInternalRequest;
-use okapi\OkapiInternalConsumer;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiLock;
-
 use okapi\services\caches\map\TileTree;
 use okapi\services\caches\map\TileRenderer;
-use okapi\services\caches\search\SearchAssistant;
 use okapi\OkapiConsumer;
 
 require_once('tiletree.inc.php');

Braces +35 added lines, -22 removed lines

@@ -58,11 +58,13 @@ 
     private static function require_uint($request, $name, $min_value = 0)
     {
         $val = $request->get_parameter($name);
-        if ($val === null)
-            throw new ParamMissing($name);
+        if ($val === null) {
+                    throw new ParamMissing($name);
+        }
         $ret = intval($val);
-        if ($ret < 0 || ("$ret" !== $val))
-            throw new InvalidParam($name, "Expecting non-negative integer.");
+        if ($ret < 0 || ("$ret" !== $val)) {
+                    throw new InvalidParam($name, "Expecting non-negative integer.");
+        }
         return $ret;
     }
 
@@ -84,14 +86,17 @@ 
         # zoom, x, y - required tile-specific parameters.
 
         $zoom = self::require_uint($request, 'z');
-        if ($zoom > 21)
-            throw new InvalidParam('z', "Maximum value for this parameter is 21.");
+        if ($zoom > 21) {
+                    throw new InvalidParam('z', "Maximum value for this parameter is 21.");
+        }
         $x = self::require_uint($request, 'x');
         $y = self::require_uint($request, 'y');
-        if ($x >= 1<<$zoom)
-            throw new InvalidParam('x', "Should be in 0..".((1<<$zoom) - 1).".");
-        if ($y >= 1<<$zoom)
-            throw new InvalidParam('y', "Should be in 0..".((1<<$zoom) - 1).".");
+        if ($x >= 1<<$zoom) {
+                    throw new InvalidParam('x', "Should be in 0..".((1<<$zoom) - 1).".");
+        }
+        if ($y >= 1<<$zoom) {
+                    throw new InvalidParam('y', "Should be in 0..".((1<<$zoom) - 1).".");
+        }
 
         # Now, we will create a search set (or use one previously created).
         # Instead of creating a new OkapiInternalRequest object, we will pass
@@ -114,8 +119,9 @@ 
         $rows = array();
         if ($rs !== null)
         {
-            while ($row = Db::fetch_row($rs))
-                $rows[] = $row;
+            while ($row = Db::fetch_row($rs)) {
+                            $rows[] = $row;
+            }
             unset($row);
         }
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointA", null,
@@ -142,8 +148,9 @@ 
                     where user_id = '".Db::escape_string($request->token->user_id)."'
                 ");
                 $user['ignored'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['ignored'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['ignored'][$cache_id] = true;
+                }
 
                 # Found caches.
 
@@ -156,8 +163,9 @@ 
                         and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
                 ");
                 $user['found'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['found'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['found'][$cache_id] = true;
+                }
 
                 # Own caches.
 
@@ -167,8 +175,9 @@ 
                     where user_id = '".Db::escape_string($request->token->user_id)."'
                 ");
                 $user['own'] = array();
-                while (list($cache_id) = Db::fetch_row($rs))
-                    $user['own'][$cache_id] = true;
+                while (list($cache_id) = Db::fetch_row($rs)) {
+                                    $user['own'][$cache_id] = true;
+                }
 
                 Cache::set($cache_key, $user, 30);
             }
@@ -181,10 +190,14 @@ 
                 # to be drawn as found) and the "own" flag (to indicate that
                 # the current user is the owner).
 
-                if (isset($user['found'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_FOUND;  # $row[6] is "flags"
-                if (isset($user['own'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_OWN;  # $row[6] is "flags"
+                if (isset($user['found'][$row_ref[0]])) {
+                                    $row_ref[6] |= TileTree::$FLAG_FOUND;
+                }
+                # $row[6] is "flags"
+                if (isset($user['own'][$row_ref[0]])) {
+                                    $row_ref[6] |= TileTree::$FLAG_OWN;
+                }
+                # $row[6] is "flags"
             }
         }
 

htdocs/okapi/services/caches/map/tilerenderer.inc.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Exception;
 use okapi\Okapi;
-use okapi\Settings;
 use okapi\Cache;
 use okapi\Db;
 use okapi\FileCache; // WRTODO

Braces +77 added lines, -53 removed lines

@@ -74,23 +74,28 @@ 
     {
         # Preprocess the rows.
 
-        if ($this->zoom >= 5)
-            $this->decide_which_get_captions();
+        if ($this->zoom >= 5) {
+                    $this->decide_which_get_captions();
+        }
 
         # Make a background.
 
         $this->im = imagecreatetruecolor(256, 256);
         imagealphablending($this->im, false);
-        if ($this->zoom >= 13) $opacity = 15;
-        elseif ($this->zoom <= 12) $opacity = max(0, $this->zoom * 2 - 14);
+        if ($this->zoom >= 13) {
+            $opacity = 15;
+        } elseif ($this->zoom <= 12) {
+            $opacity = max(0, $this->zoom * 2 - 14);
+        }
         $transparent = imagecolorallocatealpha($this->im, 0, 0, 0, 127 - $opacity);
         imagefilledrectangle($this->im, 0, 0, 256, 256, $transparent);
         imagealphablending($this->im, true);
 
         # Draw the caches.
 
-        foreach ($this->rows_ref as &$row_ref)
-            $this->draw_cache($row_ref);
+        foreach ($this->rows_ref as &$row_ref) {
+                    $this->draw_cache($row_ref);
+        }
 
         # Return the result.
 
@@ -118,13 +123,13 @@ 
                 $cache_key = "tilesrc/".Okapi::$git_revision."/".self::$VERSION."/".$key;
                 $gd2_path = self::$USE_STATIC_IMAGE_CACHE
                     ? FileCache::get_file_path($cache_key) : null;
-                if ($gd2_path === null)
-                    throw new Exception("Not in cache");
+                if ($gd2_path === null) {
+                                    throw new Exception("Not in cache");
+                }
                 # File cache hit. GD2 files are much faster to read than PNGs.
                 # This can throw an Exception (see bug#160).
                 $locmem_cache[$key] = imagecreatefromgd2($gd2_path);
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 # Miss again (or error decoding). Read the image from PNG.
 
@@ -132,12 +137,15 @@ 
 
                 # Apply all wanted effects.
 
-                if ($opacity != 1)
-                    self::change_opacity($locmem_cache[$key], $opacity);
-                if ($contrast != 0)
-                    imagefilter($locmem_cache[$key], IMG_FILTER_CONTRAST, $contrast);
-                if ($brightness != 0)
-                    imagefilter($locmem_cache[$key], IMG_FILTER_BRIGHTNESS, $brightness);
+                if ($opacity != 1) {
+                                    self::change_opacity($locmem_cache[$key], $opacity);
+                }
+                if ($contrast != 0) {
+                                    imagefilter($locmem_cache[$key], IMG_FILTER_CONTRAST, $contrast);
+                }
+                if ($brightness != 0) {
+                                    imagefilter($locmem_cache[$key], IMG_FILTER_BRIGHTNESS, $brightness);
+                }
                 if (($r != 0) || ($g != 0) || ($b != 0))
                 {
                     imagefilter($locmem_cache[$key], IMG_FILTER_GRAYSCALE);
@@ -182,12 +190,13 @@ 
     {
         $capt = ($cache_struct[6] & TileTree::$FLAG_DRAW_CAPTION);
 
-        if (($this->zoom <= 8) && (!$capt))
-            $this->draw_cache_tiny($cache_struct);
-        elseif (($this->zoom <= 13) && (!$capt))
-            $this->draw_cache_medium($cache_struct);
-        else
-            $this->draw_cache_large($cache_struct);
+        if (($this->zoom <= 8) && (!$capt)) {
+                    $this->draw_cache_tiny($cache_struct);
+        } elseif (($this->zoom <= 13) && (!$capt)) {
+                    $this->draw_cache_medium($cache_struct);
+        } else {
+                    $this->draw_cache_large($cache_struct);
+        }
 
         # Put caption (this flag is set only when there is plenty of space around).
 
@@ -241,8 +250,9 @@ 
         $markercenter_x = 12;
         $markercenter_y = 12;
 
-        if ($count > 1)
-            imagecopy($this->im, $outer_marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
+        if ($count > 1) {
+                    imagecopy($this->im, $outer_marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
+        }
         imagecopy($this->im, $outer_marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
 
         # Put the inner marker (indicates the type).
@@ -304,8 +314,9 @@ 
         $nextBonus = "";
         for ($i=0; ($i<count($words)) || (mb_strlen($nextBonus)>0); $i++) {
             $word = isset($words[$i])?$words[$i]:"";
-            if (mb_strlen($nextBonus) > 0)
-                $word = $nextBonus." ".$word;
+            if (mb_strlen($nextBonus) > 0) {
+                            $word = $nextBonus." ".$word;
+            }
             $nextBonus = "";
             while (true) {
                 $bbox = imagettfbbox($size, 0, $font, $line.$word);
@@ -324,8 +335,9 @@ 
                 continue;
             }
         }
-        if (mb_strlen($line) > 0)
-            $lines[] = trim($line);
+        if (mb_strlen($line) > 0) {
+                    $lines[] = trim($line);
+        }
         return implode("\n", $lines);
     }
 
@@ -389,9 +401,12 @@ 
             # Draw an outline.
 
             $outline_color = imagecolorallocatealpha($im, 255, 255, 255, 80);
-            for ($x=0; $x<=12; $x+=3)
-                for ($y=$size-3; $y<=$size+9; $y+=3)
-                    $drawer($x, $y, $outline_color);
+            for ($x=0; $x<=12; $x+=3) {
+                            for ($y=$size-3;
+            }
+            $y<=$size+9; $y+=3) {
+                                    $drawer($x, $y, $outline_color);
+                }
 
             # Add a slight shadow effect (on top of the outline).
 
@@ -426,10 +441,11 @@ 
         $found = $flags & TileTree::$FLAG_FOUND;
         $own = $flags & TileTree::$FLAG_OWN;
         $new = $flags & TileTree::$FLAG_NEW;
-        if ($found && (!($flags & TileTree::$FLAG_DRAW_CAPTION)))
-            $a = .35;
-        else
-            $a = 1;
+        if ($found && (!($flags & TileTree::$FLAG_DRAW_CAPTION))) {
+                    $a = .35;
+        } else {
+                    $a = 1;
+        }
 
         # Put the marker (indicates the type).
 
@@ -445,11 +461,12 @@ 
         {
             imagecopy($this->im, $marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($status == 1)  # don't put the marker for unavailable caches (X only)
+        } elseif ($status == 1) {
+            # don't put the marker for unavailable caches (X only)
         {
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
         }
+        }
 
         # If the cache is unavailable, mark it with X.
 
@@ -485,16 +502,14 @@ 
 
             $overlay = self::get_image("medium_overlay_own");
             imagecopy($this->im, $overlay, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($found)
+        } elseif ($found)
         {
             # Mark found caches with V.
 
             $icon = self::get_image("found", 0.7*$a);
             imagecopy($this->im, $icon, $px - ($center_x - $markercenter_x) - 7,
                 $py - ($center_y - $markercenter_y) - 9, 0, 0, 16, 16);
-        }
-        elseif ($new)
+        } elseif ($new)
         {
             # Mark new caches with additional overlay.
 
@@ -546,8 +561,7 @@ 
         {
             imagecopy($this->im, $marker, $px - $center_x + 3, $py - $center_y - 2, 0, 0, $width, $height);
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
-        }
-        elseif ($status == 1)
+        } elseif ($status == 1)
         {
             imagecopy($this->im, $marker, $px - $center_x, $py - $center_y, 0, 0, $width, $height);
         }
@@ -577,25 +591,33 @@ 
         # This is efficient and yields acceptable results.
 
         $matrix = array();
-        for ($i=0; $i<12; $i++)
-            $matrix[] = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        for ($i=0; $i<12; $i++) {
+                    $matrix[] = array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+        }
 
         foreach ($this->rows_ref as &$row_ref)
         {
             $mx = ($row_ref[1] + 64) >> 5;
             $my = ($row_ref[2] + 64) >> 5;
-            if (($mx >= 12) || ($my >= 12)) continue;
-            if (($matrix[$mx][$my] === 0) && ($row_ref[8] == 1))  # 8 is count
-                $matrix[$mx][$my] = $row_ref[0];  # 0 is cache_id
-            else
-                $matrix[$mx][$my] = -1;
+            if (($mx >= 12) || ($my >= 12)) {
+                continue;
+            }
+            if (($matrix[$mx][$my] === 0) && ($row_ref[8] == 1)) {
+                # 8 is count
+                $matrix[$mx][$my] = $row_ref[0];
+            }
+            # 0 is cache_id
+            else {
+                            $matrix[$mx][$my] = -1;
+            }
         }
         $selected_cache_ids = array();
         for ($mx=1; $mx<11; $mx++)
         {
             for ($my=1; $my<11; $my++)
             {
-                if ($matrix[$mx][$my] > 0)  # cache_id
+                if ($matrix[$mx][$my] > 0) {
+                    # cache_id
                 {
                     # Check all adjacent squares.
 
@@ -610,12 +632,14 @@ 
                     )
                         $selected_cache_ids[] = $matrix[$mx][$my];
                 }
+                }
             }
         }
 
-        foreach ($this->rows_ref as &$row_ref)
-            if (in_array($row_ref[0], $selected_cache_ids))
+        foreach ($this->rows_ref as &$row_ref) {
+                    if (in_array($row_ref[0], $selected_cache_ids))
                 $row_ref[6] |= TileTree::$FLAG_DRAW_CAPTION;
+        }
     }
 
 }
\ No newline at end of file

htdocs/okapi/services/caches/map/tiletree.inc.php

Unused Use Statements -8 removed lines

@@ -4,19 +4,11 @@
 
 use Exception;
 use okapi\Okapi;
-use okapi\Settings;
 use okapi\Cache;
 use okapi\Db;
-use okapi\OkapiRequest;
-use okapi\OkapiHttpResponse;
-use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\BadRequest;
-use okapi\DoesNotExist;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiInternalConsumer;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiLock;
 
 
 class TileTree

Braces +40 added lines, -22 removed lines

@@ -64,19 +64,23 @@ 
         # (and if it was, was it empty).
 
         $status = self::get_tile_status($zoom, $x, $y);
-        if ($status === null)  # Not yet computed.
+        if ($status === null) {
+            # Not yet computed.
         {
             # Note, that computing the tile does not involve taking any
             # search parameters.
 
             $status = self::compute_tile($zoom, $x, $y);
         }
+        }
 
-        if ($status === 1)  # Computed and empty.
+        if ($status === 1) {
+            # Computed and empty.
         {
             # This tile was already computed and it is empty.
             return null;
         }
+        }
 
         # If we got here, then the tile is computed and not empty (status 2).
 
@@ -121,8 +125,9 @@ 
         # For low-level tiles, this can be expensive.
 
         $status = self::get_tile_status($zoom, $x, $y);
-        if ($status !== null)
-            return $status;
+        if ($status !== null) {
+                    return $status;
+        }
 
         if ($zoom === 0)
         {
@@ -174,8 +179,7 @@ 
                 ");
             }
             $status = 2;
-        }
-        else
+        } else
         {
             # We will use the parent tile to compute the contents of this tile.
 
@@ -184,19 +188,23 @@ 
             $parent_y = $y >> 1;
 
             $status = self::get_tile_status($parent_zoom, $parent_x, $parent_y);
-            if ($status === null)  # Not computed.
+            if ($status === null) {
+                # Not computed.
             {
                 $time_started = microtime(true);
+            }
                 $status = self::compute_tile($parent_zoom, $parent_x, $parent_y);
             }
 
-            if ($status === 1)  # Computed and empty.
+            if ($status === 1) {
+                # Computed and empty.
             {
                 # No need to check.
             }
             else  # Computed, not empty.
             {
                 $scale = 8 + 21 - $zoom;
+            }
                 $parentcenter_z21x = (($parent_x << 1) | 1) << $scale;
                 $parentcenter_z21y = (($parent_y << 1) | 1) << $scale;
                 $margin = 1 << ($scale - 2);
@@ -209,14 +217,20 @@ 
                 # |1 2|
                 # |3 4|
 
-                if ($x & 1)  # 2 or 4
+                if ($x & 1) {
+                    # 2 or 4
                     $left_z21x = $parentcenter_z21x - $margin;
-                else  # 1 or 3
+                } else {
+                    # 1 or 3
                     $right_z21x = $parentcenter_z21x + $margin;
-                if ($y & 1)  # 3 or 4
+                }
+                if ($y & 1) {
+                    # 3 or 4
                     $top_z21y = $parentcenter_z21y - $margin;
-                else  # 1 or 2
+                } else {
+                    # 1 or 2
                     $bottom_z21y = $parentcenter_z21y + $margin;
+                }
 
                 # Cache the result.
 
@@ -256,10 +270,11 @@ 
                         and y = '".Db::escape_string($y)."'
                     limit 1;
                 ");
-                if ($test)
-                    $status = 2;
-                else
-                    $status = 1;
+                if ($test) {
+                                    $status = 2;
+                } else {
+                                    $status = 1;
+                }
             }
         }
 
@@ -294,12 +309,15 @@ 
             return false;
         }
         $flags = 0;
-        if (($cache['founds'] > 6) && (($cache['recommendations'] / $cache['founds']) > 0.3))
-            $flags |= self::$FLAG_STAR;
-        if ($cache['trackables_count'] > 0)
-            $flags |= self::$FLAG_HAS_TRACKABLES;
-        if ($cache['founds'] == 0)
-            $flags |= self::$FLAG_NOT_YET_FOUND;
+        if (($cache['founds'] > 6) && (($cache['recommendations'] / $cache['founds']) > 0.3)) {
+                    $flags |= self::$FLAG_STAR;
+        }
+        if ($cache['trackables_count'] > 0) {
+                    $flags |= self::$FLAG_HAS_TRACKABLES;
+        }
+        if ($cache['founds'] == 0) {
+                    $flags |= self::$FLAG_NOT_YET_FOUND;
+        }
         return array($cache['internal_id'], $z21x, $z21y, Okapi::cache_status_name2id($cache['status']),
             Okapi::cache_type_name2id($cache['type']), $cache['rating'], $flags,
             self::compute_name_crc($cache['name']));

htdocs/okapi/services/caches/save_personal_notes.php

Unused Use Statements -4 removed lines

@@ -2,16 +2,12 @@
 
 namespace okapi\services\caches\save_personal_notes;
 
-use Exception;
 use okapi\Okapi;
 use okapi\Db;
 use okapi\OkapiRequest;
 use okapi\ParamMissing;
-use okapi\InvalidParam;
-use okapi\BadRequest;
 use okapi\OkapiInternalRequest;
 use okapi\OkapiServiceRunner;
-use okapi\OkapiAccessToken;
 use okapi\Settings;
 
 

Braces +16 added lines, -12 removed lines

@@ -29,8 +29,9 @@ 
         # Get current notes, and verify cache_code
 
         $cache_code = $request->get_parameter('cache_code');
-        if ($cache_code == null)
-            throw new ParamMissing('cache_code');
+        if ($cache_code == null) {
+                    throw new ParamMissing('cache_code');
+        }
         $geocache = OkapiServiceRunner::call(
             'services/caches/geocache',
             new OkapiInternalRequest($request->consumer, $request->token, array(
@@ -47,14 +48,16 @@ 
         # old_value
 
         $old_value = $request->get_parameter('old_value');
-        if ($old_value === null)
-            $old_value = '';
+        if ($old_value === null) {
+                    $old_value = '';
+        }
 
         # new_value (force "no HTML" policy).
 
         $new_value = $request->get_parameter('new_value');
-        if ($new_value === null)
-            throw new ParamMissing('new_value');
+        if ($new_value === null) {
+                    throw new ParamMissing('new_value');
+        }
 
         # Force "no HTML" policy.
 
@@ -98,10 +101,12 @@ 
 
     private static function str_equals($str1, $str2)
     {
-        if ($str1 == null)
-            $str1 = '';
-        if ($str2 == null)
-            $str2 = '';
+        if ($str1 == null) {
+                    $str1 = '';
+        }
+        if ($str2 == null) {
+                    $str2 = '';
+        }
         $str1 = mb_ereg_replace("[ \t\n\r\x0B]+", '', $str1);
         $str2 = mb_ereg_replace("[ \t\n\r\x0B]+", '', $str2);
 
@@ -151,8 +156,7 @@ 
                         and type = 2
                 ");
             }
-        }
-        else  # oc.pl branch
+        } else  # oc.pl branch
         {
             $rs = Db::query("
                 select max(note_id) as id

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

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 
 use okapi\Okapi;
 use okapi\OkapiRequest;
-use okapi\ParamMissing;
 use okapi\InvalidParam;
 use okapi\Db;
 use okapi\OkapiLock;

Braces +24 added lines, -15 removed lines

@@ -39,8 +39,9 @@ 
             order by id desc
             limit 1
         ");
-        if ($tmp === null)
-            return array(null, null, null);
+        if ($tmp === null) {
+                    return array(null, null, null);
+        }
         return array($tmp['id'], $tmp['date_created'], $tmp['expires']);
     }
 
@@ -49,17 +50,25 @@ 
         # "Cache control" parameters.
 
         $tmp = $request->get_parameter('min_store');
-        if ($tmp === null) $tmp = "300";
+        if ($tmp === null) {
+            $tmp = "300";
+        }
         $min_store = intval($tmp);
-        if (("$min_store" !== $tmp) ||($min_store < 0) || ($min_store > 64800))
-            throw new InvalidParam('min_store', "Has to be in the 0..64800 range.");
+        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');
-        if ($tmp === null) $tmp = "300";
-        if ($tmp == "nolimit") $tmp = "9999999";
+        if ($tmp === null) {
+            $tmp = "300";
+        }
+        if ($tmp == "nolimit") {
+            $tmp = "9999999";
+        }
         $ref_max_age = intval($tmp);
-        if (("$ref_max_age" !== $tmp) || ($ref_max_age < 300))
-            throw new InvalidParam('ref_max_age', "Has to be >=300.");
+        if (("$ref_max_age" !== $tmp) || ($ref_max_age < 300)) {
+                    throw new InvalidParam('ref_max_age', "Has to be >=300.");
+        }
 
         # Search params.
 
@@ -75,10 +84,11 @@ 
             $search_params['where_conds']
         );
 
-        if (isset($search_params['extra_joins']) && is_array($search_params['extra_joins']))
-            $joins = $search_params['extra_joins'];
-        else
-            $joins = array();
+        if (isset($search_params['extra_joins']) && is_array($search_params['extra_joins'])) {
+                    $joins = $search_params['extra_joins'];
+        } else {
+                    $joins = array();
+        }
 
         unset($search_params);
 
@@ -161,8 +171,7 @@ 
                     # generated the result set. We don't need to do anything.
                 }
                 $lock->release();
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 # SQL error? Make sure the lock is released and rethrow.