tilderadio/AzuraCast
4
0
Fork 0
mirror of https://github.com/AzuraCast/AzuraCast.git synced 2024-06-15 13:46:37 +00:00
Code Issues Releases Wiki Activity

#471 -- Don't overwrite initial station configuration with read() call

Browse Source
This commit is contained in:
Buster "Silver Eagle" Neece 2018-03-10 09:37:35 -06:00
parent a5be2f20c4
commit d718150ae5
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/AzuraCast/Radio/Frontend/Icecast.php
View File

@ -141,9 +141,7 @@ class Icecast extends FrontendAbstract
public function read()
{
$config = $this->_getConfig();
$this->station->setFrontendConfig($this->_loadFromConfig($config));
$this->station->setFrontendConfigDefaults($this->_loadFromConfig($config));
return true;
}

4
app/src/AzuraCast/Radio/Frontend/SHOUTcast.php
View File

@ -102,9 +102,7 @@ class SHOUTcast extends FrontendAbstract
public function read()
{
$config = $this->_getConfig();
$this->station->setFrontendConfig($this->_loadFromConfig($config));
$this->station->setFrontendConfigDefaults($this->_loadFromConfig($config));
return true;
}

18
app/src/Entity/Station.php
View File

@ -327,6 +327,24 @@ class Station
$this->frontend_config = $config;
}
/**
* Set frontend configuration but do not overwrite existing values.
*
* @param $default_config
*/
public function setFrontendConfigDefaults($default_config)
{
$frontend_config = (array)$this->frontend_config;
foreach($default_config as $config_key => $config_value) {
if (empty($frontend_config[$config_key])) {
$frontend_config[$config_key] = $config_value;
}
}
$this->frontend_config = $frontend_config;
}
/**
* @return null|string
*/