diff --git a/config.php.dist b/config.php.dist index 253ff04..d838826 100644 --- a/config.php.dist +++ b/config.php.dist @@ -5,7 +5,7 @@ function config($basepath){ array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL, 'http://localhost/'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH, $basepath.'/'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE, \SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS), - array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, 'localhost'), + array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST, 'mariadb'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PORT, ''), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER, 'web'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, 'SECRET'), @@ -15,5 +15,8 @@ function config($basepath){ array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE','enUS')), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_CACHE, $basepath.'/cache/'), - array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH, $basepath.'/log/')); + array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH, $basepath.'/log/'), + array(\config_ids::TEAMSPEAK_HOST, 'localhost'), + array(\config_ids::TEAMSPEAK_QUERY_USER, 'queryuser'), + array(\config_ids::TEAMSPEAK_QUERY_PASSWORD, 'SECRET')); } \ No newline at end of file diff --git a/teamspeak/config/config_ids.php b/teamspeak/config/config_ids.php index c96d50c..128d7ad 100644 --- a/teamspeak/config/config_ids.php +++ b/teamspeak/config/config_ids.php @@ -1,5 +1,8 @@ WEBPATH().'" type="text/css" />';} private static function ts_app(){ - $ts = new TSStatus('127.0.0.1'); - //$ts = new TSStatus('mojotrollz.eu'); - $ts->setLoginPassword('mojotrollztsquery', '9aYllYkG'); + $ts = new TSStatus(\SYSTEM\CONFIG\config::get(\config_ids::TEAMSPEAK_HOST)); + $ts->setLoginPassword(\SYSTEM\CONFIG\config::get(\config_ids::TEAMSPEAK_QUERY_USER), \SYSTEM\CONFIG\config::get(\config_ids::TEAMSPEAK_QUERY_PASSWORD)); $ts->imagePath = 'api.php?call=files&cat=img&id='; return $ts->render(); }