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;

Spacing +140 added lines, -140 removed lines

@@ -56,7 +56,7 @@ 
             'reason_stack' => array(),
         );
         $this->provideExtras($extras);
-        $extras['more_info'] = Settings::get('SITE_URL')."okapi/introduction.html#errors";
+        $extras['more_info'] = Settings::get('SITE_URL') . "okapi/introduction.html#errors";
         return json_encode(array("error" => $extras));
     }
 }
@@ -131,7 +131,7 @@ 
             {
                 print "\n\nBUT! Since the DEBUG flag is on, then you probably ARE a developer yourself.\n";
                 print "Let's cut to the chase then:";
-                print "\n\n".$exception_info;
+                print "\n\n" . $exception_info;
             }
             if (class_exists("okapi\\Settings") && (Settings::get('DEBUG_PREVENT_EMAILS')))
             {
@@ -140,14 +140,14 @@ 
             }
             else
             {
-                $subject = "OKAPI Method Error - ".substr(
+                $subject = "OKAPI Method Error - " . substr(
                     $_SERVER['REQUEST_URI'], 0, strpos(
-                    $_SERVER['REQUEST_URI'].'?', '?'));
+                    $_SERVER['REQUEST_URI'] . '?', '?'));
 
                 $message = (
-                    "OKAPI caught the following exception while executing API method request.\n".
-                    "This is an error in OUR code and should be fixed. Please contact the\n".
-                    "developer of the module that threw this error. Thanks!\n\n".
+                    "OKAPI caught the following exception while executing API method request.\n" .
+                    "This is an error in OUR code and should be fixed. Please contact the\n" .
+                    "developer of the module that threw this error. Thanks!\n\n" .
                     $exception_info
                 );
                 try
@@ -175,11 +175,11 @@ 
 
                     $admin_email = implode(", ", get_admin_emails());
                     $sender_email = class_exists("okapi\\Settings") ? Settings::get('FROM_FIELD') : 'root@localhost';
-                    $subject = "Fatal error mode: ".$subject;
-                    $message = "Fatal error mode: OKAPI will send at most ONE message per minute.\n\n".$message;
+                    $subject = "Fatal error mode: " . $subject;
+                    $message = "Fatal error mode: OKAPI will send at most ONE message per minute.\n\n" . $message;
                     $headers = (
-                        "Content-Type: text/plain; charset=utf-8\n".
-                        "From: OKAPI <$sender_email>\n".
+                        "Content-Type: text/plain; charset=utf-8\n" .
+                        "From: OKAPI <$sender_email>\n" .
                         "Reply-To: $sender_email\n"
                     );
                     mail($admin_email, $subject, $message, $headers);
@@ -193,9 +193,9 @@ 
         return str_replace(
             array(
                 Settings::get('DB_PASSWORD'),
-                "'".Settings::get('DB_USERNAME')."'",
+                "'" . Settings::get('DB_USERNAME') . "'",
                 Settings::get('DB_SERVER'),
-                "'".Settings::get('DB_NAME')."'"
+                "'" . Settings::get('DB_NAME') . "'"
             ),
             array(
                 "******",
@@ -218,25 +218,25 @@ 
             # by OkapiErrorHandler::handle_shutdown. Instead of printing trace, we will just print
             # the file and line.
 
-            $exception_info .= "File: ".$e->getFile()."\nLine: ".$e->getLine()."\n\n";
+            $exception_info .= "File: " . $e->getFile() . "\nLine: " . $e->getLine() . "\n\n";
         }
         else
         {
-            $exception_info .= "--- Stack trace ---\n".
-                self::removeSensitiveData($e->getTraceAsString())."\n\n";
+            $exception_info .= "--- Stack trace ---\n" .
+                self::removeSensitiveData($e->getTraceAsString()) . "\n\n";
         }
 
-        $exception_info .= (isset($_SERVER['REQUEST_URI']) ? "--- OKAPI method called ---\n".
-            preg_replace("/([?&])/", "\n$1", $_SERVER['REQUEST_URI'])."\n\n" : "");
-        $exception_info .= "--- OKAPI version ---\n".Okapi::$version_number.
-            " (".Okapi::$git_revision.")\n\n";
+        $exception_info .= (isset($_SERVER['REQUEST_URI']) ? "--- OKAPI method called ---\n" .
+            preg_replace("/([?&])/", "\n$1", $_SERVER['REQUEST_URI']) . "\n\n" : "");
+        $exception_info .= "--- OKAPI version ---\n" . Okapi::$version_number .
+            " (" . Okapi::$git_revision . ")\n\n";
 
         # This if-condition will solve some (but not all) problems when trying to execute
         # OKAPI code from command line;
         # see https://github.com/opencaching/okapi/issues/243.
         if (function_exists('getallheaders'))
         {
-            $exception_info .= "--- Request headers ---\n".implode("\n", array_map(
+            $exception_info .= "--- Request headers ---\n" . implode("\n", array_map(
                 function($k, $v) { return "$k: $v"; },
                 array_keys(getallheaders()), array_values(getallheaders())
             ));
@@ -341,7 +341,7 @@ 
         $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);
+            parent::__construct("Parameter '$paramName' has invalid value: " . $whats_wrong_about_it, $code);
         else
             parent::__construct("Parameter '$paramName' has invalid value.", $code);
     }
@@ -371,7 +371,7 @@ 
             self::$connected = true;
         }
         else
-            throw new Exception("Could not connect to MySQL: ".mysql_error());
+            throw new Exception("Could not connect to MySQL: " . mysql_error());
     }
 
     /** Fetch [{row}], return {row}. */
@@ -383,7 +383,7 @@ 
             case 0: return null;
             case 1: return $rows[0];
             default:
-                throw new DbException("Invalid query. Db::select_row returned more than one row for:\n\n".$query."\n");
+                throw new DbException("Invalid query. Db::select_row returned more than one row for:\n\n" . $query . "\n");
         }
     }
 
@@ -436,7 +436,7 @@ 
             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");
+        throw new DbException("Invalid query. Db::select_value returned more than one row for:\n\n" . $query . "\n");
     }
 
     /** Fetch all [(A), (B), (C)], return [A, B, C]. */
@@ -489,7 +489,7 @@ 
     {
         $rs = self::query($query);
         if ($rs !== true)
-            throw new DbException("Db::execute returned a result set for your query. ".
+            throw new DbException("Db::execute returned a result set for your query. " .
                 "You should use Db::select_* or Db::query for SELECT queries!");
     }
 
@@ -514,8 +514,8 @@ 
                     self::execute("repair table okapi_cache");
                     Okapi::mail_admins(
                         "okapi_cache - Automatic repair",
-                        "Hi.\n\nOKAPI detected that okapi_cache table needed ".
-                        "repairs and it has performed such\nrepairs automatically. ".
+                        "Hi.\n\nOKAPI detected that okapi_cache table needed " .
+                        "repairs and it has performed such\nrepairs automatically. " .
                         "However, this should not happen regularly!"
                     );
                 } catch (Exception $e) {
@@ -526,10 +526,10 @@ 
                         self::execute("truncate okapi_cache");
                         Okapi::mail_admins(
                             "okapi_cache was truncated",
-                            "Hi.\n\nOKAPI detected that okapi_cache table needed ".
-                            "repairs, but it failed to repair\nthe table automatically. ".
-                            "In order to counteract more severe errors, \nwe have ".
-                            "truncated the okapi_cache table to make it alive.\n".
+                            "Hi.\n\nOKAPI detected that okapi_cache table needed " .
+                            "repairs, but it failed to repair\nthe table automatically. " .
+                            "In order to counteract more severe errors, \nwe have " .
+                            "truncated the okapi_cache table to make it alive.\n" .
                             "However, this should not happen regularly!"
                         );
                     } catch (Exception $e) {
@@ -538,7 +538,7 @@ 
                 }
             }
 
-            throw new DbException("SQL Error $errno: $msg\n\nThe query was:\n".$query."\n");
+            throw new DbException("SQL Error $errno: $msg\n\nThe query was:\n" . $query . "\n");
         }
         return $rs;
     }
