Merge branch '1.9.1' into devel

CREDITS

@@ -1,6 +1,17 @@
 =======
 CREDITS
 =======
+Version 1.9.3
+-------------
+Same as previous version.
+
+Version 1.9.2
+-------------
+Same as previous version.
+
+Version 1.9.1
+-------------
+Same as previous version.
 
 Version 1.9.0
 -------------

airtime_mvc/application/controllers/LibraryController.php

@@ -178,9 +178,10 @@ class LibraryController extends Zend_Controller_Action
     {
         $request = $this->getRequest();
         $form = new Application_Form_EditAudioMD();
-
+        
         $file_id = $this->_getParam('id', null);
         $file = StoredFile::Recall($file_id);
+        $form->populate($file->getDbColMetadata());
 
         if ($request->isPost()) {
             if ($form->isValid($request->getPost())) {
@@ -196,7 +197,6 @@ class LibraryController extends Zend_Controller_Action
             }
         }
 
-        $form->populate($file->getDbColMetadata());
         $this->view->form = $form;
     }
 

airtime_mvc/application/forms/EditAudioMD.php

@@ -29,21 +29,15 @@ class Application_Form_EditAudioMD extends Zend_Form
 		// Add title field
         $this->addElement('text', 'track_title', array(
             'label'      => 'Title:',
-            'required'   => true,
             'class'      => 'input_text',
             'filters'    => array('StringTrim'),
-            'validators' => array(
-                'NotEmpty',
-            )
         ));
 
 		// Add artist field
         $this->addElement('text', 'artist_name', array(
             'label'      => 'Artist:',
-            'required'   => true,
             'class'      => 'input_text',
             'filters'    => array('StringTrim'),
-            'validators' => array('NotEmpty')
         ));
 
 		// Add album field

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

@@ -547,7 +547,8 @@ class Airtime190Upgrade{
 
     public static function InstallAirtimePhpServerCode($phpDir)
     {
-
+        // delete old files
+        exec("rm -rf ".$phpDir);
         $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc');
 
         echo "* Installing PHP code to ".$phpDir.PHP_EOL;

python_apps/show-recorder/recorder.py

@@ -157,7 +157,7 @@ class ShowRecorder(Thread):
 
                 self.upload_file(filepath)
                 os.remove(filepath)
-            except Exceptio, e:
+            except Exception, e:
                 self.logger.error(e)
         else:
             self.logger.info("problem recording show")