Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-27 17:59:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* refactor data directory detection

Browse Source
This commit is contained in:
slawkens 2018-05-29 20:40:40 +02:00
parent 050f596429
commit f34f2da9b9
1 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
system/init.php
View File

@ -91,39 +91,28 @@ if(isset($config['lua']['houserentperiod']))
if($config['item_images_url'][strlen($config['item_images_url']) - 1] !== '/') if($config['item_images_url'][strlen($config['item_images_url']) - 1] !== '/')
$config['item_images_url'] .= '/'; $config['item_images_url'] .= '/';
// localize data/ directory // localize data/ directory based on data directory set in config.lua
if(isset($config['lua']['dataDirectory'][0])) foreach(array('dataDirectory', 'data_directory', 'datadir') as $key) {
{ if(!isset($config['lua'][$key][0])) {
$tmp = $config['lua']['dataDirectory']; break;
if($tmp[0] !== '/')
$tmp = $config['server_path'] . $tmp;
if($tmp[strlen($tmp) - 1] !== '/') // do not forget about trailing slash
$tmp .= '/';
} }
else if(isset($config['lua']['data_directory'][0]))
{
$tmp = $config['lua']['data_directory'];
if($tmp[0] !== '/')
$tmp = $config['server_path'] . $tmp;
if($tmp[strlen($tmp) - 1] !== '/') // do not forget about trailing slash $foundValue = $config['lua'][$key];
$tmp .= '/'; if($foundValue[0] !== '/') {
$foundValue = $config['server_path'] . $foundValue;
} }
else if(isset($config['lua']['datadir'][0]))
{
$tmp = $config['lua']['datadir'];
if($tmp[0] !== '/')
$tmp = $config['server_path'] . $tmp;
if($tmp[strlen($tmp) - 1] !== '/') // do not forget about trailing slash if($foundValue[strlen($foundValue) - 1] !== '/') {// do not forget about trailing slash
$tmp .= '/'; $foundValue .= '/';
}
} }
else
$tmp = $config['server_path'] . 'data/';
$config['data_path'] = $tmp; if(!isset($foundValue)) {
unset($tmp); $foundValue = $config['server_path'] . 'data/';
}
$config['data_path'] = $foundValue;
unset($foundValue);
// new config values for compability // new config values for compability
if(!isset($config['highscores_ids_hidden']) || count($config['highscores_ids_hidden']) == 0) { if(!isset($config['highscores_ids_hidden']) || count($config['highscores_ids_hidden']) == 0) {