diff --git a/airtime_mvc/application/common/HTTPHelper.php b/airtime_mvc/application/common/HTTPHelper.php index c702da480..a27f81075 100644 --- a/airtime_mvc/application/common/HTTPHelper.php +++ b/airtime_mvc/application/common/HTTPHelper.php @@ -18,7 +18,14 @@ class Application_Common_HTTPHelper ); } - public static function getStationUrl() + /** + * Construct the base station URL + * + * @param boolean $secured whether or not to use HTTPS + * + * @return string the station URL + */ + public static function getStationUrl($secured = true) { $CC_CONFIG = Config::getConfig(); $baseUrl = $CC_CONFIG['baseUrl']; @@ -32,7 +39,7 @@ class Application_Common_HTTPHelper } $scheme = "http"; - if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') { + if ($secured && !empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') { $scheme = "https"; $basePort = "443"; //Airtime Pro compatibility hack } diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php index 8183a1d80..333e8a865 100644 --- a/airtime_mvc/application/services/PodcastService.php +++ b/airtime_mvc/application/services/PodcastService.php @@ -152,14 +152,14 @@ class Application_Service_PodcastService public static function createStationPodcast() { $podcast = new Podcast(); - $podcast->setDbUrl(Application_Common_HTTPHelper::getStationUrl() . "feeds/station-rss"); + $podcast->setDbUrl(Application_Common_HTTPHelper::getStationUrl(false) . "feeds/station-rss"); $title = Application_Model_Preference::GetStationName(); $title = empty($title) ? "My Station's Podcast" : $title; $podcast->setDbTitle($title); $podcast->setDbDescription(Application_Model_Preference::GetStationDescription()); - $podcast->setDbLink(Application_Common_HTTPHelper::getStationUrl()); + $podcast->setDbLink(Application_Common_HTTPHelper::getStationUrl(false)); $podcast->setDbLanguage(explode('_', Application_Model_Preference::GetLocale())[0]); $podcast->setDbCreator(Application_Model_Preference::GetStationName()); $podcast->setDbOwner(self::getOwnerId()); @@ -368,11 +368,11 @@ class Application_Service_PodcastService self::addEscapedChild($channel, "language", $podcast->getDbLanguage()); self::addEscapedChild($channel, "copyright", $podcast->getDbCopyright()); - $imageUrl = Application_Common_HTTPHelper::getStationUrl()."images/airtime_logo.png"; + $imageUrl = Application_Common_HTTPHelper::getStationUrl(false)."images/airtime_logo.png"; $image = $channel->addChild("image"); $image->addChild("title", "image title"); self::addEscapedChild($image, "url", $imageUrl); - self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl()); + self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl(false)); $xml->addAttribute('xmlns:xmlns:itunes', ITUNES_XML_NAMESPACE_URL); self::addEscapedChild($channel, "xmlns:itunes:author", $podcast->getDbItunesAuthor()); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index dcbfddea3..e30b45295 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -1386,6 +1386,7 @@ var AIRTIME = (function(AIRTIME) { }); var openPodcastEpisodeTable = function (podcast) { + $("#library_filter").append(" - " + podcast.title); mod.podcastEpisodeTableWidget.reload(podcast.id); mod.podcastTableWidget.clearSelection(); mod.setCurrentTable(mod.DataTableTypeEnum.PODCAST_EPISODES); @@ -1427,7 +1428,6 @@ var AIRTIME = (function(AIRTIME) { // in the left-hand pane. mod.podcastTableWidget.assignDblClickHandler(function () { var podcast = mod.podcastDataTable.fnGetData(this); - $("#library_filter").append(" - " + $(this).find(".library_title").text()); openPodcastEpisodeTable(podcast); }); @@ -1489,7 +1489,6 @@ var AIRTIME = (function(AIRTIME) { click: function () { var episodes = mod.podcastEpisodeTableWidget.getSelectedRows(); AIRTIME.podcast.importSelectedEpisodes(episodes, mod.podcastEpisodeTableWidget); - mod.podcastEpisodeTableWidget.clearSelection(); } }, validateConstraints: function () { diff --git a/airtime_mvc/public/js/airtime/library/podcast.js b/airtime_mvc/public/js/airtime/library/podcast.js index 03c4b244a..1a01e777c 100644 --- a/airtime_mvc/public/js/airtime/library/podcast.js +++ b/airtime_mvc/public/js/airtime/library/podcast.js @@ -516,6 +516,8 @@ var AIRTIME = (function (AIRTIME) { remainingDiskSpace -= this.enclosure.length; }); + + dt.clearSelection(); }; /**