mirror/php-tileserver
1
0
Fork 0
mirror of https://github.com/klokantech/tileserver-php.git synced 2025-08-11 17:14:20 +02:00
Code Issues Releases Wiki Activity

Tileserver-php now running without .htaccess "Fixes #23"

Browse Source
This commit is contained in:
Dalibor Janák
2014-05-19 19:47:11 +02:00
parent cba3048506
commit 08b77f4bf4
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tileserver.php
View File

@@ -242,7 +242,7 @@ class Server {
header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastModifiedTime) . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastModifiedTime) . " GMT");
header("Etag:" . $eTag); header("Etag:" . $eTag);
if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModifiedTime || if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModifiedTime ||
trim($_SERVER['HTTP_IF_NONE_MATCH']) == $eTag) { @trim($_SERVER['HTTP_IF_NONE_MATCH']) == $eTag) {
return TRUE; return TRUE;
} else { } else {
return FALSE; return FALSE;
@@ -546,9 +546,9 @@ class Json extends Server {
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-Type:application/javascript charset=utf-8"); header("Content-Type:application/javascript charset=utf-8");
if ($this->callback !== 'grid') { if ($this->callback !== 'grid') {
echo $this->callback . '(' . $this->createJson($this->layer) . ');'; echo $this->callback . '(' . $this->createJson($this->layer) . ');'; die;
} else { } else {
echo $this->createJson($this->layer); echo $this->createJson($this->layer); die;
} }
} }
@@ -1360,7 +1360,7 @@ class Router {
$path_info = $_SERVER['PATH_INFO']; $path_info = $_SERVER['PATH_INFO'];
} else if (!empty($_SERVER['ORIG_PATH_INFO']) && $_SERVER['ORIG_PATH_INFO'] !== '/tileserver.php') { } else if (!empty($_SERVER['ORIG_PATH_INFO']) && $_SERVER['ORIG_PATH_INFO'] !== '/tileserver.php') {
$path_info = $_SERVER['ORIG_PATH_INFO']; $path_info = $_SERVER['ORIG_PATH_INFO'];
} else if (!empty($_SERVER['REQUEST_URI']) && strpos($_SERVER['REQUEST_URI'],'/tileserver.php') !== false) { } else if (!empty($_SERVER['REQUEST_URI']) && strpos($_SERVER['REQUEST_URI'], '/tileserver.php') !== false) {
$path_info = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; $path_info = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
$config['baseUrls'][0] = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . '?'; $config['baseUrls'][0] = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . '?';
} else { } else {
@@ -1405,8 +1405,15 @@ class Router {
$handler_instance = $discovered_handler(); $handler_instance = $discovered_handler();
} }
} else { } else {
if(!isset($config['baseUrls'][0])){ if (!isset($config['baseUrls'][0])) {
$config['baseUrls'][0] = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . '?'; $config['baseUrls'][0] = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . '?';
}
if (strpos($_SERVER['REQUEST_URI'], '=') != FALSE) {
$kvp = explode('=', $_SERVER['REQUEST_URI']);
$_GET['callback'] = $kvp[1];
$params[0] = 'index';
$handler_instance = new Json($params);
$handler_instance->getJson();
} }
$handler_instance = new Server; $handler_instance = new Server;
$handler_instance->getHtml(); $handler_instance->getHtml();