Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/BlueMap-Minecraft/BlueMap

This commit is contained in:
Lukas Rieger (Blue) 2023-11-21 16:16:01 +01:00
parent 5866cb5766 0bad1b6b2a
commit 36090e8545
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
1 changed files with 68 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
BlueMapCommon/webapp/public/mysql.php → BlueMapCommon/webapp/public/sql.php
View File

@ -2,6 +2,7 @@
// !!! SET YOUR SQL-CONNECTION SETTINGS HERE: !!! // !!! SET YOUR SQL-CONNECTION SETTINGS HERE: !!!
$driver = 'mysql'; // 'mysql' (MySQL) or 'pgsql' (PostgreSQL)
$hostname = '127.0.0.1'; $hostname = '127.0.0.1';
$port = 3306; $port = 3306;
$username = 'root'; $username = 'root';
@ -85,6 +86,14 @@ function getMimeType($path) {
return $mimeDefault; return $mimeDefault;
} }
function send($data) {
if (is_resource($data)) {
fpassthru($data);
} else {
echo $data;
}
}
// determine relative request-path // determine relative request-path
$root = dirname($_SERVER['PHP_SELF']); $root = dirname($_SERVER['PHP_SELF']);
if ($root === "/" || $root === "\\") $root = ""; if ($root === "/" || $root === "\\") $root = "";
@ -111,9 +120,12 @@ if (startsWith($path, "/maps/")) {
$mapId = $pathParts[0]; $mapId = $pathParts[0];
$mapPath = explode("?", $pathParts[1], 2)[0]; $mapPath = explode("?", $pathParts[1], 2)[0];
// get sql-connection // Initialize PDO
$sql = new mysqli($hostname, $username, $password, $database, $port); try {
if ($sql->errno) error(500, "Failed to connect to Database!"); $sql = new PDO("$driver:host=$hostname;dbname=$database", $username, $password);
$sql->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} catch (PDOException $e ) { error(500, "Failed to connect to database"); }
// provide map-tiles // provide map-tiles
if (startsWith($mapPath, "tiles/")) { if (startsWith($mapPath, "tiles/")) {
@ -126,67 +138,72 @@ if (startsWith($path, "/maps/")) {
$compression = $lod === 0 ? $hiresCompression : "none"; $compression = $lod === 0 ? $hiresCompression : "none";
// query for tile // query for tile
$statement = $sql->prepare(" try {
SELECT t.`data` $statement = $sql->prepare("
FROM `bluemap_map_tile` t SELECT t.data
INNER JOIN `bluemap_map` m FROM bluemap_map_tile t
ON t.`map` = m.`id` INNER JOIN bluemap_map m
INNER JOIN `bluemap_map_tile_compression` c ON t.map = m.id
ON t.`compression` = c.`id` INNER JOIN bluemap_map_tile_compression c
WHERE m.`map_id` = ? ON t.compression = c.id
AND t.`lod` = ? WHERE m.map_id = :map_id
AND t.`x` = ? AND t.lod = :lod
AND t.`z` = ? AND t.x = :x
AND c.`compression` = ? AND t.z = :z
"); AND c.compression = :compression
$statement->bind_param("siiis", $mapId, $lod, $tileX, $tileZ, $compression); ");
$statement->execute(); $statement->bindParam( ':map_id', $mapId, PDO::PARAM_STR );
if ($statement->errno) error(500, "Database query failed!"); $statement->bindParam( ':lod', $lod, PDO::PARAM_INT );
$statement->bindParam( ':x', $tileX, PDO::PARAM_INT );
$statement->bindParam( ':z', $tileZ, PDO::PARAM_INT );
$statement->bindParam( ':compression', $compression, PDO::PARAM_STR);
$statement->setFetchMode(PDO::FETCH_ASSOC);
$statement->execute();
// return result // return result
$result = $statement->get_result(); if ($line = $statement->fetch()) {
if ($result && $line = $result->fetch_assoc()) { if ($compression !== "none")
if ($compression !== "none") header("Content-Encoding: $compression");
header("Content-Encoding: $compression"); if ($lod === 0) {
header("Content-Type: application/json");
if ($lod === 0) { } else {
header("Content-Type: application/json"); header("Content-Type: image/png");
} else { }
header("Content-Type: image/png"); send($line["data"]);
exit;
} }
echo $line["data"]; } catch (PDOException $e) { error(500, "Failed to fetch data"); }
exit;
}
// empty json response if nothing found // empty json response if nothing found
header("Content-Type: application/json"); header("Content-Type: application/json");
echo "{}"; echo "{}";
exit; exit;
} }
// provide meta-files // provide meta-files
$statement = $sql->prepare(" try {
SELECT t.`value` $statement = $sql->prepare("
FROM `bluemap_map_meta` t SELECT t.value
INNER JOIN `bluemap_map` m FROM bluemap_map_meta t
ON t.`map` = m.`id` INNER JOIN bluemap_map m
WHERE m.`map_id` = ? ON t.map = m.id
AND t.`key` = ? WHERE m.map_id = :map_id
"); AND t.key = :map_path
$statement->bind_param("ss", $mapId, $mapPath); ");
$statement->execute(); $statement->bindParam( ':map_id', $mapId, PDO::PARAM_STR );
if ($statement->errno) error(500, "Database query failed!"); $statement->bindParam( ':map_path', $mapPath, PDO::PARAM_STR );
$statement->setFetchMode(PDO::FETCH_ASSOC);
$statement->execute();
$result = $statement->get_result(); if ($line = $statement->fetch()) {
if ($result && $line = $result->fetch_assoc()) { header("Content-Type: ".getMimeType($mapPath));
header("Content-Type: ".getMimeType($mapPath)); send($line["value"]);
echo $line["value"]; exit;
exit; }
} } catch (PDOException $e) { error(500, "Failed to fetch data"); }
} }
// no match => 404 // no match => 404
error(404); error(404);