Imported fixed OGS asset server

Fiddled with terrain data

2 files changed, 6 insertions, 5 deletions

diff --git a/ogs/assetserver/assetserver_config.inc.php b/ogs/assetserver/assetserver_config.inc.php
index 529a4f7..b2199f3 100644
--- a/ogs/assetserver/assetserver_config.inc.php
+++ b/ogs/assetserver/assetserver_config.inc.php
@@ -4,13 +4,13 @@
 // The asset server's relative URL to the root of the webserver
 // If you place this at http://servername/assets then this would be set to /assets/index.php
 // wikipedia style URLs need to be implemented - and will be (en.wikipedia.org/wiki/blabla rather than en.wikipedia.org/wiki/index.php?something=bla or en.wikipedia.org/wiki.php/bla)
-$asset_home = "/ogs/assetserver/index.php/";
+$asset_home = "/ogs/assetserver/";
 
 // The key we expect from sims
-$sim_recvkey = "rtrgrgrgrgr894898f998re98rf989fds";
+$sim_recvkey = "1234";
 
 // The path where the asset repository is stored, this should be readable by the webserver but NOT in the document root
 // The default below is BAD for production use and intended to be simply generic - change it or risk copyright theft 
 // greater than you could ever imagine, alternatively use .htaccess or other mechanisms.
-$asset_repos = "/var/www/htdocs/ogs/assetserver/assets";
-?>
\ No newline at end of file
+$asset_repos = "/usr/local/sites/osgrid.org/web/ogs/assetserver/assets";
+?>
diff --git a/ogs/assetserver/index.php b/ogs/assetserver/index.php
index 82cf9d4..ee20229 100644
--- a/ogs/assetserver/index.php
+++ b/ogs/assetserver/index.php
@@ -5,6 +5,7 @@ include("assetserver_config.inc.php");
 
 // Parse out the parameters from the URL
 $params = str_replace($asset_home,'', $_SERVER['REQUEST_URI']);
+$params = str_replace("index.php/","",$params);
 $params = split('/',$params);
 
 // Die if the key doesn't match
@@ -21,4 +22,4 @@ switch($params[0]) {
         }
     break;
 }
-?>
\ No newline at end of file
+?>