Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Porting commits from downloaded zip file of saas-dev branch

This commit is contained in:
Robb Ebright 2017-02-13 09:23:04 -05:00 committed by Lucas Bickel
parent db596d54b5
commit 276a69aa1b
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
airtime_mvc/application/models/Preference.php
View File

@ -1593,18 +1593,15 @@ class Application_Model_Preference
*/ */
public static function getBandwidthLimit() { public static function getBandwidthLimit() {
$bandwidthLimit = self::getValue("bandwidth_limit"); $val = self::getValue("bandwidth_limit");
if (empty($bandwidthLimit)) { if (empty($val)) {
// Set and return the plan defaults // Set and return the plan defaults
// TODO: remove this once all existing customers have this pref set // TODO: remove this once all existing customers have this pref set
$planType = self::GetPlanLevel(); $planType = self::GetPlanLevel();
$bandwidthLimit = Billing::$PLAN_TYPE_DEFAULTS["starter"]["bandwidth_limit"]; $val = Billing::$PLAN_TYPE_DEFAULTS[$planType]["bandwidth_limit"];
if (isset(Billing::$PLAN_TYPE_DEFAULTS[$planType])) { self::setBandwidthLimit($val);
$bandwidthLimit = Billing::$PLAN_TYPE_DEFAULTS[$planType]["bandwidth_limit"];
}
self::setBandwidthLimit($bandwidthLimit);
} }
return $bandwidthLimit; return $val;
} }
public static function setBandwidthLimit($value) { public static function setBandwidthLimit($value) {

13
airtime_mvc/application/models/Schedule.php
View File

@ -215,6 +215,7 @@ SQL;
$currentMedia["ends"] = $currentMedia["show_ends"]; $currentMedia["ends"] = $currentMedia["show_ends"];
} }
$currentMetadata = null;
$currentMediaName = ""; $currentMediaName = "";
$currentMediaFileId = $currentMedia["file_id"]; $currentMediaFileId = $currentMedia["file_id"];
$currentMediaStreamId = $currentMedia["stream_id"]; $currentMediaStreamId = $currentMedia["stream_id"];
@ -224,6 +225,7 @@ SQL;
->filterByDbId($currentMediaFileId) ->filterByDbId($currentMediaFileId)
->findOne(); ->findOne();
$currentMediaName = $currentFile->getDbArtistName() . " - " . $currentFile->getDbTrackTitle(); $currentMediaName = $currentFile->getDbArtistName() . " - " . $currentFile->getDbTrackTitle();
$currentMetadata = CcFiles::sanitizeResponse($currentFile);
} else if (isset($currentMediaStreamId)) { } else if (isset($currentMediaStreamId)) {
$currentMediaType = "webstream"; $currentMediaType = "webstream";
$currentWebstream = CcWebstreamQuery::create() $currentWebstream = CcWebstreamQuery::create()
@ -247,6 +249,7 @@ SQL;
"type" => $currentMediaType, "type" => $currentMediaType,
"name" => $currentMediaName, "name" => $currentMediaName,
"media_item_played" => $currentMedia["media_item_played"], "media_item_played" => $currentMedia["media_item_played"],
"metadata" => $currentMetadata,
"record" => "0" "record" => "0"
); );
} }
@ -257,6 +260,7 @@ SQL;
->orderByDbStarts(Criteria::DESC) ->orderByDbStarts(Criteria::DESC)
->findOne(); ->findOne();
if (isset($previousMedia)) { if (isset($previousMedia)) {
$previousMetadata = null;
$previousMediaName = ""; $previousMediaName = "";
$previousMediaFileId = $previousMedia->getDbFileId(); $previousMediaFileId = $previousMedia->getDbFileId();
$previousMediaStreamId = $previousMedia->getDbStreamId(); $previousMediaStreamId = $previousMedia->getDbStreamId();
@ -266,6 +270,7 @@ SQL;
->filterByDbId($previousMediaFileId) ->filterByDbId($previousMediaFileId)
->findOne(); ->findOne();
$previousMediaName = $previousFile->getDbArtistName() . " - " . $previousFile->getDbTrackTitle(); $previousMediaName = $previousFile->getDbArtistName() . " - " . $previousFile->getDbTrackTitle();
$previousMetadata = CcFiles::sanitizeResponse($previousFile);
} else if (isset($previousMediaStreamId)) { } else if (isset($previousMediaStreamId)) {
$previousMediaName = null; $previousMediaName = null;
$previousMediaType = "webstream"; $previousMediaType = "webstream";
@ -280,7 +285,8 @@ SQL;
"starts" => $previousMedia->getDbStarts(), "starts" => $previousMedia->getDbStarts(),
"ends" => $previousMedia->getDbEnds(), "ends" => $previousMedia->getDbEnds(),
"type" => $previousMediaType, "type" => $previousMediaType,
"name" => $previousMediaName "name" => $previousMediaName,
"metadata" => $previousMetadata,
); );
} }
@ -290,6 +296,7 @@ SQL;
->orderByDbStarts(Criteria::ASC) ->orderByDbStarts(Criteria::ASC)
->findOne(); ->findOne();
if (isset($nextMedia)) { if (isset($nextMedia)) {
$nextMetadata = null;
$nextMediaName = ""; $nextMediaName = "";
$nextMediaFileId = $nextMedia->getDbFileId(); $nextMediaFileId = $nextMedia->getDbFileId();
$nextMediaStreamId = $nextMedia->getDbStreamId(); $nextMediaStreamId = $nextMedia->getDbStreamId();
@ -298,6 +305,7 @@ SQL;
$nextFile = CcFilesQuery::create() $nextFile = CcFilesQuery::create()
->filterByDbId($nextMediaFileId) ->filterByDbId($nextMediaFileId)
->findOne(); ->findOne();
$nextMetadata = CcFiles::sanitizeResponse($nextFile);
$nextMediaName = $nextFile->getDbArtistName() . " - " . $nextFile->getDbTrackTitle(); $nextMediaName = $nextFile->getDbArtistName() . " - " . $nextFile->getDbTrackTitle();
} else if (isset($nextMediaStreamId)) { } else if (isset($nextMediaStreamId)) {
$nextMediaType = "webstream"; $nextMediaType = "webstream";
@ -312,7 +320,8 @@ SQL;
"starts" => $nextMedia->getDbStarts(), "starts" => $nextMedia->getDbStarts(),
"ends" => $nextMedia->getDbEnds(), "ends" => $nextMedia->getDbEnds(),
"type" => $nextMediaType, "type" => $nextMediaType,
"name" => $nextMediaName "name" => $nextMediaName,
"metadata" => $nextMetadata
); );
} }