SAAS-720: Player can't be accessed unless a user has a valid session

airtime_mvc/application/controllers/EmbedController.php

@@ -0,0 +1,56 @@
+<?php
+
+class EmbedController extends Zend_Controller_Action
+{
+    public function init()
+    {
+
+    }
+
+    /**
+     * This is the action that is called to insert the player onto a web page.
+     * It passes all the js and css files to the view, as well as all the
+     * stream customization information.
+     *
+     * The view for this action contains all the inline javascript needed to
+     * create the player.
+     */
+    public function playerAction()
+    {
+        $this->view->layout()->disableLayout();
+
+        $CC_CONFIG = Config::getConfig();
+
+        $request = $this->getRequest();
+
+        $this->view->css = Application_Common_HTTPHelper::getStationUrl() . "css/player.css?".$CC_CONFIG['airtime_version'];
+        $this->view->mrp_js = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/mrp.js?".$CC_CONFIG['airtime_version'];
+        $this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "js/libs/jquery-1.10.2.js";
+        $this->view->muses_swf = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/muses.swf";
+        $this->view->metadata_api_url = Application_Common_HTTPHelper::getStationUrl() . "api/live-info";
+        $this->view->player_title = json_encode($request->getParam('title'));
+
+        $stream = $request->getParam('stream');
+        $streamData = Application_Model_StreamSetting::getEnabledStreamData();
+        $availableMobileStreams = array();
+        $availableDesktopStreams = array();
+
+        if ($stream == "auto") {
+            $this->view->playerMode = "auto";
+            foreach ($streamData as $s) {
+                if ($s["mobile"]) {
+                    array_push($availableMobileStreams, $s);
+                } else if (!$s["mobile"]) {
+                    array_push($availableDesktopStreams, $s);
+                }
+            }
+        } else {
+            $this->view->playerMode = "manual";
+            $selectedStreamData = $streamData[$stream];
+            $this->view->streamURL = json_encode($selectedStreamData["url"]);
+            $this->view->codec = $selectedStreamData["codec"];
+        }
+        $this->view->availableMobileStreams = json_encode($availableMobileStreams);
+        $this->view->availableDesktopStreams = json_encode($availableDesktopStreams);
+    }
+}

airtime_mvc/application/controllers/PlayerController.php

@@ -28,53 +28,4 @@ class PlayerController extends Zend_Controller_Action
         }
 
     }
-
+}
-    /**
-     * This is the action that is called to insert the player onto a web page.
-     * It passes all the js and css files to the view, as well as all the
-     * stream customization information.
-     *
-     * The view for this action contains all the inline javascript needed to
-     * create the player.
-     */
-    public function indexAction()
-    {
-        $this->view->layout()->disableLayout();
-
-        $CC_CONFIG = Config::getConfig();
-
-
-        $request = $this->getRequest();
-
-        $this->view->css = Application_Common_HTTPHelper::getStationUrl() . "css/player.css?".$CC_CONFIG['airtime_version'];
-        $this->view->mrp_js = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/mrp.js?".$CC_CONFIG['airtime_version'];
-        $this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "js/libs/jquery-1.10.2.js";
-        $this->view->muses_swf = Application_Common_HTTPHelper::getStationUrl() . "js/airtime/player/muses.swf";
-        $this->view->metadata_api_url = Application_Common_HTTPHelper::getStationUrl() . "api/live-info";
-        $this->view->player_title = json_encode($request->getParam('title'));
-
-        $stream = $request->getParam('stream');
-        $streamData = Application_Model_StreamSetting::getEnabledStreamData();
-        $availableMobileStreams = array();
-        $availableDesktopStreams = array();
-
-        if ($stream == "auto") {
-            $this->view->playerMode = "auto";
-            foreach ($streamData as $s) {
-                if ($s["mobile"]) {
-                    array_push($availableMobileStreams, $s);
-                } else if (!$s["mobile"]) {
-                    array_push($availableDesktopStreams, $s);
-                }
-            }
-        } else {
-            $this->view->playerMode = "manual";
-            $selectedStreamData = $streamData[$stream];
-            $this->view->streamURL = json_encode($selectedStreamData["url"]);
-            $this->view->codec = $selectedStreamData["codec"];
-        }
-        $this->view->availableMobileStreams = json_encode($availableMobileStreams);
-        $this->view->availableDesktopStreams = json_encode($availableDesktopStreams);
-        //$this->view->displayMetadata = $request->getParam('display_metadata');
-    }
-}

airtime_mvc/application/controllers/plugins/Acl_plugin.php

@@ -118,7 +118,8 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
                 "locale",
                 "upgrade",
                 'whmcs-login',
-                "provisioning"
+                "provisioning",
+                "embed"
             )))
         {
             $this->setRoleName("G");

airtime_mvc/application/forms/Player.php

@@ -76,7 +76,7 @@ class Application_Form_Player extends Zend_Form_SubForm
         $embedSrc->setAttrib('cols', '40')
             ->setAttrib('rows', '4');
         $embedSrc->setLabel(_("Embeddable code:"));
-        $embedSrc->setValue('<iframe frameborder="0" width="280" height="210" src="'.Application_Common_HTTPHelper::getStationUrl().'player?stream=auto&title=Now Playing"></iframe>');
+        $embedSrc->setValue('<iframe frameborder="0" width="280" height="210" src="'.Application_Common_HTTPHelper::getStationUrl().'embed/player?stream=auto&title=Now Playing"></iframe>');
         $this->addElement($embedSrc);
 
         $previewLabel = new Zend_Form_Element_Text('player_preview_label');
@@ -84,4 +84,4 @@ class Application_Form_Player extends Zend_Form_SubForm
         $this->addElement($previewLabel);
 
     }
-}
+}