From 276a69aa1bef527260efc170d7caab7d04b4ca13 Mon Sep 17 00:00:00 2001 From: Robb Ebright Date: Mon, 13 Feb 2017 09:23:04 -0500 Subject: [PATCH] Porting commits from downloaded zip file of saas-dev branch --- airtime_mvc/application/models/Preference.php | 13 +++++-------- airtime_mvc/application/models/Schedule.php | 13 +++++++++++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 45571983d..8a93bc81a 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -1593,18 +1593,15 @@ class Application_Model_Preference */ public static function getBandwidthLimit() { - $bandwidthLimit = self::getValue("bandwidth_limit"); - if (empty($bandwidthLimit)) { + $val = self::getValue("bandwidth_limit"); + if (empty($val)) { // Set and return the plan defaults // TODO: remove this once all existing customers have this pref set $planType = self::GetPlanLevel(); - $bandwidthLimit = Billing::$PLAN_TYPE_DEFAULTS["starter"]["bandwidth_limit"]; - if (isset(Billing::$PLAN_TYPE_DEFAULTS[$planType])) { - $bandwidthLimit = Billing::$PLAN_TYPE_DEFAULTS[$planType]["bandwidth_limit"]; - } - self::setBandwidthLimit($bandwidthLimit); + $val = Billing::$PLAN_TYPE_DEFAULTS[$planType]["bandwidth_limit"]; + self::setBandwidthLimit($val); } - return $bandwidthLimit; + return $val; } public static function setBandwidthLimit($value) { diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 2d6a2a8f3..ad8ea50cc 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -215,6 +215,7 @@ SQL; $currentMedia["ends"] = $currentMedia["show_ends"]; } + $currentMetadata = null; $currentMediaName = ""; $currentMediaFileId = $currentMedia["file_id"]; $currentMediaStreamId = $currentMedia["stream_id"]; @@ -224,6 +225,7 @@ SQL; ->filterByDbId($currentMediaFileId) ->findOne(); $currentMediaName = $currentFile->getDbArtistName() . " - " . $currentFile->getDbTrackTitle(); + $currentMetadata = CcFiles::sanitizeResponse($currentFile); } else if (isset($currentMediaStreamId)) { $currentMediaType = "webstream"; $currentWebstream = CcWebstreamQuery::create() @@ -247,6 +249,7 @@ SQL; "type" => $currentMediaType, "name" => $currentMediaName, "media_item_played" => $currentMedia["media_item_played"], + "metadata" => $currentMetadata, "record" => "0" ); } @@ -257,6 +260,7 @@ SQL; ->orderByDbStarts(Criteria::DESC) ->findOne(); if (isset($previousMedia)) { + $previousMetadata = null; $previousMediaName = ""; $previousMediaFileId = $previousMedia->getDbFileId(); $previousMediaStreamId = $previousMedia->getDbStreamId(); @@ -266,6 +270,7 @@ SQL; ->filterByDbId($previousMediaFileId) ->findOne(); $previousMediaName = $previousFile->getDbArtistName() . " - " . $previousFile->getDbTrackTitle(); + $previousMetadata = CcFiles::sanitizeResponse($previousFile); } else if (isset($previousMediaStreamId)) { $previousMediaName = null; $previousMediaType = "webstream"; @@ -280,7 +285,8 @@ SQL; "starts" => $previousMedia->getDbStarts(), "ends" => $previousMedia->getDbEnds(), "type" => $previousMediaType, - "name" => $previousMediaName + "name" => $previousMediaName, + "metadata" => $previousMetadata, ); } @@ -290,6 +296,7 @@ SQL; ->orderByDbStarts(Criteria::ASC) ->findOne(); if (isset($nextMedia)) { + $nextMetadata = null; $nextMediaName = ""; $nextMediaFileId = $nextMedia->getDbFileId(); $nextMediaStreamId = $nextMedia->getDbStreamId(); @@ -298,6 +305,7 @@ SQL; $nextFile = CcFilesQuery::create() ->filterByDbId($nextMediaFileId) ->findOne(); + $nextMetadata = CcFiles::sanitizeResponse($nextFile); $nextMediaName = $nextFile->getDbArtistName() . " - " . $nextFile->getDbTrackTitle(); } else if (isset($nextMediaStreamId)) { $nextMediaType = "webstream"; @@ -312,7 +320,8 @@ SQL; "starts" => $nextMedia->getDbStarts(), "ends" => $nextMedia->getDbEnds(), "type" => $nextMediaType, - "name" => $nextMediaName + "name" => $nextMediaName, + "metadata" => $nextMetadata ); }