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

Merge remote-tracking branch 'origin/saas-dev-publishing' into saas-dev-publishing

Browse source
This commit is contained in:
Albert Santoni 2015-11-17 16:18:57 -05:00
commit ef1a57459c
12 changed files with 60 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/common/TaskManager.php
View file

@ -237,7 +237,8 @@ class PodcastTask implements AirtimeTask {
* @return bool true if the podcast polling interval has passed
*/
public function shouldBeRun() {
return PodcastManager::hasPodcastPollIntervalPassed();
$overQuota = Application_Model_Systemstatus::isDiskOverQuota();
return !$overQuota && PodcastManager::hasPodcastPollIntervalPassed();
}
/**

7
airtime_mvc/application/forms/PodcastPreferences.php
View file

@ -10,8 +10,12 @@ class Application_Form_PodcastPreferences extends Zend_Form_SubForm {
_("Public"),
_("Private"),
));
$stationPodcastPrivacy->setSeparator(' ');
$stationPodcastPrivacy->addDecorator('HtmlTag', array('tag' => 'dd',
'id'=>"stationPodcastPrivacy-element",
'class' => 'radio-inline-list',
));
$stationPodcastPrivacy->setValue($isPrivate);
$stationPodcastPrivacy->setDecorators(array('ViewHelper', 'Label'));
$this->addElement($stationPodcastPrivacy);
$stationPodcast = PodcastQuery::create()->findOneByDbId(Application_Model_Preference::getStationPodcastId());
@ -22,7 +26,6 @@ class Application_Form_PodcastPreferences extends Zend_Form_SubForm {
->setRequired(false)
->setLabel(_("Feed URL"))
->setValue($url);
$feedUrl->setDecorators(array('ViewHelper', 'Label'));
$this->addElement($feedUrl);
}

14
airtime_mvc/application/services/PodcastService.php
View file

@ -160,7 +160,7 @@ class Application_Service_PodcastService
$podcast->setDbDescription(Application_Model_Preference::GetStationDescription());
$podcast->setDbLink(Application_Common_HTTPHelper::getStationUrl());
$podcast->setDbLanguage(Application_Model_Preference::GetLocale());
$podcast->setDbLanguage(explode('_', Application_Model_Preference::GetLocale())[0]);
$podcast->setDbCreator(Application_Model_Preference::GetStationName());
$podcast->setDbOwner(self::getOwnerId());
$podcast->save();
@ -387,8 +387,10 @@ class Application_Service_PodcastService
// Need to split categories into separate tags
$itunesCategories = explode(",", $podcast->getDbItunesCategory());
foreach ($itunesCategories as $c) {
$category = $channel->addChild("xmlns:itunes:category");
$category->addAttribute("text", $c);
if (!empty($c)) {
$category = $channel->addChild("xmlns:itunes:category");
$category->addAttribute("text", $c);
}
}
$episodes = PodcastEpisodesQuery::create()->filterByDbPodcastId($stationPodcastId)->find();
@ -406,7 +408,9 @@ class Application_Service_PodcastService
//category
foreach($itunesCategories as $c) {
self::addEscapedChild($item, "category", $c);
if (!empty($c)) {
self::addEscapedChild($item, "category", $c);
}
}
//guid
@ -437,7 +441,7 @@ class Application_Service_PodcastService
//itunes:explicit - skip this?
//itunes:duration
self::addEscapedChild($item, "xmlns:itunes:duration", $publishedFile->getDbLength());
self::addEscapedChild($item, "xmlns:itunes:duration", explode('.', $publishedFile->getDbLength())[0]);
}
//Format it nicely with newlines...

2
airtime_mvc/application/views/scripts/index/index.phtml
View file

@ -70,7 +70,7 @@
<div id="jp_container_1" class="jp-audio">
<div class="jp-type-playlist">
<div class="current-track">Now Playing: <span></span></div>
<div class="current-track track-overflow">Now Playing: <span class="track-overflow"></span></div>
<div class="jp-gui jp-interface">
<div class="playbar playbar-buttons">
<ul class="jp-controls rss-buttons">

2
airtime_mvc/application/views/scripts/library/publish-dialog.phtml
View file

@ -21,7 +21,7 @@
<div class="publish-sources" ng-repeat="source in sources.toPublish">
<input ng-disabled="{{source.status == 2}}" ng-model="publishData[source.source]" type="checkbox" name="publish_sources" id="{{source.source}}">
<label class="source-name" for="{{source.source}}">{{source.label}}</label>
<span ng-if="source.status == 2" style="margin: auto"><?php echo _("You aren't connected to this source.") ?></span>
<span ng-if="source.status == 2" style="margin: auto"><a href="/preference#{{source.source}}-heading"><?php echo _("You aren't connected to this source.") ?></a></span>
</div>
<div ng-if="sources.toPublish.length == 0">
<?php echo _("You have already published this track to all available sources!") . "<br/>"

12
airtime_mvc/application/views/scripts/podcast/station.phtml
View file

@ -74,7 +74,17 @@
<h3 class="collapsible-header" id="podcast-heading"><span class="arrow-icon"></span><?php echo _("Privacy Settings"); ?></h3>
<div class="collapsible-content" id="podcast-settings">
<?php echo $this->form->getSubform('preferences_podcast') ?>
<fieldset class="padded">
<dl>
<?php echo $this->form->getSubform('preferences_podcast')->getElement("stationPodcastPrivacy")->renderLabel() ?>
<div id="podcast-privacy-options">
<?php echo $this->form->getSubform('preferences_podcast')->getElement("stationPodcastPrivacy")->renderViewHelper() ?>
</div>
<div style="clear:both"></div>
<?php echo $this->form->getSubform('preferences_podcast')->getElement("stationPodcastFeedUrl") ?>
</dl>
</fieldset>
</div>
<p id="station_podcast_help_text">