Merge remote-tracking branch 'upstream/master' into gh-actions

airtime_mvc/application/configs/constants.php

@@ -12,10 +12,7 @@ define('COMPANY_SITE'       , 'libretime.org');
 define('COMPANY_SITE_URL'   , 'http://libretime.org');
 define('SUPPORT_ADDRESS'    , 'https://discourse.libretime.org/');
 
-define("AIRTIMEPRO_API_URL", "https://account.example.com:5001/api/");
-
 define('HELP_URL'                   , 'https://discourse.libretime.org/');
-define('FAQ_URL'                    , 'http://libretime.org/faq');
 define('WHOS_USING_URL'             , 'https://github.com/orgs/LibreTime/people');
 define('TERMS_AND_CONDITIONS_URL'   , 'https://github.com/LibreTime/libretime/blob/master/README.md');
 define('PRIVACY_POLICY_URL'         , 'https://github.com/LibreTime/code-of-conduct/blob/master/CODE_OF_CONDUCT.md');

airtime_mvc/application/configs/navigation.php

@@ -163,11 +163,6 @@ $pages[] = array(
             'action'     => 'help',
             'resource'   =>    'dashboard'
         ),
-        array(
-            'label'      => _('FAQ'),
-            'uri'        => FAQ_URL,
-            'target'     => "_blank"
-        ),
         array(
             'label'      => _('User Manual'),
             'uri'        => USER_MANUAL_URL,

airtime_mvc/application/controllers/ScheduleController.php

@@ -90,7 +90,7 @@ class ScheduleController extends Zend_Controller_Action
         AirtimeTableView::injectTableJavaScriptDependencies($headScript, $baseUrl, $CC_CONFIG['airtime_version']);
 
         $this->view->headScript()->appendFile($baseUrl.'js/libs/moment.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
-        $this->view->headScript()->appendFile($baseUrl.'js/libs/moment-timezone-with-data-2010-2020.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
+        $this->view->headScript()->appendFile($baseUrl.'js/libs/moment-timezone.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

airtime_mvc/application/models/StreamSetting.php

@@ -284,8 +284,8 @@ class Application_Model_StreamSetting
             'output' => 'icecast',
             'user'   => $config['stationId'],
             'pass'   => Application_Model_Preference::getDefaultIcecastPassword(),
-            // Kind of ugly... convert prefix int to ascii char
-            'mount'  => $config['stationId'] . '_' . chr($prefix[1] + 96),
+            // Manually setting default mountpoint
+            'mount'  => 'airtime_128',
         );
     }
 

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

@@ -21,9 +21,9 @@
             this.settings = {
                 'elementId': id_element,    // leave alone
                 'autoplay': false,          // or true (only works on some browsers)
-                'forceHTTPS': true,         // or true if the stream is in SSL (beware of the listening port, usually 8000)
-                'replacePort':false,        // false for disabled or '8000' as the usual start port, forces to specify replacePortTo.
-                'replacePortTo':''          // either '' to use the default port of the browser (80/http, 443/https) or '8443' to force the port of the stream.
+                'forceHTTPS': false,         // or true if the stream is in SSL (beware of the listening port, usually 8000)
+                'replacePort': false,        // false for disabled or '8000' as the usual start port, forces to specify replacePortTo.
+                'replacePortTo': ''          // either '' to use the default port of the browser (80/http, 443/https) or '8443' to force the port of the stream.
             };
 
             if (this.playerMode == "manual") {
@@ -109,7 +109,7 @@
 
         Html5Player.prototype.play = function() {
             console.log('play');
-            playerhtml5_audio.src = this.settings.url+'?'+Math.floor(Math.random() * Math.floor(100000));
+            playerhtml5_audio.src = this.settings.url;
             playerhtml5_audio.play();
             togglePlayStopButton();
         };
@@ -267,4 +267,4 @@
 </div>
 
 </body>
-</html>
+</html>