Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

-make airtime.conf selectable in conf.php

Browse source
This commit is contained in:
Martin Konecny 2011-12-18 23:44:19 -05:00
parent 17e09b64af
commit 8d369e662d
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
airtime_mvc/application/configs/conf.php
View file

@ -23,7 +23,7 @@ $CC_CONFIG = array(
'phingPath' => dirname(__FILE__).'/../../library/phing' 'phingPath' => dirname(__FILE__).'/../../library/phing'
); );
$CC_CONFIG = Config::loadConfig($CC_CONFIG); Config::loadConfig("/etc/airtime/airtime.conf");
// Add database table names // Add database table names
$CC_CONFIG['playListTable'] = $CC_CONFIG['tblNamePrefix'].'playlist'; $CC_CONFIG['playListTable'] = $CC_CONFIG['tblNamePrefix'].'playlist';
@ -56,8 +56,11 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
.PATH_SEPARATOR.$old_include_path); .PATH_SEPARATOR.$old_include_path);
class Config { class Config {
public static function loadConfig($CC_CONFIG) { public static function loadConfig($p_path) {
$values = parse_ini_file('/etc/airtime/airtime.conf', true); global $CC_CONFIG;
$filename = $p_path;
$values = parse_ini_file($filename, true);
// Name of the web server user // Name of the web server user
$CC_CONFIG['webServerUser'] = $values['general']['web_server_user']; $CC_CONFIG['webServerUser'] = $values['general']['web_server_user'];
@ -77,7 +80,5 @@ class Config {
$CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries']; $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
$CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries']; $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];
return $CC_CONFIG;
} }
} }