@@ -555,10 +555,10 @@ 
 
     public static function field_exists($table, $field)
     {
-        if (!preg_match("/[a-z0-9_]+/", $table.$field))
+        if (!preg_match("/[a-z0-9_]+/", $table . $field))
             return false;
         try {
-            $spec = self::select_all("desc ".$table.";");
+            $spec = self::select_all("desc " . $table . ";");
         } catch (Exception $e) {
             /* Table doesn't exist, probably. */
             return false;
@@ -575,7 +575,7 @@ 
 # Including OAuth internals. Preparing OKAPI Consumer and Token classes.
 #
 
-require_once($GLOBALS['rootpath']."okapi/oauth.php");
+require_once($GLOBALS['rootpath'] . "okapi/oauth.php");
 
 class OkapiConsumer extends OAuthConsumer
 {
@@ -611,7 +611,7 @@ 
      */
     const FLAG_KEY_REVOKED = 4;
 
-    public function __construct($key, $secret, $name, $url, $email, $bflags=0)
+    public function __construct($key, $secret, $name, $url, $email, $bflags = 0)
     {
         $this->key = $key;
         $this->secret = $secret;
@@ -718,7 +718,7 @@ 
 {
     public function __construct($user_id)
     {
-        parent::__construct('internal-'.$user_id, null, 'internal', $user_id);
+        parent::__construct('internal-' . $user_id, null, 'internal', $user_id);
     }
 }
 
@@ -727,7 +727,7 @@ 
 {
     public function __construct($user_id)
     {
-        parent::__construct('facade-'.$user_id, null, 'facade', $user_id);
+        parent::__construct('facade-' . $user_id, null, 'facade', $user_id);
     }
 }
 
@@ -736,7 +736,7 @@ 
 {
     public function __construct($user_id)
     {
-        parent::__construct('debug-'.$user_id, null, 'debug', $user_id);
+        parent::__construct('debug-' . $user_id, null, 'debug', $user_id);
     }
 }
 
@@ -777,8 +777,8 @@ 
 
 # Including local datastore and settings (connecting SQL database etc.).
 
-require_once($GLOBALS['rootpath']."okapi/settings.php");
-require_once($GLOBALS['rootpath']."okapi/datastore.php");
+require_once($GLOBALS['rootpath'] . "okapi/settings.php");
+require_once($GLOBALS['rootpath'] . "okapi/datastore.php");
 
 class OkapiHttpResponse
 {
@@ -809,7 +809,7 @@ 
         if (is_resource($this->body))
         {
             while (!feof($this->body))
-                print fread($this->body, 1024*1024);
+                print fread($this->body, 1024 * 1024);
         }
         else
             print $this->body;
@@ -836,14 +836,14 @@ 
      */
     public function display()
     {
-        header("HTTP/1.1 ".$this->status);
+        header("HTTP/1.1 " . $this->status);
         header("Access-Control-Allow-Origin: *");
-        header("Content-Type: ".$this->content_type);
-        header("Cache-Control: ".$this->cache_control);
+        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);
+            header("Content-Disposition: " . $this->content_disposition);
         if ($this->etag)
             header("ETag: $this->etag");
 
@@ -861,7 +861,7 @@ 
 
             header("Content-Encoding: gzip");
             $gzipped = gzencode($this->body, 5);
-            header("Content-Length: ".strlen($gzipped));
+            header("Content-Length: " . strlen($gzipped));
             print $gzipped;
         }
         else
@@ -874,7 +874,7 @@ 
 
             $length = $this->get_length();
             if ($length)
-                header("Content-Length: ".$length);
+                header("Content-Length: " . $length);
             $this->print_body();
         }
     }
@@ -887,11 +887,11 @@ 
     public function display()
     {
         header("HTTP/1.1 303 See Other");
-        header("Location: ".$this->url);
+        header("Location: " . $this->url);
     }
 }
 
-require_once ($GLOBALS['rootpath'].'okapi/lib/tbszip.php');
+require_once ($GLOBALS['rootpath'] . 'okapi/lib/tbszip.php');
 use \clsTbsZip;
 
 class OkapiZIPHttpResponse extends OkapiHttpResponse
@@ -906,7 +906,7 @@ 
 
     public function print_body()
     {
-        $this->zip->Flush(clsTbsZip::TBSZIP_DOWNLOAD|clsTbsZip::TBSZIP_NOHEADER);
+        $this->zip->Flush(clsTbsZip::TBSZIP_DOWNLOAD | clsTbsZip::TBSZIP_NOHEADER);
     }
 
     public function get_body()
@@ -938,7 +938,7 @@ 
     /** Note: This does NOT tell you if someone currently locked it! */
     public static function exists($name)
     {
-        $lockfile = Okapi::get_var_dir()."/okapi-lock-".$name;
+        $lockfile = Okapi::get_var_dir() . "/okapi-lock-" . $name;
         return file_exists($lockfile);
     }
 
@@ -957,7 +957,7 @@ 
         }
         else
         {
-            $this->lockfile = Okapi::get_var_dir()."/okapi-lock-".$name;
+            $this->lockfile = Okapi::get_var_dir() . "/okapi-lock-" . $name;
             $this->lock = fopen($this->lockfile, "wb");
         }
     }
@@ -973,7 +973,7 @@ 
         if ($this->lock !== null)
             return flock($this->lock, LOCK_EX | LOCK_NB);
         else
-            return true;  # $lock can be null only when debugging
+            return true; # $lock can be null only when debugging
     }
 
     public function release()
@@ -1059,8 +1059,8 @@ 
         Db::execute("
             replace into okapi_vars (var, value)
             values (
-                '".Db::escape_string($varname)."',
-                '".Db::escape_string($value)."');
+                '".Db::escape_string($varname) . "',
+                '".Db::escape_string($value) . "');
         ");
         self::$okapi_vars[$varname] = $value;
     }
@@ -1083,12 +1083,12 @@ 
         # Make sure we're not sending HUGE emails.
 
         if (strlen($message) > 10000) {
-            $message = substr($message, 0, 10000)."\n\n...(message clipped at 10k chars)\n";
+            $message = substr($message, 0, 10000) . "\n\n...(message clipped at 10k chars)\n";
         }
 
         # Make sure we're not spamming.
 
-        $cache_key = 'mail_admins_counter/'.(floor(time() / 3600) * 3600).'/'.md5($subject);
+        $cache_key = 'mail_admins_counter/' . (floor(time() / 3600) * 3600) . '/' . md5($subject);
         try {
             $counter = Cache::get($cache_key);
         } catch (DbException $e) {
@@ -1119,22 +1119,22 @@ 
         {
             # We are spamming. Prevent sending more emails.
 
-            $content_cache_key_prefix = 'mail_admins_spam/'.(floor(time() / 3600) * 3600).'/';
+            $content_cache_key_prefix = 'mail_admins_spam/' . (floor(time() / 3600) * 3600) . '/';
             $timeout = 86400;
             if ($counter == 6)
             {
                 self::mail_from_okapi(get_admin_emails(), "Anti-spam mode activated for '$subject'",
-                    "OKAPI has activated an \"anti-spam\" mode for the following subject:\n\n".
-                    "\"$subject\"\n\n".
-                    "Anti-spam mode is activiated when more than 5 messages with\n".
-                    "the same subject are sent within one hour.\n\n".
-                    "Additional debug information:\n".
-                    "- counter cache key: $cache_key\n".
-                    "- content prefix: $content_cache_key_prefix<n>\n".
+                    "OKAPI has activated an \"anti-spam\" mode for the following subject:\n\n" .
+                    "\"$subject\"\n\n" .
+                    "Anti-spam mode is activiated when more than 5 messages with\n" .
+                    "the same subject are sent within one hour.\n\n" .
+                    "Additional debug information:\n" .
+                    "- counter cache key: $cache_key\n" .
+                    "- content prefix: $content_cache_key_prefix<n>\n" .
                     "- content timeout: $timeout\n"
                 );
             }
-            $content_cache_key = $content_cache_key_prefix.$counter;
+            $content_cache_key = $content_cache_key_prefix . $counter;
             Cache::set($content_cache_key, $message, $timeout);
         }
     }
@@ -1152,8 +1152,8 @@ 
             $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".
-            "From: OKAPI <$sender_email>\n".
+            "Content-Type: text/plain; charset=utf-8\n" .
+            "From: OKAPI <$sender_email>\n" .
             "Reply-To: $sender_email\n"
             );
     }
@@ -1174,7 +1174,7 @@ 
             $site_url = Settings::get('SITE_URL');
         $matches = null;
         if (preg_match("#^https?://(www.)?opencaching.([a-z.]+)/$#", $site_url, $matches)) {
-            return "Opencaching.".strtoupper($matches[2]);
+            return "Opencaching." . strtoupper($matches[2]);
         } else {
             return "DEVELSITE";
         }
@@ -1198,18 +1198,18 @@ 
         /* All OCDE-based sites use exactly the same schema. */
 
         if (Settings::get('OC_BRANCH') == 'oc.de') {
-            return "OCDE";  // OC
+            return "OCDE"; // OC
         }
 
         /* All OCPL-based sites use separate schemas. (Hopefully, this will
          * change in time.) */
 
         $mapping = array(
-            2 => "OCPL",  // OP
-            6 => "OCORGUK",  // OK
-            10 => "OCUS",  // OU
-            14 => "OCNL",  // OB
-            16 => "OCRO",  // OR
+            2 => "OCPL", // OP
+            6 => "OCORGUK", // OK
+            10 => "OCUS", // OU
+            14 => "OCNL", // OB
+            16 => "OCRO", // OR
             // should be expanded when new OCPL-based sites are added
         );
         $oc_node_id = Settings::get("OC_NODE_ID");
@@ -1231,7 +1231,7 @@ 
      */
     public static function get_recommended_base_url()
     {
-        return Settings::get('SITE_URL')."okapi/";
+        return Settings::get('SITE_URL') . "okapi/";
     }
 
     /**
@@ -1261,7 +1261,7 @@ 
                 );
                 break;
             case 'OCDE':
-                if (in_array(Settings::get('OC_NODE_ID'), array(4,5))) {
+                if (in_array(Settings::get('OC_NODE_ID'), array(4, 5))) {
                     $urls = array(
                         preg_replace("/^https:/", "http:", Settings::get('SITE_URL')) . 'okapi/',
                         preg_replace("/^http:/", "https:", Settings::get('SITE_URL')) . 'okapi/',
@@ -1352,7 +1352,7 @@ 
         $nearest_event = Okapi::get_var("cron_nearest_event");
         if ($nearest_event + 0 <= time())
         {
-            require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
+            require_once($GLOBALS['rootpath'] . "okapi/cronjobs.php");
             $nearest_event = CronJobController::run_jobs('pre-request');
             Okapi::set_var("cron_nearest_event", $nearest_event);
         }
@@ -1369,7 +1369,7 @@ 
         {
             set_time_limit(0);
             ignore_user_abort(true);
-            require_once($GLOBALS['rootpath']."okapi/cronjobs.php");
+            require_once($GLOBALS['rootpath'] . "okapi/cronjobs.php");
             $nearest_event = CronJobController::run_jobs('cron-5');
             Okapi::set_var("cron_nearest_event", $nearest_event);
         }
@@ -1485,9 +1485,9 @@ 
             $chars = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789";
         $max = strlen($chars);
         $key = "";
-        for ($i=0; $i<$length; $i++)
+        for ($i = 0; $i < $length; $i++)
         {
-            $key .= $chars[rand(0, $max-1)];
+            $key .= $chars[rand(0, $max - 1)];
         }
         return $key;
     }
@@ -1499,7 +1499,7 @@ 
      */
     public static function register_new_consumer($appname, $appurl, $email)
     {
-        require_once($GLOBALS['rootpath']."okapi/service_runner.php");
+        require_once($GLOBALS['rootpath'] . "okapi/service_runner.php");
         $consumer = new OkapiConsumer(Okapi::generate_key(20), Okapi::generate_key(40),
             $appname, $appurl, $email);
         $sample_cache = OkapiServiceRunner::call("services/caches/search/all",
@@ -1517,7 +1517,7 @@ 
         print "Note: Consumer Secret is needed only when you intend to use OAuth.\n";
         print "You don't need Consumer Secret for Level 1 Authentication.\n\n";
         print "Now you can easily access Level 1 OKAPI methods. E.g.:\n";
-        print Settings::get('SITE_URL')."okapi/services/caches/geocache?cache_code=$sample_cache_code&consumer_key=$consumer->key\n\n";
+        print Settings::get('SITE_URL') . "okapi/services/caches/geocache?cache_code=$sample_cache_code&consumer_key=$consumer->key\n\n";
         print "If you plan on using OKAPI for a longer time, then you may want to\n";
         print "subscribe to the OKAPI News blog to stay up-to-date:\n";
         print "http://opencaching-api.blogspot.com/\n\n";
@@ -1538,11 +1538,11 @@ 
         Db::execute("
             insert into okapi_consumers (`key`, name, secret, url, email, date_created)
             values (
-                '".Db::escape_string($consumer->key)."',
-                '".Db::escape_string($consumer->name)."',
-                '".Db::escape_string($consumer->secret)."',
-                '".Db::escape_string($consumer->url)."',
-                '".Db::escape_string($consumer->email)."',
+                '".Db::escape_string($consumer->key) . "',
+                '".Db::escape_string($consumer->name) . "',
+                '".Db::escape_string($consumer->secret) . "',
+                '".Db::escape_string($consumer->url) . "',
+                '".Db::escape_string($consumer->email) . "',
                 now()
             );
         ");
@@ -1551,13 +1551,13 @@ 
     /** Return the distance between two geopoints, in meters. */
     public static function get_distance($lat1, $lon1, $lat2, $lon2)
     {
-        $x1 = (90-$lat1) * 3.14159 / 180;
-        $x2 = (90-$lat2) * 3.14159 / 180;
+        $x1 = (90 - $lat1) * 3.14159 / 180;
+        $x2 = (90 - $lat2) * 3.14159 / 180;
         #
         # min(1, ...) was added below to prevent getting values greater than 1 due
         # 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;
+        $d = acos(min(1, cos($x1) * cos($x2) + sin($x1) * sin($x2) * cos(($lon1 - $lon2) * 3.14159 / 180))) * 6371000;
         if ($d < 0) $d = 0;
         return $d;
     }
@@ -1595,7 +1595,7 @@ 
         $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;
     }
@@ -1662,7 +1662,7 @@ 
                 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).");";
+            $response->body = $callback . "(" . json_encode($object) . ");";
             return $response;
         }
         elseif ($format == 'xmlmap')
