Merge branch 'saas-dev' into soundcloud

airtime_mvc/application/controllers/EmbedController.php

@@ -78,12 +78,18 @@ class EmbedController extends Zend_Controller_Action
 
     public function weeklyProgramAction()
     {
-        $this->view->layout()->disableLayout();
 
         $CC_CONFIG = Config::getConfig();
 
         $request = $this->getRequest();
 
+        $useIframe = $request->getParam('useiframe');
+        if (!isset($useIframe)) {
+            $this->view->layout()->disableLayout();
+        } elseif ($useIframe == "1") {
+            $this->_helper->layout->setLayout('bare');
+        }
+
         $widgetStyle = $request->getParam('style');
         if ($widgetStyle == "premium") {
             $this->view->widgetStyle = "premium";

airtime_mvc/application/models/Preference.php

@@ -1,5 +1,6 @@
 <?php
 
+require_once 'StreamSetting.php';
 require_once 'Cache.php';
 
 class Application_Model_Preference
@@ -732,6 +733,19 @@ class Application_Model_Preference
     public static function SetNumOfStreams($num)
     {
         self::setValue("num_of_streams", intval($num));
+
+        //Enable or disable each stream according to whatever was just changed.
+        for ($streamIdx = 1; $streamIdx <= MAX_NUM_STREAMS; $streamIdx++)
+        {
+            $prefix = 's' . $streamIdx . '_';
+            $enable = 'false';
+            if ($streamIdx <= intval($num)) {
+                $enable = 'true';
+            }
+
+            //Enable or disable the stream in the Stream Settings DB table.
+            Application_Model_StreamSetting::setIndividualStreamSetting(array($prefix.'enable' => $enable));
+        }
     }
 
     public static function GetNumOfStreams()

airtime_mvc/application/models/StreamSetting.php

@@ -279,7 +279,7 @@ class Application_Model_StreamSetting
             $sql = "UPDATE cc_stream_setting SET value=:v WHERE keyname=:keyname";
             $map = array(":v" => $v, ":keyname"=>$keyname);
 
-            $res = Application_Common_Database::prepareAndExecute($sql, $map, 
+            $res = Application_Common_Database::prepareAndExecute($sql, $map,
                 Application_Common_Database::EXECUTE);
         }
     }

airtime_mvc/application/views/scripts/embed/player.phtml

@@ -5,6 +5,7 @@
     <link rel="stylesheet" href="<?php echo $this->css?>" type="text/css">
     <script src="<?php echo $this->mrp_js?>" type="text/javascript"></script>
     <script src="<?php echo $this->jquery?>" type="text/javascript"></script>
+    <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
     <script type="text/javascript">
 
         var MAX_MOBILE_SCREEN_WIDTH = 760;

airtime_mvc/application/views/scripts/embed/weekly-program.phtml

@@ -6,6 +6,7 @@
     <script src="<?php echo $this->jquery ?>" type="text/javascript"></script>
     <script src="<?php echo $this->jquery_custom ?>" type="text/javascript"></script>
     <script src="<?php echo $this->widget_js ?>" type="text/javascript"></script>
+    <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
     <script type="text/javascript">
         $(document).ready(function() {
             $('.tabs li').click(function(){

airtime_mvc/application/views/scripts/index/index.phtml

@@ -1,3 +1,17 @@
+<script language="JavaScript">
+function autoResize(id){
+var newheight;
+var newwidth;
+
+if(document.getElementById){
+newheight=document.getElementById(id).contentWindow.document .body.scrollHeight;
+newwidth=document.getElementById(id).contentWindow.document .body.scrollWidth;
+}
+
+document.getElementById(id).height= (newheight) + "px";
+document.getElementById(id).width= (newwidth) + "px";
+}
+</script>
 
 <div class="wrapper">
 
@@ -17,7 +31,8 @@
     </div>
 
     <div id="tab-1" class="schedule tab_content current">
-        <iframe id="schedule_iframe" height="400px" scrolling="no" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>></iframe>
+        <?php //echo $this->action('weekly-program','embed', 'default', array('style' => 'premium', 'useiframe' => '1')); ?>
+        <iframe onLoad="autoResize('schedule_iframe');" id="schedule_iframe" height="300px" scrolling="yes" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>></iframe>
     </div>
 
     

airtime_mvc/public/.htaccess

@@ -1,26 +0,0 @@
-php_value post_max_size 500M
-php_value upload_max_filesize 500M
-php_value request_order "GPC"
-php_value session.gc_probability 0
-php_value session.auto_start 0
-
-RewriteEngine On
-RewriteOptions inherit
-RewriteCond %{SERVER_NAME} localhost$
-RewriteCond %{REQUEST_FILENAME} -s [OR]
-RewriteCond %{REQUEST_FILENAME} -l [OR]
-RewriteCond %{REQUEST_FILENAME} -d
-RewriteRule ^.*$ - [NC,L]
-RewriteCond %{SERVER_NAME} localhost$
-RewriteRule ^.*$ index.php [NC,L]
-
-AddOutputFilterByType DEFLATE text/plain
-AddOutputFilterByType DEFLATE text/html
-AddOutputFilterByType DEFLATE text/xml
-AddOutputFilterByType DEFLATE text/css
-AddOutputFilterByType DEFLATE application/xml
-AddOutputFilterByType DEFLATE application/xhtml+xml
-AddOutputFilterByType DEFLATE application/rss+xml
-AddOutputFilterByType DEFLATE application/javascript
-AddOutputFilterByType DEFLATE application/x-javascript
-AddOutputFilterByType DEFLATE application/json

airtime_mvc/public/css/embed/weekly-schedule-widget.css

@@ -9,7 +9,6 @@ body {
     visibility: hidden;
     max-width: 750px;
     /*margin: 0 auto;*/
-    margin-bottom: 140px;
     padding: 10px;
     position: absolute;
     /*left: 50%;
@@ -68,7 +67,10 @@ body {
 }
 
 .schedule.current .schedule_content {
-    max-height: 300px;
+    /*height: 50%;
+    overflow-y: auto;*/
+    max-height: 700px;
+    overflow-y: auto;
 }
 
 .schedule_item {

airtime_mvc/public/css/radio-page/premium_player.css

@@ -44,14 +44,14 @@ body {
 .bottom_bar p.now_playing {
     color: #222222;
     font-size: 26px;
-    font-weight: normal;
+    font-weight: 300;
     float: left;
     margin: 28px 0px;
 }
 
 .bottom_bar p.now_playing span {
     display: block;
-    font-weight: lighter;
+    font-weight: 100;
 }
 
 .bottom_bar .button {

airtime_mvc/public/css/radio-page/radio-page.css

@@ -4,11 +4,18 @@ html {
     -moz-background-size: cover;
     -o-background-size: cover;
     background-size: cover;
-    overflow-y: hidden;
+    overflow-y: auto;
 }
 
+
+body {
+    font-family: 'Roboto', sans-serif;
+    margin: 0px;
+}
+
+
 .bck_cover {
-    position: fixed;
+    position: absolute;
     top: 0px;
     right: 0px;
     bottom: 0px;
@@ -17,11 +24,6 @@ html {
     z-index: -1;
 }
 
-body {
-    font-family: 'Roboto', sans-serif;
-    margin: 0px;
-}
-
 .logo img {
     margin: 40px 0px 0px 60px;
 }
@@ -31,8 +33,6 @@ body {
     margin-right: 60px;
     margin-top: 40px;
     display:inline-block;
-    background-color: #000000;
-    opacity: 0.5;
     padding: 10px;
 }
 
@@ -47,7 +47,7 @@ body {
 }
 
 span.login-img {
-    background: url('img/login-small.png') no-repeat center -25px;
+    background: url('img/login-small-white.png') no-repeat center -25px;
     display: inline-block;
     vertical-align: middle;
     width: 25px;

airtime_mvc/public/css/styles.css

@@ -2262,7 +2262,7 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
 }
 .preferences.simple-formblock dd.block-display,
  .preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select,
- .preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
+.preferences dd.block-display .input_select, .stream-config dd.block-display .input_select {
     width: 100%;
 }
 .preferences dd.block-display .input_text_area, .preferences dd.block-display .input_text 

airtime_mvc/public/index.php

@@ -54,7 +54,7 @@ if (array_key_exists('config', $_GET)) {
     showConfigCheckPage();
 }
 
-$filename = isset($_SERVER['AIRTIME_CONF']) ? 
+$filename = isset($_SERVER['AIRTIME_CONF']) ?
     $_SERVER['AIRTIME_CONF'] : AIRTIME_CONFIG_STOR . AIRTIME_CONFIG;
 
 // If a configuration file exists, forward to our boot script

installer/apache/airtime-vhost

@@ -2,11 +2,36 @@
    ServerAdmin foo@bar.org
    DocumentRoot WEB_ROOT
    php_admin_value upload_tmp_dir /tmp
+   php_value post_max_size 500M
+   php_value upload_max_filesize 500M
+   php_value request_order "GPC"
+   php_value session.gc_probability 0
+   php_value session.auto_start 0
+
+   AddOutputFilterByType DEFLATE text/plain
+   AddOutputFilterByType DEFLATE text/html
+   AddOutputFilterByType DEFLATE text/xml
+   AddOutputFilterByType DEFLATE text/css
+   AddOutputFilterByType DEFLATE application/xml
+   AddOutputFilterByType DEFLATE application/xhtml+xml
+   AddOutputFilterByType DEFLATE application/rss+xml
+   AddOutputFilterByType DEFLATE application/javascript
+   AddOutputFilterByType DEFLATE application/x-javascript
+   AddOutputFilterByType DEFLATE application/json
+
 
   <Directory WEB_ROOT>
-      DirectoryIndex index.php
-      AllowOverride all
+
+      RewriteEngine On
+      RewriteCond %{REQUEST_FILENAME} -s [OR]
+      RewriteCond %{REQUEST_FILENAME} -l [OR]
+      RewriteCond %{REQUEST_FILENAME} -d
+      RewriteRule ^.*$ - [NC,L]
+      RewriteRule ^.*$ index.php [NC,L]
       Order allow,deny
       Allow from all
+
+      Require all granted
+
   </Directory>
 </VirtualHost>