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

SAAS-876 - use baseurl for default host value

This commit is contained in:
Duncan Sommerville 2015-07-13 15:52:04 -04:00
parent 755ec79e7d
commit 683c1a4641
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/configs/constants.php
View File

@ -32,6 +32,7 @@ define('DEFAULT_LOGO_PLACEHOLDER', 1);
define('DEFAULT_LOGO_FILE', 'images/airtime_logo.png'); define('DEFAULT_LOGO_FILE', 'images/airtime_logo.png');
define('DEFAULT_TIMESTAMP_FORMAT', 'Y-m-d H:i:s'); define('DEFAULT_TIMESTAMP_FORMAT', 'Y-m-d H:i:s');
define('DEFAULT_MICROTIME_FORMAT', 'Y-m-d H:i:s.u'); define('DEFAULT_MICROTIME_FORMAT', 'Y-m-d H:i:s.u');
define('DEFAULT_ICECAST_PORT', 8000);
define('DEFAULT_ICECAST_PASS', 'hackme'); define('DEFAULT_ICECAST_PASS', 'hackme');
// Metadata Keys for files // Metadata Keys for files

4
airtime_mvc/application/models/StreamSetting.php
View File

@ -279,8 +279,8 @@ class Application_Model_StreamSetting
public static function getDefaults($prefix) { public static function getDefaults($prefix) {
$config = Config::getConfig(); $config = Config::getConfig();
return array( return array(
'host' => $config['stationId'] . '.out.airtime.pro', 'host' => $config['baseUrl'],
'port' => 8000, 'port' => DEFAULT_ICECAST_PORT,
'output' => 'icecast', 'output' => 'icecast',
'user' => $config['stationId'], 'user' => $config['stationId'],
'pass' => Application_Model_Preference::getDefaultIcecastPassword(), 'pass' => Application_Model_Preference::getDefaultIcecastPassword(),