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

chore(legacy): remove exploded public_url config

Browse source 
Replace exploded public_url parts with validated url object.
This commit is contained in:
jo 2022-07-07 23:45:15 +02:00 • committed by Kyle Robbertze
parent d323657047
commit 712ecd70b4
3 changed files with 36 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
legacy/application/models/StoredFile.php
View file

@ -510,13 +510,11 @@ SQL;
*/
public function getFileUrl()
{
$CC_CONFIG = Config::getConfig();
$protocol = empty($_SERVER['HTTPS']) ? 'http' : 'https';
$serverName = $_SERVER['SERVER_NAME'];
$serverPort = $_SERVER['SERVER_PORT'];
$subDir = $CC_CONFIG['baseDir'];
$subDir = Config::getBasePath();
if ($protocol === 'https' && $serverPort == 80) {
$serverPort = 443;

7
legacy/application/models/StreamSetting.php
View file

@ -260,10 +260,9 @@ class Application_Model_StreamSetting
$v = trim($v);
if ($k != 'admin_pass') {
self::saveStreamSetting($keyname, $v);
/* We use 'xxxxxx' as the admin password placeholder so we
* only want to save it when it is a different string
*/
} elseif ($v != 'xxxxxx') {
// We use 'xxxxxx' as the admin password placeholder so we
// only want to save it when it is a different string
self::saveStreamSetting($keyname, $v);
}
}
@ -283,7 +282,7 @@ class Application_Model_StreamSetting
$config = Config::getConfig();
return [
'host' => $config['baseUrl'],
'host' => $config['public_url_raw']->getHost(),
'port' => DEFAULT_ICECAST_PORT,
'output' => 'icecast',
'user' => $config['stationId'],