Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x

airtime_mvc/application/configs/conf.php

@@ -81,5 +81,9 @@ class Config {
 
         $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries'];
         $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries'];
+        
+        if(isset($values['demo']['demo'])){
+            $CC_CONFIG['demo'] = $values['demo']['demo'];
+        } 
     }
 }

airtime_mvc/application/controllers/LoginController.php

@@ -10,6 +10,8 @@ class LoginController extends Zend_Controller_Action
 
     public function indexAction()
     {
+        global $CC_CONFIG;
+        
         if(Zend_Auth::getInstance()->hasIdentity())
         {
         	$this->_redirect('Nowplaying');
@@ -80,11 +82,14 @@ class LoginController extends Zend_Controller_Action
             }
         }
         
-		$this->view->message = $message;
+        $this->view->message = $message;
-		$this->view->error = $error;
+        $this->view->error = $error;
-		$this->view->form = $form;
+        $this->view->form = $form;
-		$this->view->airtimeVersion = Application_Model_Preference::GetAirtimeVersion();
+        $this->view->airtimeVersion = Application_Model_Preference::GetAirtimeVersion();
-		$this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
+        $this->view->airtimeCopyright = AIRTIME_COPYRIGHT_DATE;
+        if(isset($CC_CONFIG['demo'])){
+            $this->view->demo = $CC_CONFIG['demo'];
+        }
     }
 
     public function logoutAction()

airtime_mvc/application/forms/Login.php

@@ -5,6 +5,8 @@ class Application_Form_Login extends Zend_Form
 
     public function init()
     { 
+        global $CC_CONFIG;
+        
 		// Set the method for the display form to POST
         $this->setMethod('post');
 
@@ -13,17 +15,19 @@ class Application_Form_Login extends Zend_Form
             'label'      => 'Username:',
             'class'      => 'input_text',
             'required'   => true,
+            'value'      => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
             'filters'    => array('StringTrim'),
             'validators' => array(
                 'NotEmpty',
             )
         ));
-
+        
 		// Add password element
         $this->addElement('password', 'password', array(
             'label'      => 'Password:',
             'class'      => 'input_text',
             'required'   => true,
+            'value'      => (isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1)?'admin':'',
             'filters'    => array('StringTrim'),
             'validators' => array(
                 'NotEmpty',

airtime_mvc/application/forms/StreamSetting.php

@@ -39,12 +39,14 @@ class Application_Form_StreamSetting extends Zend_Form
         }
 
         # tooltip
-        $description = 'VLC and mplayer have a serious bug when playing an OGG/VORBIS
+        $description = 'This option enables metadata for OGG streams (stream
-                    stream that has metadata information enabled (stream metadata is the
+                    metadata is the track title, artist, and show name that is
-                    track title, show name, etc displayed in the audio player): they will
+                    displayed in an audio player). VLC and mplayer have a
-                    disconnect from the stream after every song if this option is enabled.
+                    serious bug when playing an OGG/VORBIS stream that has
-                    If your listeners do not require support for these audio players,
+                    metadata information enabled: they will disconnect from the
-                    then you should enable this option.';
+                    stream after every song. If you are using an OGG stream and
+                    your listeners do not require support for these audio
+                    players, then feel free to enable this option.';
 
         $icecast_vorbis_metadata = new Zend_Form_Element_Checkbox('icecast_vorbis_metadata');
         $icecast_vorbis_metadata->setLabel('Icecast Vorbis Metadata')

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

@@ -2,6 +2,9 @@
     <div class="logobox">&nbsp;</div>
         <h2>Login</h2>
     <div id="login" class="login-content clearfix">
+        <?php if(isset($this->demo) && $this->demo == 1){?>
+            <p style="font-weight:bold">Welcome to the online Airtime demo! You can log in using the username 'admin' and the password 'admin'.</p>
+        <?php }?>
         <p class="light" style='<?php echo $this->error?"color:#902d2d;font-size:11px;padding:2px 4px;background:#c6b4b4;margin-bottom:2px;border:1px solid #c83f3f;":""?>'><?php echo $this->message; ?></p>
         <?php echo $this->form; ?>
     </div>

install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php

@@ -99,6 +99,8 @@ class AirtimeInstall{
 
     public static function MigrateTablesToVersion($dir, $version)
     {
+        echo "Upgrading database, may take several minutes, please wait".PHP_EOL;
+        
         $appDir = AirtimeInstall::GetAirtimeSrcDir();
         $SCRIPTPATH = __DIR__;
         $command = "php --php-ini $SCRIPTPATH/../../airtime-php.ini ".

install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php

@@ -56,6 +56,8 @@ class UpgradeCommon{
 
     public static function MigrateTablesToVersion($dir, $version)
     {
+        echo "Upgrading database, may take several minutes, please wait".PHP_EOL;
+        
         $appDir = self::GetAirtimeSrcDir();
         $command = "php --php-ini $dir/../../airtime-php.ini ".
                     "$appDir/library/doctrine/migrations/doctrine-migrations.phar ".