From 9a8e80f74bbaca739a15c79bf2b4a5e35fa80c66 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Wed, 18 Nov 2015 11:10:14 -0500
Subject: [PATCH] Change station podcast RSS links back to https; style fix for
 menu in some browsers

---
 .../application/models/airtime/PodcastEpisodes.php     |  2 +-
 .../application/services/PodcastEpisodeService.php     |  2 +-
 airtime_mvc/application/services/PodcastService.php    | 10 +++++-----
 airtime_mvc/public/css/styles.css                      |  8 ++++++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/models/airtime/PodcastEpisodes.php b/airtime_mvc/application/models/airtime/PodcastEpisodes.php
index 6f47b6e48..f1ea44b59 100644
--- a/airtime_mvc/application/models/airtime/PodcastEpisodes.php
+++ b/airtime_mvc/application/models/airtime/PodcastEpisodes.php
@@ -35,7 +35,7 @@ class PodcastEpisodes extends BasePodcastEpisodes
             $file = CcFilesQuery::create()->findPk($fileId);
             $ext = FileDataHelper::getAudioMimeTypeArray()[$file->getDbMime()];
             $key = Application_Model_Preference::getStationPodcastDownloadKey();
-            return Application_Common_HTTPHelper::getStationUrl(false)."rest/media/$fileId/download/$key.$ext";
+            return Application_Common_HTTPHelper::getStationUrl()."rest/media/$fileId/download/$key.$ext";
         }
         return parent::getDbDownloadUrl();
     }
diff --git a/airtime_mvc/application/services/PodcastEpisodeService.php b/airtime_mvc/application/services/PodcastEpisodeService.php
index 3927e05ef..56298e467 100644
--- a/airtime_mvc/application/services/PodcastEpisodeService.php
+++ b/airtime_mvc/application/services/PodcastEpisodeService.php
@@ -193,7 +193,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
      */
     public function publish($fileId) {
         $id = Application_Model_Preference::getStationPodcastId();
-        $url = $guid = Application_Common_HTTPHelper::getStationUrl(false)."rest/media/$fileId/download";
+        $url = $guid = Application_Common_HTTPHelper::getStationUrl()."rest/media/$fileId/download";
         if (!PodcastEpisodesQuery::create()
             ->filterByDbPodcastId($id)
             ->findOneByDbFileId($fileId)) {  // Don't allow duplicate episodes
diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php
index a7c0411a1..5f0236306 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(false) . "feeds/station-rss");
+        $podcast->setDbUrl(Application_Common_HTTPHelper::getStationUrl() . "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(false));
+        $podcast->setDbLink(Application_Common_HTTPHelper::getStationUrl());
         $podcast->setDbLanguage(explode('_', Application_Model_Preference::GetLocale())[0]);
         $podcast->setDbCreator(Application_Model_Preference::GetStationName());
         $podcast->setDbOwner(self::getOwnerId());
@@ -371,15 +371,15 @@ class Application_Service_PodcastService
             $xml->addAttribute('xmlns:xmlns:atom', "http://www.w3.org/2005/Atom");
 
             $atomLink = $channel->addChild("xmlns:atom:link");
-            $atomLink->addAttribute("href", Application_Common_HTTPHelper::getStationUrl(false) . "feeds/station-rss");
+            $atomLink->addAttribute("href", Application_Common_HTTPHelper::getStationUrl() . "feeds/station-rss");
             $atomLink->addAttribute("rel", "self");
             $atomLink->addAttribute("type", "application/rss+xml");
 
-            $imageUrl = Application_Common_HTTPHelper::getStationUrl(false)."api/station-logo";
+            $imageUrl = Application_Common_HTTPHelper::getStationUrl()."api/station-logo";
             $image = $channel->addChild("image");
             $image->addChild("title", $podcast->getDbTitle());
             self::addEscapedChild($image, "url", $imageUrl);
-            self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl(false));
+            self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl());
 
             $xml->addAttribute('xmlns:xmlns:itunes', ITUNES_XML_NAMESPACE_URL);
             self::addEscapedChild($channel, "xmlns:itunes:author", $podcast->getDbItunesAuthor());
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 528079997..23b4f8eae 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3590,6 +3590,14 @@ button.btn-icon-text > i.icon-white {
     overflow: auto;
 }
 
+#media_type_nav > div:not(#nav) {
+    -webkit-flex: 0 1 auto;
+    -moz-flex: 0 1 auto;
+    -ms-flex: 0 1 auto;
+    -o-flex: 0 1 auto;
+    flex: 0 1 auto;
+}
+
 #media_type_nav .icon-white {
     opacity: 0.8;
 }