@@ -1732,7 +1732,7 @@ 
                 $chunks[] = "<dict>";
                 foreach ($obj as $key => &$item_ref)
                 {
-                    $chunks[] = "<item key=\"".self::xmlescape($key)."\">";
+                    $chunks[] = "<item key=\"" . self::xmlescape($key) . "\">";
                     self::_xmlmap_add($chunks, $item_ref);
                     $chunks[] = "</item>";
                 }
@@ -1742,13 +1742,13 @@ 
         else
         {
             # That's a bug.
-            throw new Exception("Cannot encode as xmlmap: " + print_r($obj, true));
+            throw new Exception("Cannot encode as xmlmap: " +print_r($obj, true));
         }
     }
 
     private static function _xmlmap2_add(&$chunks, &$obj, $key)
     {
-        $attrs = ($key !== null) ? " key=\"".self::xmlescape($key)."\"" : "";
+        $attrs = ($key !== null) ? " key=\"" . self::xmlescape($key) . "\"" : "";
         if (is_string($obj))
         {
             $chunks[] = "<string$attrs>";
@@ -1853,8 +1853,8 @@ 
         $ref = &self::$cache_types[Settings::get('OC_BRANCH')];
         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 ".
+        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.");
     }
 
@@ -2018,7 +2018,7 @@ 
 
         $html = preg_replace(
             "~\b(src|href)=([\"'])(?![a-z0-9_-]+:)~",
-            "$1=$2".Settings::get("SITE_URL"),
+            "$1=$2" . Settings::get("SITE_URL"),
             $html
         );
 
@@ -2048,10 +2048,10 @@ 
     {
         $value = trim(ini_get($variable));
         if (!preg_match("/^[0-9]+[KM]?$/", $value))
-            throw new Exception("Unexpected PHP setting: ".$variable. " = ".$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.';');
+        $value = eval('return ' . $value . ';');
         return $value;
     }
 
@@ -2060,8 +2060,8 @@ 
     const OBJECT_TYPE_CACHE_DESCRIPTION = 2;
     const OBJECT_TYPE_CACHE_IMAGE = 3;
     const OBJECT_TYPE_CACHE_MP3 = 4;
-    const OBJECT_TYPE_CACHE_LOG = 5;           # implemented
-    const OBJECT_TYPE_CACHE_LOG_IMAGE = 6;     # implemented
+    const OBJECT_TYPE_CACHE_LOG = 5; # implemented
+    const OBJECT_TYPE_CACHE_LOG_IMAGE = 6; # implemented
     const OBJECT_TYPE_CACHELIST = 7;
     const OBJECT_TYPE_EMAIL = 8;
     const OBJECT_TYPE_CACHE_REPORT = 9;
@@ -2084,14 +2084,14 @@ 
         {
             # The current cache implementation is ALWAYS persistent, so we will
             # just replace it with a big value.
-            $timeout = 100*365*86400;
+            $timeout = 100 * 365 * 86400;
         }
         Db::execute("
             replace into okapi_cache (`key`, value, expires)
             values (
-                '".Db::escape_string($key)."',
-                '".Db::escape_string(gzdeflate(serialize($value)))."',
-                date_add(now(), interval '".Db::escape_string($timeout)."' second)
+                '".Db::escape_string($key) . "',
+                '".Db::escape_string(gzdeflate(serialize($value))) . "',
+                date_add(now(), interval '".Db::escape_string($timeout) . "' second)
             );
         ");
     }
@@ -2105,8 +2105,8 @@ 
         Db::execute("
             replace into okapi_cache (`key`, value, expires, score)
             values (
-                '".Db::escape_string($key)."',
-                '".Db::escape_string(gzdeflate(serialize($value)))."',
+                '".Db::escape_string($key) . "',
+                '".Db::escape_string(gzdeflate(serialize($value))) . "',
                 date_add(now(), interval 120 day),
                 1.0
             );
@@ -2122,20 +2122,20 @@ 
         {
             # The current cache implementation is ALWAYS persistent, so we will
             # just replace it with a big value.
-            $timeout = 100*365*86400;
+            $timeout = 100 * 365 * 86400;
         }
         $entries_escaped = array();
         foreach ($dict as $key => $value)
         {
             $entries_escaped[] = "(
-                '".Db::escape_string($key)."',
-                '".Db::escape_string(gzdeflate(serialize($value)))."',
-                date_add(now(), interval '".Db::escape_string($timeout)."' second)
+                '".Db::escape_string($key) . "',
+                '".Db::escape_string(gzdeflate(serialize($value))) . "',
+                date_add(now(), interval '".Db::escape_string($timeout) . "' second)
             )";
         }
         Db::execute("
             replace into okapi_cache (`key`, value, expires)
-            values ".implode(", ", $entries_escaped)."
+            values ".implode(", ", $entries_escaped) . "
         ");
     }
 
@@ -2149,7 +2149,7 @@ 
             select value, score
             from okapi_cache
             where
-                `key` = '".Db::escape_string($key)."'
+                `key` = '".Db::escape_string($key) . "'
                 and expires > now()
         ");
         list($blob, $score) = Db::fetch_row($rs);
@@ -2159,7 +2159,7 @@ 
         {
             Db::execute("
                 insert into okapi_cache_reads (`cache_key`)
-                values ('".Db::escape_string($key)."')
+                values ('".Db::escape_string($key) . "')
             ");
         }
         return unserialize(gzinflate($blob));
@@ -2173,7 +2173,7 @@ 
             select `key`, value
             from okapi_cache
             where
-                `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys))."')
+                `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys)) . "')
                 and expires > now()
         ");
         while ($row = Db::fetch_assoc($rs))
@@ -2186,10 +2186,10 @@ 
             {
                 unset($dict[$row['key']]);
                 Okapi::mail_admins("Debug: Unserialize error",
-                    "Could not unserialize key '".$row['key']."' from Cache.\n".
-                    "Probably something REALLY big was put there and data has been truncated.\n".
-                    "Consider upgrading cache table to LONGBLOB.\n\n".
-                    "Length of data, compressed: ".strlen($row['value']));
+                    "Could not unserialize key '" . $row['key'] . "' from Cache.\n" .
+                    "Probably something REALLY big was put there and data has been truncated.\n" .
+                    "Consider upgrading cache table to LONGBLOB.\n\n" .
+                    "Length of data, compressed: " . strlen($row['value']));
             }
         }
         if (count($dict) < count($keys))
