diff options
Diffstat (limited to 'ogs')
| -rw-r--r-- | ogs/assetserver/assetserver_config.inc.php | 8 | ||||
| -rw-r--r-- | ogs/assetserver/index.php | 3 |
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 @@ | |||
| 4 | // The asset server's relative URL to the root of the webserver | 4 | // The asset server's relative URL to the root of the webserver |
| 5 | // If you place this at http://servername/assets then this would be set to /assets/index.php | 5 | // If you place this at http://servername/assets then this would be set to /assets/index.php |
| 6 | // 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) | 6 | // 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) |
| 7 | $asset_home = "/ogs/assetserver/index.php/"; | 7 | $asset_home = "/ogs/assetserver/"; |
| 8 | 8 | ||
| 9 | // The key we expect from sims | 9 | // The key we expect from sims |
| 10 | $sim_recvkey = "rtrgrgrgrgr894898f998re98rf989fds"; | 10 | $sim_recvkey = "1234"; |
| 11 | 11 | ||
| 12 | // The path where the asset repository is stored, this should be readable by the webserver but NOT in the document root | 12 | // The path where the asset repository is stored, this should be readable by the webserver but NOT in the document root |
| 13 | // The default below is BAD for production use and intended to be simply generic - change it or risk copyright theft | 13 | // The default below is BAD for production use and intended to be simply generic - change it or risk copyright theft |
| 14 | // greater than you could ever imagine, alternatively use .htaccess or other mechanisms. | 14 | // greater than you could ever imagine, alternatively use .htaccess or other mechanisms. |
| 15 | $asset_repos = "/var/www/htdocs/ogs/assetserver/assets"; | 15 | $asset_repos = "/usr/local/sites/osgrid.org/web/ogs/assetserver/assets"; |
| 16 | ?> \ No newline at end of file | 16 | ?> |
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"); | |||
| 5 | 5 | ||
| 6 | // Parse out the parameters from the URL | 6 | // Parse out the parameters from the URL |
| 7 | $params = str_replace($asset_home,'', $_SERVER['REQUEST_URI']); | 7 | $params = str_replace($asset_home,'', $_SERVER['REQUEST_URI']); |
| 8 | $params = str_replace("index.php/","",$params); | ||
| 8 | $params = split('/',$params); | 9 | $params = split('/',$params); |
| 9 | 10 | ||
| 10 | // Die if the key doesn't match | 11 | // Die if the key doesn't match |
| @@ -21,4 +22,4 @@ switch($params[0]) { | |||
| 21 | } | 22 | } |
| 22 | break; | 23 | break; |
| 23 | } | 24 | } |
| 24 | ?> \ No newline at end of file | 25 | ?> |