Merge branch '2.1.x' into devel

airtime_mvc/application/controllers/ApiController.php

@@ -148,7 +148,7 @@ class ApiController extends Zend_Controller_Action
                         //user clicks play button for track and downloads it.
                         header('Content-Disposition: inline; filename="'.$file_base_name.'"');
                     }
-                    if ($ext === 'mp3'){
+                    if (strtolower($ext) === 'mp3'){
                         $this->smartReadFile($filepath, 'audio/mpeg');
                     } else {
                         $this->smartReadFile($filepath, 'audio/'.$ext);

airtime_mvc/application/controllers/AudiopreviewController.php

@@ -106,9 +106,9 @@ class AudiopreviewController extends Zend_Controller_Action
                               'element_position' => isset($track['position'])?$track['position']:"",
                             );
             $fileExtension = pathinfo($track['CcFiles']['filepath'], PATHINFO_EXTENSION);
-            if ($fileExtension === 'mp3'){
+            if (strtolower($fileExtension) === 'mp3'){
                 $elementMap['element_mp3'] = $track['CcFiles']['gunid'].'.'.$fileExtension;
-            } else if( $fileExtension === 'ogg') {
+            } else if(strtolower($fileExtension) === 'ogg') {
                 $elementMap['element_oga'] = $track['CcFiles']['gunid'].'.'.$fileExtension;
             } else {
                 //the media was neither mp3 or ogg
@@ -181,9 +181,9 @@ class AudiopreviewController extends Zend_Controller_Action
             );
            
             $fileExtension = pathinfo($track['filepath'], PATHINFO_EXTENSION);
-            if ($fileExtension === 'mp3'){
+            if (strtolower($fileExtension) === 'mp3'){
                 $elementMap['element_mp3'] = $track['gunid'].'.'.$fileExtension;
-            } else if( $fileExtension === 'ogg') {
+            } else if(strtolower($fileExtension) === 'ogg') {
                 $elementMap['element_oga'] = $track['gunid'].'.'.$fileExtension;
             } else {
                 //the media was neither mp3 or ogg

airtime_mvc/application/forms/EditAudioMD.php

@@ -33,7 +33,8 @@ class Application_Form_EditAudioMD extends Zend_Form
             'label'      => 'Track:',
             'class'      => 'input_text',
             'filters'    => array('StringTrim'),
-            'validators' => array('Int')
+            'validators' => array('Int'),
+            'required' => true
         ));
 
 		// Add genre field

airtime_mvc/application/models/StoredFile.php

@@ -886,9 +886,9 @@ Logging::log("getting media! - 2");
                 }
                 
                 // Check if file is playable
-                $command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' > /dev/null 2>&1", $audio_file);
+                $command = sprintf("/usr/bin/airtime-liquidsoap -c 'output.dummy(audio_to_stereo(single(\"%s\")))' 2>&1", $audio_file);
                 exec($command, $output, $rv);
-                if ($rv != 0) {
+                if ($rv != 0 || count($output) != 0) {
                     $result = array("code" => 110, "message" => "This file appears to be corrupted and will not be added to media library.");
                 }
                 else {

airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js

@@ -166,25 +166,23 @@ function play(p_playlistIndex){
  */
 function playOne(p_audioFileID) {
     var playlist = new Array();
-    var fileExtensioin = p_audioFileID.split('.').pop();
+    var fileExtension = p_audioFileID.split('.').pop();
-    console.log(p_audioFileID);
+    if (fileExtension.toLowerCase() === 'mp3') {
-    if (fileExtensioin === 'mp3') {
         media = {title: $('.audioFileTitle').text() !== 'null' ?$('.audioFileTitle').text():"",
             artist: $('.audioFileArtist').text() !== 'null' ?$('.audioFileArtist').text():"",
             mp3:"/api/get-media/file/"+p_audioFileID
         };
-    }else if (fileExtensioin === 'ogg' ) {
+    }else if (fileExtension.toLowerCase() === 'ogg' ) {
         media = {title: $('.audioFileTitle').text() != 'null' ?$('.audioFileTitle').text():"",
             artist: $('.audioFileArtist').text() != 'null' ?$('.audioFileArtist').text():"",
             oga:"/api/get-media/file/"+p_audioFileID
         };
     }
     _playlist_jplayer.option("autoPlay", true);
-    console.log(media);
     playlist[0] = media;
     //_playlist_jplayer.setPlaylist(playlist); --if I use this the player will call _init on the setPlaylist and on the ready
     _playlist_jplayer._initPlaylist(playlist);
     _playlist_jplayer.play(0);
     
     window.resizeTo(490, 167);
-}
+}

airtime_mvc/public/js/airtime/showbuilder/builder.js

@@ -301,6 +301,7 @@ var AIRTIME = (function(AIRTIME){
             
             if (!$el.hasClass("ui-state-disabled")) {
                 $el.addClass("ui-state-hover");
+                $("#show_builder .ui-icon-document-b").contextMenu(true);
             }
             else {
                 $("#show_builder .ui-icon-document-b").contextMenu(false);

python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

@@ -212,7 +212,7 @@ class MediaMonitorCommon:
 
         try:
             #will be in the format .ext
-            file_ext = os.path.splitext(original_path)[1]
+            file_ext = os.path.splitext(original_path)[1].lower()
             path_md = ['MDATA_KEY_TITLE', 'MDATA_KEY_CREATOR', 'MDATA_KEY_SOURCE', 'MDATA_KEY_TRACKNUMBER', 'MDATA_KEY_BITRATE']
 
             md = {}