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

Merge branch '2.1.x' into devel

Browse source
This commit is contained in:
denise 2012-06-11 18:11:09 -04:00
commit d66ba4074c
5 changed files with 29 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

22
airtime_mvc/application/models/StreamSetting.php
View file

@ -279,28 +279,6 @@ class Application_Model_StreamSetting {
}
return $out;
}
public static function GetConnectionUrls($p_source_type) {
if (strcmp($p_source_type, "master")==0) {
$m_port = Application_Model_StreamSetting::GetMasterLiveSteamPort();
$m_mount = Application_Model_StreamSetting::GetMasterLiveSteamMountPoint();
$master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL();
$connection_url = ($master_dj_connection_url == "")?("http://".$_SERVER['SERVER_NAME'].":".$m_port."/".$m_mount):$master_dj_connection_url;
if($m_port=="" || $m_mount==""){
$connection_url = "N/A";
}
}
else if (strcmp($p_source_type, "show")==0) {
$l_port = Application_Model_StreamSetting::GetDJLiveSteamPort();
$l_mount = Application_Model_StreamSetting::GetDJLiveSteamMountPoint();
$live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL();
$connection_url = ($live_dj_connection_url == "")?"http://".$_SERVER['SERVER_NAME'].":".$l_port."/".$l_mount:$live_dj_connection_url;
if($l_port=="" || $l_mount==""){
$connection_url = "N/A";
}
}
return $connection_url;
}
public static function SetMasterLiveSteamPort($value){
self::SetValue("master_live_stream_port", $value, "integer");

2
airtime_mvc/application/models/airtime/CcShowInstances.php
View file

@ -162,7 +162,7 @@ class CcShowInstances extends BaseCcShowInstances {
public function updateDbTimeFilled(PropelPDO $con)
{
$timefilled = $this->computeDbTimeFilled($con);
if($timefilled == null){
if(is_null($timefilled)){
$timefilled = "00:00:00";
}
$this->setDbTimeFilled($timefilled);