@@ -2214,7 +2214,7 @@ 
             return;
         Db::execute("
             delete from okapi_cache
-            where `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys))."')
+            where `key` in ('".implode("','", array_map('\okapi\Db::escape_string', $keys)) . "')
         ");
     }
 }
@@ -2228,7 +2228,7 @@ 
 {
     public static function get_file_path($key)
     {
-        $filename = Okapi::get_var_dir()."/okapi_filecache_".md5($key);
+        $filename = Okapi::get_var_dir() . "/okapi_filecache_" . md5($key);
         if (!file_exists($filename))
             return null;
         return $filename;
@@ -2241,7 +2241,7 @@ 
      */
     public static function set($key, $value)
     {
-        $filename = Okapi::get_var_dir()."/okapi_filecache_".md5($key);
+        $filename = Okapi::get_var_dir() . "/okapi_filecache_" . md5($key);
         file_put_contents($filename, $value);
         return $filename;
     }
@@ -2262,7 +2262,7 @@ 
 {
     public $consumer;
     public $token;
-    public $etag;  # see: http://en.wikipedia.org/wiki/HTTP_ETag
+    public $etag; # see: http://en.wikipedia.org/wiki/HTTP_ETag
 
     /**
      * Set this to true, for some method to allow you to set higher "limit"
@@ -2386,7 +2386,7 @@ 
 
             if (!Settings::get('DEBUG'))
             {
-                throw new Exception("Attempted to use DEBUG_AS_USERNAME in ".
+                throw new Exception("Attempted to use DEBUG_AS_USERNAME in " .
                     "non-debug environment. Accidental commit?");
             }
 
@@ -2417,12 +2417,12 @@ 
             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' ".
-                    "and 'oauth_consumer_key' parameters (Level 1 and Level 2), but they do not match with ".
+                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 ".
+                throw new BadRequest("This method requires a valid Token to be included (Level 3 " .
                     "Authentication). You didn't provide one.");
             }
         }
@@ -2430,8 +2430,8 @@ 
         {
             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.");
+                throw new BadRequest("This method requires OAuth signature (Level " .
+                    $this->opt_min_auth_level . " Authentication). You didn't sign your request.");
             }
             else
             {
@@ -2444,7 +2444,7 @@ 
                     }
                 }
                 if (($this->opt_min_auth_level == 1) && (!$this->consumer))
-                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 ".
+                    throw new BadRequest("This method requires the 'consumer_key' argument (Level 1 " .
                         "Authentication). You didn't provide one.");
             }
         }
@@ -2477,10 +2477,10 @@ 
             # Note, that this will override any other valid authentication the
             # developer might have issued.
 
-            $debug_user_id = Db::select_value("select user_id from user where username='".
-                Db::escape_string($options['DEBUG_AS_USERNAME'])."'");
+            $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']."'");
+                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);
         }
@@ -2516,9 +2516,9 @@ 
         }
         if (!$allowed) {
             throw new BadRequest(
-                "Unrecognized base URL prefix! See `okapi_base_urls` field ".
-                "in the `services/apisrv/installation` method. (Recommended ".
-                "base URL to use is '".Okapi::get_recommended_base_url()."'.)"
+                "Unrecognized base URL prefix! See `okapi_base_urls` field " .
+                "in the `services/apisrv/installation` method. (Recommended " .
+                "base URL to use is '" . Okapi::get_recommended_base_url() . "'.)"
             );
         }
     }

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;

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
 
         $langpref = $request->get_parameter('langpref');
         if (!$langpref) $langpref = "en";
-        $langpref .= "|".Settings::get('SITELANG');
+        $langpref .= "|" . Settings::get('SITELANG');
         $images = $request->get_parameter('images');
         if (!$images) $images = "all";
         if (!in_array($images, array("none", "all", "spoilers", "nonspoilers")))
@@ -60,14 +60,14 @@ 
         # also include image references (actual images will be added as separate files later)
         # and personal data (if the method was invoked using Level 3 Authentication).
 
-        switch($format) {
+        switch ($format) {
             case 'gpx' :
-                $data_filename = "Garmin/GPX/opencaching".time().rand(100000,999999).".gpx";
+                $data_filename = "Garmin/GPX/opencaching" . time() . rand(100000, 999999) . ".gpx";
                 $data_method = 'services/caches/formatters/gpx';
                 $data_use_compression = true;
                 break;
             case 'ggz' :
-                $data_filename = "Garmin/GGZ/opencaching".time().rand(100000,999999).".ggz";
+                $data_filename = "Garmin/GGZ/opencaching" . time() . rand(100000, 999999) . ".ggz";
                 $data_method = 'services/caches/formatters/ggz';
                 $data_use_compression = false;
                 break;
@@ -107,9 +107,9 @@ 
                 $imgs = $dict['images'];
                 if (count($imgs) == 0)
                     continue;
-                $dir = "Garmin/GeocachePhotos/".$cache_code[strlen($cache_code) - 1];
-                $dir .= "/".$cache_code[strlen($cache_code) - 2];
-                $dir .= "/".$cache_code;
+                $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']))
@@ -119,19 +119,19 @@ 
                     $tmp = false;
                     foreach ($supported_extensions as $ext)
                     {
-                        if (strtolower(substr($img['url'], strlen($img['url']) - strlen($ext) - 1)) != ".".$ext)
+                        if (strtolower(substr($img['url'], strlen($img['url']) - strlen($ext) - 1)) != "." . $ext)
                         {
                             $tmp = true;
                             continue;
                         }
                     }
                     if (!$tmp)
-                        continue;  # unsupported file extension
+                        continue; # unsupported file extension
 
                     if ($img['is_spoiler']) {
-                        $zippath = $dir."/Spoilers/".$img['unique_caption'].".jpg";
+                        $zippath = $dir . "/Spoilers/" . $img['unique_caption'] . ".jpg";
                     } else {
-                        $zippath = $dir."/".$img['unique_caption'].".jpg";
+                        $zippath = $dir . "/" . $img['unique_caption'] . ".jpg";
                     }
 
                     # The safest way would be to use the URL, but that would be painfully slow!
@@ -141,7 +141,7 @@ 
                     # Note: Oliver Dietz (oc.de) replied that images with 'local' set to 0 could not
                     # be accessed locally. But all the files have 'local' set to 1 anyway.
 
-                    $syspath = Settings::get('IMAGES_DIR')."/".$img['uuid'].".jpg";
+                    $syspath = Settings::get('IMAGES_DIR') . "/" . $img['uuid'] . ".jpg";
                     if (file_exists($syspath))
                     {
                         $response->zip->FileAdd($zippath, $syspath, clsTbsZip::TBSZIP_FILE, false);
@@ -151,13 +151,13 @@ 
                         # If file exists, but does not end with ".jpg", we will create
                         # JPEG version of it and store it in the cache.
 
-                        $cache_key = "jpg#".$img['uuid'];
+                        $cache_key = "jpg#" . $img['uuid'];
                         $jpeg_contents = Cache::get($cache_key);
                         if ($jpeg_contents === null)
                         {
                             foreach ($supported_extensions as $ext)
                             {
-                                $syspath_other = Settings::get('IMAGES_DIR')."/".$img['uuid'].".".$ext;
+                                $syspath_other = Settings::get('IMAGES_DIR') . "/" . $img['uuid'] . "." . $ext;
                                 if (file_exists($syspath_other))
                                 {
                                     try

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

Spacing +79 added lines, -79 removed lines

@@ -34,7 +34,7 @@ 
         'my_notes', 'trackables_count', 'trackables', 'alt_wpts', 'last_found',
         'last_modified', 'date_created', 'date_hidden', 'internal_id', 'is_watched',
         'is_ignored', 'willattends', 'country', 'state', 'preview_image',
-        'trip_time', 'trip_distance', 'attribution_note','gc_code', 'hint2', 'hints2',
+        'trip_time', 'trip_distance', 'attribution_note', 'gc_code', 'hint2', 'hints2',
         'protection_areas', 'short_description', 'short_descriptions', 'needs_maintenance');
 
     public static function call(OkapiRequest $request)
@@ -51,14 +51,14 @@ 
             $cache_codes = explode("|", $cache_codes);
 
         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.");
+            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).");
 
         $langpref = $request->get_parameter('langpref');
         if (!$langpref) $langpref = "en";
-        $langpref .= "|".Settings::get('SITELANG');
+        $langpref .= "|" . Settings::get('SITELANG');
         $langpref = explode("|", $langpref);
 
         $fields = $request->get_parameter('fields');
@@ -99,12 +99,12 @@ 
             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)."'");
+            $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))
@@ -136,7 +136,7 @@ 
                 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).".");
+                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))
@@ -178,7 +178,7 @@ 
                     caches c
                     left join stat_caches as sc on c.cache_id = sc.cache_id
                 where
-                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                     and status in (1,2,3)
             ");
         }
@@ -209,7 +209,7 @@ 
                 from
                     caches c
                 where
-                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                     and c.status in (1,2,3)
             ");
         }
@@ -239,11 +239,11 @@ 
                         break;
                     case 'name': $entry['name'] = $row['name']; break;
                     case 'names': $entry['names'] = array(Settings::get('SITELANG') => $row['name']); break; // for the future
-                    case 'location': $entry['location'] = round($row['latitude'], 6)."|".round($row['longitude'], 6); break;
+                    case 'location': $entry['location'] = round($row['latitude'], 6) . "|" . round($row['longitude'], 6); break;
                     case 'type': $entry['type'] = Okapi::cache_type_id2name($row['type']); break;
                     case 'status': $entry['status'] = Okapi::cache_status_id2name($row['status']); break;
                     case 'needs_maintenance': $entry['needs_maintenance'] = $row['needs_maintenance'] > 0; break;
-                    case 'url': $entry['url'] = Settings::get('SITE_URL')."viewcache.php?wp=".$row['wp_oc']; break;
+                    case 'url': $entry['url'] = Settings::get('SITE_URL') . "viewcache.php?wp=" . $row['wp_oc']; break;
                     case 'owner':
                         $owner_ids[$row['wp_oc']] = $row['user_id'];
                         /* continued later */
@@ -253,7 +253,7 @@ 
                         break;
                     case 'bearing':
                         $tmp = Okapi::get_bearing($center_lat, $center_lon, $row['latitude'], $row['longitude']);
-                        $entry['bearing'] = ($tmp !== null) ? ((int)(10*$tmp)) / 10.0 : null;
+                        $entry['bearing'] = ($tmp !== null) ? ((int)(10 * $tmp)) / 10.0 : null;
                         break;
                     case 'bearing2':
                         $tmp = Okapi::get_bearing($center_lat, $center_lon, $row['latitude'], $row['longitude']);
@@ -287,13 +287,13 @@ 
                         switch (Okapi::cache_sizeid_to_size2($row['size']))
                         {
                             case 'none': $entry['size'] = null; break;
-                            case 'nano': $entry['size'] = 1.0; break;  # same as micro
+                            case 'nano': $entry['size'] = 1.0; break; # same as micro
                             case 'micro': $entry['size'] = 1.0; break;
                             case 'small': $entry['size'] = 2.0; break;
                             case 'regular': $entry['size'] = 3.0; break;
                             case 'large': $entry['size'] = 4.0; break;
                             case 'xlarge': $entry['size'] = 5.0; break;
-                            case 'other': $entry['size'] = null; break;  # same as none
+                            case 'other': $entry['size'] = null; break; # same as none
                             default: throw new Exception();
                         }
                         break;
@@ -304,12 +304,12 @@ 
                     case 'trip_time':
                         # search time is entered in hours:minutes and converted to decimal hours,
                         # which can produce lots of unneeded decimal places; 2 of them are sufficient here
-                        $entry['trip_time'] = $row['trip_time'] === null ? null : round($row['trip_time'],2); break;
+                        $entry['trip_time'] = $row['trip_time'] === null ? null : round($row['trip_time'], 2); break;
                         break;
                     case 'trip_distance':
                         # way length is entered in km as decimal fraction, but number conversions can
                         # create fake digits which should be stripped; meter precision is sufficient here
-                        $entry['trip_distance'] = $row['trip_distance'] === null ? null : round($row['trip_distance'],3); break;
+                        $entry['trip_distance'] = $row['trip_distance'] === null ? null : round($row['trip_distance'], 3); break;
                         break;
                     case 'rating':
                         if ($row['votes'] < 3) $entry['rating'] = null;
@@ -348,7 +348,7 @@ 
                     case 'internal_id': $entry['internal_id'] = $row['cache_id']; break;
                     case 'attribution_note': /* handled separately */ break;
                     case 'protection_areas': /* handled separately */ break;
-                    default: throw new Exception("Missing field case: ".$field);
+                    default: throw new Exception("Missing field case: " . $field);
                 }
             }
             $results[$row['wp_oc']] = $entry;
@@ -364,7 +364,7 @@ 
             $rs = Db::query("
                 select user_id, uuid, username
                 from user
-                where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_values($owner_ids)))."')
+                where user_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_values($owner_ids))) . "')
             ");
             $tmp = array();
             while ($row = Db::fetch_assoc($rs))
@@ -375,7 +375,7 @@ 
                 $result_ref['owner'] = array(
                     'uuid' => $row['uuid'],
                     'username' => $row['username'],
-                    'profile_url' => Settings::get('SITE_URL')."viewprofile.php?userid=".$row['user_id']
+                    'profile_url' => Settings::get('SITE_URL') . "viewprofile.php?userid=" . $row['user_id']
                 );
             }
         }
@@ -394,11 +394,11 @@ 
                 where
                     c.cache_id = cl.cache_id
                     and cl.type in (
-                        '".Db::escape_string(Okapi::logtypename2id("Found it"))."',
-                        '".Db::escape_string(Okapi::logtypename2id("Attended"))."'
+                        '".Db::escape_string(Okapi::logtypename2id("Found it")) . "',
+                        '".Db::escape_string(Okapi::logtypename2id("Attended")) . "'
                     )
-                    and cl.user_id = '".Db::escape_string($user_id)."'
-                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
+                    and cl.user_id = '".Db::escape_string($user_id) . "'
+                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "") . "
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -420,9 +420,9 @@ 
                     cache_logs cl
                 where
                     c.cache_id = cl.cache_id
-                    and cl.type = '".Db::escape_string(Okapi::logtypename2id("Didn't find it"))."'
-                    and cl.user_id = '".Db::escape_string($user_id)."'
-                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "")."
+                    and cl.type = '".Db::escape_string(Okapi::logtypename2id("Didn't find it")) . "'
+                    and cl.user_id = '".Db::escape_string($user_id) . "'
+                    ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "and cl.deleted = 0" : "") . "
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -444,7 +444,7 @@ 
                     cache_watches cw
                 where
                     c.cache_id = cw.cache_id
-                    and cw.user_id = '".Db::escape_string($request->token->user_id)."'
+                    and cw.user_id = '".Db::escape_string($request->token->user_id) . "'
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -462,7 +462,7 @@ 
                   where
                       cli.cache_id = c.cache_id
                       and clw.cache_list_id = cli.cache_list_id
-                      and clw.user_id = '".Db::escape_string($request->token->user_id)."'
+                      and clw.user_id = '".Db::escape_string($request->token->user_id) . "'
               ");
               foreach ($tmp as $cache_code)
                   $tmp2[$cache_code] = true;
@@ -485,7 +485,7 @@ 
                     cache_ignore ci
                 where
                     c.cache_id = ci.cache_id
-                    and ci.user_id = '".Db::escape_string($request->token->user_id)."'
+                    and ci.user_id = '".Db::escape_string($request->token->user_id) . "'
             ");
             $tmp2 = array();
             foreach ($tmp as $cache_code)
@@ -517,7 +517,7 @@ 
             $rs = Db::query("
                 select cache_id, language, `desc`, short_desc, hint
                 from cache_desc
-                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
+                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
             ");
             while ($row = Db::fetch_assoc($rs))
             {
@@ -534,11 +534,11 @@ 
                     {
                         Okapi::gettext_domain_init(array_merge(array($row['language']), $langpref));
                         $tmp = (
-                            "<p style='color:#c00000'><strong>".
-                            _('Parts of this geocache listing may be outdated.').
-                            "</strong> ".
-                            _('See the log entries for more information.').
-                            "</p>\n".
+                            "<p style='color:#c00000'><strong>" .
+                            _('Parts of this geocache listing may be outdated.') .
+                            "</strong> " .
+                            _('See the log entries for more information.') .
+                            "</p>\n" .
                             $tmp
                         );
                         Okapi::gettext_domain_restore();
@@ -546,11 +546,11 @@ 
 
                     if ($attribution_append != 'none')
                     {
-                        $tmp .= "\n<p><em>".
+                        $tmp .= "\n<p><em>" .
                             self::get_cache_attribution_note(
                                 $row['cache_id'], strtolower($row['language']), $langpref,
                                 $results[$cache_code]['owner'], $attribution_append
-                            ).
+                            ) .
                             "</em></p>";
                     }
                     $results[$cache_code]['descriptions'][strtolower($row['language'])] = $tmp;
@@ -563,7 +563,7 @@ 
                 {
                     $results[$cache_code]['hints'][strtolower($row['language'])] = $row['hint'];
                     $results[$cache_code]['hints2'][strtolower($row['language'])]
-                        = htmlspecialchars_decode(mb_ereg_replace("<br />", "" , $row['hint']), ENT_COMPAT);
+                        = htmlspecialchars_decode(mb_ereg_replace("<br />", "", $row['hint']), ENT_COMPAT);
                 }
             }
             foreach ($results as &$result_ref)
@@ -601,10 +601,10 @@ 
             else
                 $preview_field = "0";
             $rs = Db::query("
-                select object_id, uuid, url, title, spoiler, ".$preview_field." as preview
+                select object_id, uuid, url, title, spoiler, ".$preview_field . " as preview
                 from pictures
                 where
-                    object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
+                    object_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
                     and display = 1
                     and object_type = 2
                     and unknown_format = 0
@@ -630,7 +630,7 @@ 
                 $image = array(
                     'uuid' => $row['uuid'],
                     'url' => $row['url'],
-                    'thumb_url' => Settings::get('SITE_URL') . 'thumbs.php?'.$object_type_param.'uuid=' . $row['uuid'],
+                    'thumb_url' => Settings::get('SITE_URL') . 'thumbs.php?' . $object_type_param . 'uuid=' . $row['uuid'],
                     'caption' => $row['title'],
                     'unique_caption' => self::get_unique_caption($row['title']),
                     'is_spoiler' => ($row['spoiler'] ? true : false),
@@ -658,13 +658,13 @@ 
 
             # Load internal_attr_id => acode mapping.
 
-            require_once($GLOBALS['rootpath'].'okapi/services/attrs/attr_helper.inc.php');
+            require_once($GLOBALS['rootpath'] . 'okapi/services/attrs/attr_helper.inc.php');
             $internal2acode = AttrHelper::get_internal_id_to_acode_mapping();
 
             $rs = Db::query("
                 select cache_id, attrib_id
                 from caches_attributes
-                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
+                where cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
             ");
             while ($row = Db::fetch_assoc($rs))
             {
@@ -721,9 +721,9 @@ 
                 select cache_id, uuid
                 from cache_logs
                 where
-                    cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
-                    and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
-                order by cache_id, ".$logs_order_field_SQL." desc, date_created desc, id desc
+                    cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
+                    and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
+                order by cache_id, ".$logs_order_field_SQL . " desc, date_created desc, id desc
             ");
 
             $loguuids = array();
@@ -808,8 +808,8 @@ 
                     select cache_id, max(date) as date, group_concat(`desc`) as `desc`
                     from cache_notes
                     where
-                        cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
-                        and user_id = '".Db::escape_string($request->token->user_id)."'
+                        cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
+                        and user_id = '".Db::escape_string($request->token->user_id) . "'
                     group by cache_id
                 ");
             }
@@ -822,8 +822,8 @@ 
                     from coordinates
                     where
                         type = 2  -- personal note
-                        and cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."')
-                        and user_id = '".Db::escape_string($request->token->user_id)."'
+                        and cache_id in ('".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "')
+                        and user_id = '".Db::escape_string($request->token->user_id) . "'
                     group by cache_id
                 ");
             }
@@ -849,7 +849,7 @@ 
                     gk_item gki
                 where
                     gkiw.id = gki.id
-                    and gkiw.wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    and gkiw.wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
             ");
             $trs = array();
             while ($row = Db::fetch_assoc($rs))
@@ -862,9 +862,9 @@ 
                 foreach ($trs[$cache_code] as $t)
                 {
                     $result_ref['trackables'][] = array(
-                        'code' => 'GK'.str_pad(strtoupper(dechex($t['gk_id'])), 4, "0", STR_PAD_LEFT),
+                        'code' => 'GK' . str_pad(strtoupper(dechex($t['gk_id'])), 4, "0", STR_PAD_LEFT),
                         'name' => $t['name'],
-                        'url' => 'http://geokrety.org/konkret.php?id='.$t['gk_id']
+                        'url' => 'http://geokrety.org/konkret.php?id=' . $t['gk_id']
                     );
                 }
             }
@@ -883,7 +883,7 @@ 
                 $rs = Db::query("
                     select wp as cache_code, count(*) as count
                     from gk_item_waypoint
-                    where wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                    where wp in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                     group by wp
                 ");
                 $tr_counts = new ArrayObject();
@@ -936,7 +936,7 @@ 
 
             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)))."'";
+            $cache_codes_escaped_and_imploded = "'" . implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "'";
 
             if (Settings::get('OC_BRANCH') == 'oc.pl')
             {
@@ -966,7 +966,7 @@ 
                         end as okapi_type
                     from waypoints
                     where
-                        cache_id in (".$cache_codes_escaped_and_imploded.")
+                        cache_id in (".$cache_codes_escaped_and_imploded . ")
                         and status = 1
                     order by cache_id, stage, `desc`
                 ");
@@ -1002,7 +1002,7 @@ 
                     from coordinates
                     where
                         type = 1
-                        and cache_id in (".$cache_codes_escaped_and_imploded.")
+                        and cache_id in (".$cache_codes_escaped_and_imploded . ")
                     order by cache_id, id
                 ");
             }
@@ -1010,7 +1010,7 @@ 
             foreach ($cacheid2waypoints as $cache_id => $waypoints)
             {
                 $cache_code = $cacheid2wptcode[$cache_id];
-                $wpt_format = $cache_code."-%0".strlen(count($waypoints))."d";
+                $wpt_format = $cache_code . "-%0" . strlen(count($waypoints)) . "d";
                 $index = 0;
                 foreach ($waypoints as $row)
                 {
@@ -1023,11 +1023,11 @@ 
                     $index++;
                     $results[$cache_code]['alt_wpts'][] = array(
                         'name' => sprintf($wpt_format, $index),
-                        'location' => round($row['latitude'], 6)."|".round($row['longitude'], 6),
+                        'location' => round($row['latitude'], 6) . "|" . round($row['longitude'], 6),
                         'type' => $row['okapi_type'],
                         'type_name' => Okapi::pick_best_language($internal_wpt_type_id2names[$row['internal_type_id']], $langpref),
                         'sym' => $row['sym'],
-                        'description' => ($row['stage'] ? _("Stage")." ".$row['stage'].": " : "").$row['desc'],
+                        'description' => ($row['stage'] ? _("Stage") . " " . $row['stage'] . ": " : "") . $row['desc'],
                     );
                 }
             }
@@ -1045,7 +1045,7 @@ 
                         from cache_mod_cords
                         where
                             cache_id in ($cache_codes_escaped_and_imploded)
-                            and user_id = '".Db::escape_string($request->token->user_id)."'
+                            and user_id = '" . Db::escape_string($request->token->user_id) . "'
                     ");
                 } else {
                     # oc.de
@@ -1055,7 +1055,7 @@ 
                         from coordinates
                         where
                             cache_id in ($cache_codes_escaped_and_imploded)
-                            and user_id = '".Db::escape_string($request->token->user_id)."'
+                            and user_id = '" . Db::escape_string($request->token->user_id) . "'
                             and type = 2
                             and longitude != 0
                             and latitude != 0
@@ -1068,8 +1068,8 @@ 
                     {
                         # there should be only one user waypoint per cache...
                         $results[$cache_code]['alt_wpts'][] = array(
-                            'name' => $cache_code.'-USER-COORDS',
-                            'location' => round($row['latitude'], 6)."|".round($row['longitude'], 6),
+                            'name' => $cache_code . '-USER-COORDS',
+                            'location' => round($row['latitude'], 6) . "|" . round($row['longitude'], 6),
                             'type' => 'user-coords',
                             'type_name' => _("User location"),
                             'sym' => 'Block, Green',
@@ -1114,7 +1114,7 @@ 
                         inner join countries on countries.short=c.country
                         inner join sys_trans_text stt on stt.trans_id = countries.trans_id
                     where
-                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                 ");
                 $country_codes2names = array();
                 while ($row = Db::fetch_assoc($rs))
@@ -1131,7 +1131,7 @@ 
                         caches c
                         left join cache_location cl on c.cache_id = cl.cache_id
                     where
-                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                 ");
                 while ($row = Db::fetch_assoc($rs))
                 {
@@ -1159,7 +1159,7 @@ 
                         caches c,
                         cache_location cl
                     where
-                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes))."')
+                        c.wp_oc in ('".implode("','", array_map('\okapi\Db::escape_string', $cache_codes)) . "')
                         and c.cache_id = cl.cache_id
                 ");
                 while ($row = Db::fetch_assoc($rs))
@@ -1203,7 +1203,7 @@ 
 
         if (in_array('protection_areas', $fields))
         {
-            $cache_ids_escaped_and_imploded = "'".implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode)))."'";
+            $cache_ids_escaped_and_imploded = "'" . implode("','", array_map('\okapi\Db::escape_string', array_keys($cacheid2wptcode))) . "'";
 
             if (Settings::get('OC_BRANCH') == 'oc.de')
             {
@@ -1218,7 +1218,7 @@ 
                         inner join npa_areas on cache_npa_areas.npa_id = npa_areas.id
                         inner join npa_types on npa_areas.type_id = npa_types.id
                     where
-                        c.cache_id in (".$cache_ids_escaped_and_imploded.")
+                        c.cache_id in (".$cache_ids_escaped_and_imploded . ")
                     group by npa_areas.type_id, npa_areas.name
                     order by npa_types.ordinal
                 ");
@@ -1233,14 +1233,14 @@ 
                 $rs = Db::query("
                     select
                         c.wp_oc as cache_code,
-                        '"._('National Park / Landscape')."' as type,
+                        '"._('National Park / Landscape') . "' as type,
                         CONVERT(parkipl.name USING utf8) as name
                     from
                         caches c
                         inner join cache_npa_areas on cache_npa_areas.cache_id=c.cache_id
                         inner join parkipl on cache_npa_areas.parki_id=parkipl.id
                     where
-                        c.cache_id in (".$cache_ids_escaped_and_imploded.")
+                        c.cache_id in (".$cache_ids_escaped_and_imploded . ")
                         and cache_npa_areas.parki_id != 0
                     union
                     select
@@ -1252,7 +1252,7 @@ 
                         inner join cache_npa_areas on cache_npa_areas.cache_id=c.cache_id
                         inner join npa_areas on cache_npa_areas.npa_id=npa_areas.id
                     where
-                        c.cache_id in (".$cache_ids_escaped_and_imploded.")
+                        c.cache_id in (".$cache_ids_escaped_and_imploded . ")
                         and cache_npa_areas.npa_id != 0
                 ");
             }
@@ -1321,7 +1321,7 @@ 
                     'description', 'descriptions'
                 ), $fields)) > 0)
             ) {
-                require_once($GLOBALS['rootpath'].'okapi/lib/ocpl_access_logs.php');
+                require_once($GLOBALS['rootpath'] . 'okapi/lib/ocpl_access_logs.php');
                 \okapi\OCPLAccessLogs::log_geocache_access($request, $cache_ids);
             }
         }
@@ -1340,7 +1340,7 @@ 
         # Garmin and cannot determine WHY. That's why we won't use captions until we
         # know more.
 
-        $caption = self::$caption_no."";
+        $caption = self::$caption_no . "";
         self::$caption_no++;
         return $caption;
 
@@ -1404,7 +1404,7 @@ 
         # which replicates geocaches!
 
         $site_name = Okapi::get_normalized_site_name();
-        $cache_url = $site_url."viewcache.php?cacheid=$cache_id";
+        $cache_url = $site_url . "viewcache.php?cacheid=$cache_id";
 
         Okapi::gettext_domain_init(array_merge(array($lang), $langpref));
         if (Settings::get('OC_BRANCH') == 'oc.pl')
@@ -1424,8 +1424,8 @@ 
             {
                 $note = sprintf(
                     _(
-                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, ".
-                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>, ".
+                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, " .
+                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>, " .
                         "as of %s; all log entries &copy; their authors"
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name, strftime('%x')
@@ -1435,8 +1435,8 @@ 
             {
                 $note = sprintf(
                     _(
-                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, ".
-                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>; ".
+                        "&copy; <a href='%s'>%s</a>, <a href='%s'>%s</a>, " .
+                        "<a href='http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en'>CC-BY-NC-ND</a>; " .
                         "all log entries &copy; their authors"
                     ),
                     $owner['profile_url'], $owner['username'], $cache_url, $site_name

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

Spacing +28 added lines, -28 removed lines

@@ -73,7 +73,7 @@ 
             from okapi_tile_caches
             where
                 z=0
-                and cache_id = '".Db::escape_string($cache['internal_id'])."'
+                and cache_id = '".Db::escape_string($cache['internal_id']) . "'
         "));
 
         # Caches near the poles caused our computations to break here. We will
@@ -122,7 +122,7 @@ 
 
         Db::execute("
             delete from okapi_tile_caches
-            where cache_id = '".Db::escape_string($cache_id)."'
+            where cache_id = '".Db::escape_string($cache_id) . "'
         ");
 
         # Note, that after this operation, okapi_tile_status may be out-of-date.
@@ -145,8 +145,8 @@ 
 
         $z21x = $row[1];
         $z21y = $row[2];
-        $ex = $z21x >> 8;  # initially, z21x / <tile width>
-        $ey = $z21y >> 8;  # initially, z21y / <tile height>
+        $ex = $z21x >> 8; # initially, z21x / <tile width>
+        $ey = $z21y >> 8; # initially, z21y / <tile height>
         for ($zoom = 21; $zoom >= 0; $zoom--, $ex >>= 1, $ey >>= 1)
         {
             # ($ex, $ey) points to the "exact match" tile. We need to determine
@@ -154,9 +154,9 @@ 
             # 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)
@@ -164,7 +164,7 @@ 
                 list($x, $y) = $coords;
 
                 $scale = 8 + 21 - $zoom;
-                $margin = 1 << ($scale - 3);  # 32px of current $zoom level, measured in z21 pixels.
+                $margin = 1 << ($scale - 3); # 32px of current $zoom level, measured in z21 pixels.
 
                 $left_z21x = ($x << $scale) - $margin;
                 $right_z21x = (($x + 1) << $scale) + $margin;
@@ -195,9 +195,9 @@ 
         {
             list($z, $x, $y) = $coords;
             $alternatives_escaped[] = "(
-                z = '".Db::escape_string($z)."'
-                and x = '".Db::escape_string($x)."'
-                and y = '".Db::escape_string($y)."'
+                z = '".Db::escape_string($z) . "'
+                and x = '".Db::escape_string($x) . "'
+                and y = '".Db::escape_string($y) . "'
             )";
         }
         if (count($alternatives_escaped) > 0)
@@ -208,17 +208,17 @@ 
                 )
                 select
                     z, x, y,
-                    '".Db::escape_string($row[0])."',
-                    '".Db::escape_string($row[1])."',
-                    '".Db::escape_string($row[2])."',
-                    '".Db::escape_string($row[3])."',
-                    '".Db::escape_string($row[4])."',
-                    ".(($row[5] === null) ? "null" : "'".Db::escape_string($row[5])."'").",
-                    '".Db::escape_string($row[6])."',
-                    '".Db::escape_string($row[7])."'
+                    '".Db::escape_string($row[0]) . "',
+                    '".Db::escape_string($row[1]) . "',
+                    '".Db::escape_string($row[2]) . "',
+                    '".Db::escape_string($row[3]) . "',
+                    '".Db::escape_string($row[4]) . "',
+                    ".(($row[5] === null) ? "null" : "'" . Db::escape_string($row[5]) . "'") . ",
+                    '".Db::escape_string($row[6]) . "',
+                    '".Db::escape_string($row[7]) . "'
                 from okapi_tile_status
                 where
-                    (".implode(" or ", $alternatives_escaped).")
+                    (".implode(" or ", $alternatives_escaped) . ")
                     and status in (1,2)
             ");
 
@@ -229,7 +229,7 @@ 
                 update okapi_tile_status
                 set status=2
                 where
-                    (".implode(" or ", $alternatives_escaped).")
+                    (".implode(" or ", $alternatives_escaped) . ")
                     and status=1
             ");
         }
@@ -246,13 +246,13 @@ 
         Db::execute("
             update okapi_tile_caches
             set
-                status = '".Db::escape_string($row[3])."',
-                type = '".Db::escape_string($row[4])."',
-                rating = ".(($row[5] === null) ? "null" : "'".Db::escape_string($row[5])."'").",
-                flags = '".Db::escape_string($row[6])."',
-                name_crc = '".Db::escape_string($row[7])."'
+                status = '".Db::escape_string($row[3]) . "',
+                type = '".Db::escape_string($row[4]) . "',
+                rating = ".(($row[5] === null) ? "null" : "'" . Db::escape_string($row[5]) . "'") . ",
+                flags = '".Db::escape_string($row[6]) . "',
+                name_crc = '".Db::escape_string($row[7]) . "'
             where
-                cache_id = '".Db::escape_string($row[0])."'
+                cache_id = '".Db::escape_string($row[0]) . "'
         ");
     }
 
@@ -263,7 +263,7 @@ 
         $cache_id = Db::select_value("
             select cache_id
             from caches
-            where wp_oc='".Db::escape_string($c['object_key']['code'])."'
+            where wp_oc='".Db::escape_string($c['object_key']['code']) . "'
         ");
         self::remove_geocache_from_cached_tiles($cache_id);
     }

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

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
 
 require_once('tiletree.inc.php');
 require_once('tilerenderer.inc.php');
-require_once($GLOBALS['rootpath']."okapi/services/caches/search/searching.inc.php");
+require_once($GLOBALS['rootpath'] . "okapi/services/caches/search/searching.inc.php");
 
 class WebService
 {
@@ -88,10 +88,10 @@ 
             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
@@ -128,7 +128,7 @@ 
         {
             # Load user-related cache ids.
 
-            $cache_key = "tileuser/".$request->token->user_id;
+            $cache_key = "tileuser/" . $request->token->user_id;
             $user = self::$USE_OTHER_CACHE ? Cache::get($cache_key) : null;
             if ($user === null)
             {
@@ -139,7 +139,7 @@ 
                 $rs = Db::query("
                     select cache_id
                     from cache_ignore
-                    where user_id = '".Db::escape_string($request->token->user_id)."'
+                    where user_id = '".Db::escape_string($request->token->user_id) . "'
                 ");
                 $user['ignored'] = array();
                 while (list($cache_id) = Db::fetch_row($rs))
@@ -151,9 +151,9 @@ 
                     select distinct cache_id
                     from cache_logs
                     where
-                        user_id = '".Db::escape_string($request->token->user_id)."'
+                        user_id = '".Db::escape_string($request->token->user_id) . "'
                         and type = 1
-                        and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true")."
+                        and ".((Settings::get('OC_BRANCH') == 'oc.pl') ? "deleted = 0" : "true") . "
                 ");
                 $user['found'] = array();
                 while (list($cache_id) = Db::fetch_row($rs))
@@ -164,7 +164,7 @@ 
                 $rs = Db::query("
                     select distinct cache_id
                     from caches
-                    where user_id = '".Db::escape_string($request->token->user_id)."'
+                    where user_id = '".Db::escape_string($request->token->user_id) . "'
                 ");
                 $user['own'] = array();
                 while (list($cache_id) = Db::fetch_row($rs))
@@ -182,9 +182,9 @@ 
                 # the current user is the owner).
 
                 if (isset($user['found'][$row_ref[0]]))
-                    $row_ref[6] |= TileTree::$FLAG_FOUND;  # $row[6] is "flags"
+                    $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"
+                    $row_ref[6] |= TileTree::$FLAG_OWN; # $row[6] is "flags"
             }
         }
 
@@ -199,7 +199,7 @@ 
         $response = new OkapiHttpResponse();
         $response->content_type = $tile->get_content_type();
         $response->cache_control = "Cache-Control: private, max-age=600";
-        $response->etag = 'W/"'.$image_fingerprint.'"';
+        $response->etag = 'W/"' . $image_fingerprint . '"';
         $response->allow_gzip = false; // images are usually compressed, prevent compression at Apache level
 
         # Check if the request didn't include the same ETag.
@@ -218,7 +218,7 @@ 
 
         # Check if the image was recently rendered and is kept in image cache.
 
-        $cache_key = "tile/".$image_fingerprint;
+        $cache_key = "tile/" . $image_fingerprint;
         $response->body = self::$USE_IMAGE_CACHE ? Cache::get($cache_key) : null;
         OkapiServiceRunner::save_stats_extra("caches/map/tile/checkpointC", null,
             microtime(true) - $checkpointC_started);

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

Spacing +42 added lines, -42 removed lines

@@ -101,8 +101,8 @@ 
         return ob_get_clean();
     }
 
-    private static function get_image($name, $opacity=1, $brightness=0,
-        $contrast=0, $r=0, $g=0, $b=0)
+    private static function get_image($name, $opacity = 1, $brightness = 0,
+        $contrast = 0, $r = 0, $g = 0, $b = 0)
     {
         static $locmem_cache = array();
 
@@ -115,7 +115,7 @@ 
 
             try
             {
-                $cache_key = "tilesrc/".Okapi::$git_revision."/".self::$VERSION."/".$key;
+                $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)
@@ -128,7 +128,7 @@ 
             {
                 # Miss again (or error decoding). Read the image from PNG.
 
-                $locmem_cache[$key] = imagecreatefrompng($GLOBALS['rootpath']."okapi/static/tilemap/$name.png");
+                $locmem_cache[$key] = imagecreatefrompng($GLOBALS['rootpath'] . "okapi/static/tilemap/$name.png");
 
                 # Apply all wanted effects.
 
@@ -165,9 +165,9 @@ 
         $w = imagesx($im);
         $h = imagesy($im);
 
-        for($x = 0; $x < $w; $x++)
+        for ($x = 0; $x < $w; $x++)
         {
-            for($y = 0; $y < $h; $y++)
+            for ($y = 0; $y < $h; $y++)
             {
                 $color = imagecolorat($im, $x, $y);
                 $new_color = ((max(0, floor(127 - ((127 - (($color >> 24) & 0x7f)) * $ratio))) & 0x7f) << 24) | ($color & 0x80ffffff);
@@ -247,7 +247,7 @@ 
 
         # Put the inner marker (indicates the type).
 
-        $inner_marker = self::get_image("large_inner_".self::get_type_suffix(
+        $inner_marker = self::get_image("large_inner_" . self::get_type_suffix(
             $type, true), $a, $br, $c, $r, $g, $b);
         imagecopy($this->im, $inner_marker, $px - 7, $py - 22, 0, 0, 16, 16);
 
@@ -287,7 +287,7 @@ 
 
         if ($found)
         {
-            $icon = self::get_image("found", 0.7*$a, $br, $c, $r, $g, $b);
+            $icon = self::get_image("found", 0.7 * $a, $br, $c, $r, $g, $b);
             imagecopy($this->im, $icon, $px - 2, $py - $center_y - 3, 0, 0, 16, 16);
         }
 
@@ -302,16 +302,16 @@ 
         $lines = array();
         $line = "";
         $nextBonus = "";
-        for ($i=0; ($i<count($words)) || (mb_strlen($nextBonus)>0); $i++) {
-            $word = isset($words[$i])?$words[$i]:"";
+        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;
+                $word = $nextBonus . " " . $word;
             $nextBonus = "";
             while (true) {
-                $bbox = imagettfbbox($size, 0, $font, $line.$word);
-                $width = $bbox[2]-$bbox[0];
+                $bbox = imagettfbbox($size, 0, $font, $line . $word);
+                $width = $bbox[2] - $bbox[0];
                 if ($width <= $maxWidth) {
-                    $line .= $word." ";
+                    $line .= $word . " ";
                     continue 2;
                 }
                 if (mb_strlen($line) > 0) {
@@ -319,8 +319,8 @@ 
                     $line = "";
                     continue;
                 }
-                $nextBonus = $word[mb_strlen($word)-1].$nextBonus;
-                $word = mb_substr($word, 0, mb_strlen($word)-1);
+                $nextBonus = $word[mb_strlen($word) - 1] . $nextBonus;
+                $word = mb_substr($word, 0, mb_strlen($word) - 1);
                 continue;
             }
         }
@@ -336,16 +336,16 @@ 
     {
         # Check cache.
 
-        $cache_key = "tilecaption/".self::$VERSION."/".$cache_id."/".$name_crc;
+        $cache_key = "tilecaption/" . self::$VERSION . "/" . $cache_id . "/" . $name_crc;
         $gd2 = self::$USE_CAPTIONS_CACHE ? Cache::get($cache_key) : null;
         if ($gd2 === null)
         {
             # We'll work with 16x bigger image to get smoother interpolation.
 
-            $im = imagecreatetruecolor(64*4, 26*4);
+            $im = imagecreatetruecolor(64 * 4, 26 * 4);
             imagealphablending($im, false);
             $transparent = imagecolorallocatealpha($im, 255, 255, 255, 127);
-            imagefilledrectangle($im, 0, 0, 64*4, 26*4, $transparent);
+            imagefilledrectangle($im, 0, 0, 64 * 4, 26 * 4, $transparent);
             imagealphablending($im, true);
 
             # Get the name of the cache.
@@ -353,15 +353,15 @@ 
             $name = Db::select_value("
                 select name
                 from caches
-                where cache_id = '".Db::escape_string($cache_id)."'
+                where cache_id = '".Db::escape_string($cache_id) . "'
             ");
 
             # Split the name into a couple of lines.
 
             //$font = $GLOBALS['rootpath'].'util.sec/bt.ttf';
-            $font = $GLOBALS['rootpath'].'okapi/static/tilemap/tahoma.ttf';
+            $font = $GLOBALS['rootpath'] . 'okapi/static/tilemap/tahoma.ttf';
             $size = 25;
-            $lines = explode("\n", self::wordwrap($font, $size, 64*4 - 6*2, $name));
+            $lines = explode("\n", self::wordwrap($font, $size, 64 * 4 - 6 * 2, $name));
 
             # For each line, compute its (x, y) so that the text is centered.
 
@@ -370,7 +370,7 @@ 
             foreach ($lines as $line)
             {
                 $bbox = imagettfbbox($size, 0, $font, $line);
-                $width = $bbox[2]-$bbox[0];
+                $width = $bbox[2] - $bbox[0];
                 $x = 128 - ($width >> 1);
                 $positions[] = array($x, $y);
                 $y += 36;
@@ -378,7 +378,7 @@ 
             $drawer = function($x, $y, $color) use (&$lines, &$positions, &$im, &$size, &$font)
             {
                 $len = count($lines);
-                for ($i=0; $i<$len; $i++)
+                for ($i = 0; $i < $len; $i++)
                 {
                     $line = $lines[$i];
                     list($offset_x, $offset_y) = $positions[$i];
@@ -389,8 +389,8 @@ 
             # 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)
+            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).
@@ -406,7 +406,7 @@ 
             imagealphablending($im, false);
             $small = imagecreatetruecolor(64, 26);
             imagealphablending($small, false);
-            imagecopyresampled($small, $im, 0, 0, 0, 0, 64, 26, 64*4, 26*4);
+            imagecopyresampled($small, $im, 0, 0, 0, 0, 64, 26, 64 * 4, 26 * 4);
 
             # Cache it!
 
@@ -433,7 +433,7 @@ 
 
         # Put the marker (indicates the type).
 
-        $marker = self::get_image("medium_".self::get_type_suffix($type, false), $a);
+        $marker = self::get_image("medium_" . self::get_type_suffix($type, false), $a);
         $width = 14;
         $height = 14;
         $center_x = 7;
@@ -490,7 +490,7 @@ 
         {
             # Mark found caches with V.
 
-            $icon = self::get_image("found", 0.7*$a);
+            $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);
         }
@@ -532,7 +532,7 @@ 
         $own = $flags & TileTree::$FLAG_OWN;
         $new = $flags & TileTree::$FLAG_NEW;
 
-        $marker = self::get_image("tiny_".self::get_type_suffix($type, false));
+        $marker = self::get_image("tiny_" . self::get_type_suffix($type, false));
         $width = 10;
         $height = 10;
         $center_x = 5;
@@ -577,7 +577,7 @@ 
         # This is efficient and yields acceptable results.
 
         $matrix = array();
-        for ($i=0; $i<12; $i++)
+        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)
@@ -586,27 +586,27 @@ 
             $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
+                $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 ($mx = 1; $mx < 11; $mx++)
         {
-            for ($my=1; $my<11; $my++)
+            for ($my = 1; $my < 11; $my++)
             {
                 if ($matrix[$mx][$my] > 0)  # cache_id
                 {
                     # Check all adjacent squares.
 
-                    if (   ($matrix[$mx-1][$my-1] === 0)
-                        && ($matrix[$mx-1][$my  ] === 0)
-                        && ($matrix[$mx-1][$my+1] === 0)
-                        && ($matrix[$mx  ][$my-1] === 0)
-                        && ($matrix[$mx  ][$my+1] === 0)
-                        && ($matrix[$mx+1][$my-1] === 0)
-                        && ($matrix[$mx+1][$my  ] === 0)
-                        && ($matrix[$mx+1][$my+1] === 0)
+                    if (($matrix[$mx - 1][$my - 1] === 0)
+                        && ($matrix[$mx - 1][$my] === 0)
+                        && ($matrix[$mx - 1][$my + 1] === 0)
+                        && ($matrix[$mx][$my - 1] === 0)
+                        && ($matrix[$mx][$my + 1] === 0)
+                        && ($matrix[$mx + 1][$my - 1] === 0)
+                        && ($matrix[$mx + 1][$my] === 0)
+                        && ($matrix[$mx + 1][$my + 1] === 0)
                     )
                         $selected_cache_ids[] = $matrix[$mx][$my];
                 }

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

Spacing +34 added lines, -34 removed lines

@@ -41,9 +41,9 @@ 
             select status
             from okapi_tile_status
             where
-                z = '".Db::escape_string($zoom)."'
-                and x = '".Db::escape_string($x)."'
-                and y = '".Db::escape_string($y)."'
+                z = '".Db::escape_string($zoom) . "'
+                and x = '".Db::escape_string($x) . "'
+                and y = '".Db::escape_string($y) . "'
         ");
     }
 
@@ -83,9 +83,9 @@ 
         $tile_upper_x = $x << 8;
         $tile_leftmost_y = $y << 8;
 
-        $zoom_escaped = "'".Db::escape_string($zoom)."'";
-        $tile_upper_x_escaped = "'".Db::escape_string($tile_upper_x)."'";
-        $tile_leftmost_y_escaped = "'".Db::escape_string($tile_leftmost_y)."'";
+        $zoom_escaped = "'" . Db::escape_string($zoom) . "'";
+        $tile_upper_x_escaped = "'" . Db::escape_string($tile_upper_x) . "'";
+        $tile_leftmost_y_escaped = "'" . Db::escape_string($tile_leftmost_y) . "'";
         return Db::query("
             select
                 otc.cache_id,
@@ -97,10 +97,10 @@ 
                 okapi_search_results osr
             where
                 z = $zoom_escaped
-                and x = '".Db::escape_string($x)."'
-                and y = '".Db::escape_string($y)."'
+                and x = '" . Db::escape_string($x) . "'
+                and y = '".Db::escape_string($y) . "'
                 and otc.cache_id = osr.cache_id
-                and osr.set_id = '".Db::escape_string($set_id)."'
+                and osr.set_id = '".Db::escape_string($set_id) . "'
             group by
                 z21x >> (3 + (21 - $zoom_escaped)),
                 z21y >> (3 + (21 - $zoom_escaped))
@@ -135,8 +135,8 @@ 
             # but there is *no need* to - this query is run seldom and is cached.
 
             $params = array();
-            $params['status'] = "Available|Temporarily unavailable|Archived";  # we want them all
-            $params['limit'] = "10000000";  # no limit
+            $params['status'] = "Available|Temporarily unavailable|Archived"; # we want them all
+            $params['limit'] = "10000000"; # no limit
 
             $internal_request = new OkapiInternalRequest(new OkapiInternalConsumer(), null, $params);
             $internal_request->skip_limits = true;
@@ -162,14 +162,14 @@ 
                         z, x, y, cache_id, z21x, z21y, status, type, rating, flags, name_crc
                     ) values (
                         0, 0, 0,
-                        '".Db::escape_string($row[0])."',
-                        '".Db::escape_string($row[1])."',
-                        '".Db::escape_string($row[2])."',
-                        '".Db::escape_string($row[3])."',
-                        '".Db::escape_string($row[4])."',
-                        ".(($row[5] === null) ? "null" : "'".Db::escape_string($row[5])."'").",
-                        '".Db::escape_string($row[6])."',
-                        '".Db::escape_string($row[7])."'
+                        '".Db::escape_string($row[0]) . "',
+                        '".Db::escape_string($row[1]) . "',
+                        '".Db::escape_string($row[2]) . "',
+                        '".Db::escape_string($row[3]) . "',
+                        '".Db::escape_string($row[4]) . "',
+                        ".(($row[5] === null) ? "null" : "'" . Db::escape_string($row[5]) . "'") . ",
+                        '".Db::escape_string($row[6]) . "',
+                        '".Db::escape_string($row[7]) . "'
                     );
                 ");
             }
@@ -229,31 +229,31 @@ 
                             flags, name_crc
                         )
                         select
-                            '".Db::escape_string($zoom)."',
-                            '".Db::escape_string($x)."',
-                            '".Db::escape_string($y)."',
+                            '".Db::escape_string($zoom) . "',
+                            '".Db::escape_string($x) . "',
+                            '".Db::escape_string($y) . "',
                             cache_id, z21x, z21y, status, type, rating,
                             flags, name_crc
                         from okapi_tile_caches tc2
                         where
-                            z = '".Db::escape_string($parent_zoom)."'
-                            and x = '".Db::escape_string($parent_x)."'
-                            and y = '".Db::escape_string($parent_y)."'
+                            z = '".Db::escape_string($parent_zoom) . "'
+                            and x = '".Db::escape_string($parent_x) . "'
+                            and y = '".Db::escape_string($parent_y) . "'
                             and z21x between $left_z21x and $right_z21x
                             and z21y between $top_z21y and $bottom_z21y
                     ");
                     Db::execute("unlock tables;");
                 } catch (Exception $e) {
-                    Db::execute("unlock tables");  // No "finally" in PHP 5.3
+                    Db::execute("unlock tables"); // No "finally" in PHP 5.3
                     throw $e;
                 }
                 $test = Db::select_value("
                     select 1
                     from okapi_tile_caches
                     where
-                        z = '".Db::escape_string($zoom)."'
-                        and x = '".Db::escape_string($x)."'
-                        and y = '".Db::escape_string($y)."'
+                        z = '".Db::escape_string($zoom) . "'
+                        and x = '".Db::escape_string($x) . "'
+                        and y = '".Db::escape_string($y) . "'
                     limit 1;
                 ");
                 if ($test)
@@ -268,10 +268,10 @@ 
         Db::execute("
             replace into okapi_tile_status (z, x, y, status)
             values (
-                '".Db::escape_string($zoom)."',
-                '".Db::escape_string($x)."',
-                '".Db::escape_string($y)."',
-                '".Db::escape_string($status)."'
+                '".Db::escape_string($zoom) . "',
+                '".Db::escape_string($x) . "',
+                '".Db::escape_string($y) . "',
+                '".Db::escape_string($status) . "'
             );
         ");
 
@@ -319,7 +319,7 @@ 
     {
         $offset = 128 << 21;
         $x = round($offset + ($offset * $lon / 180));
-        $y = round($offset - $offset/pi() * log((1 + sin($lat * pi() / 180)) / (1 - sin($lat * pi() / 180))) / 2);
+        $y = round($offset - $offset / pi() * log((1 + sin($lat * pi() / 180)) / (1 - sin($lat * pi() / 180))) / 2);
         return array($x, $y);
     }
 }
\ No newline at end of file

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;
 
 

Spacing +24 added lines, -24 removed lines

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

htdocs/okapi/services/caches/search/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;

Spacing +12 added lines, -12 removed lines

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