Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po

airtime_mvc/application/controllers/PluploadController.php

@@ -60,12 +60,17 @@ class PluploadController extends Zend_Controller_Action
         
         foreach ($recentUploads as $upload)
         {
-            $upload->toArray(BasePeer::TYPE_FIELDNAME);
-            //array_push($uploadsArray, $upload); //TODO: $this->sanitizeResponse($upload));
+            $upload = $upload->toArray(BasePeer::TYPE_FIELDNAME);
+            //TODO: $this->sanitizeResponse($upload));
+            $utcTimezone = new DateTimeZone("UTC");
+            $displayTimezone = new DateTimeZone(Application_Model_Preference::GetUserTimezone());
+            $upload['utime'] = new DateTime($upload['utime'], $utcTimezone);
+            $upload['utime']->setTimeZone($displayTimezone);
+            $upload['utime'] = $upload['utime']->format('Y-m-d H:i:s');
             
             //$this->_helper->json->sendJson($upload->asJson());
             //TODO: Invoke sanitization here
-            array_push($uploadsArray, $upload->toArray(BasePeer::TYPE_FIELDNAME));
+            array_push($uploadsArray, $upload);
         }
         
 

airtime_mvc/application/models/StoredFile.php

@@ -982,6 +982,7 @@ SQL;
         } else {
             $uid = $user->getId();
         }
+        /*
         $id_file = "$audio_stor.identifier";
         if (file_put_contents($id_file, $uid) === false) {
             Logging::info("Could not write file to identify user: '$uid'");
@@ -991,7 +992,8 @@ SQL;
         } else {
             Logging::info("Successfully written identification file for
             uploaded '$audio_stor'");
-        }
+        }*/
+        
         //if the uploaded file is not UTF-8 encoded, let's encode it. Assuming source
         //encoding is ISO-8859-1
         $audio_stor = mb_detect_encoding($audio_stor, "UTF-8") == "UTF-8" ? $audio_stor : utf8_encode($audio_stor);
@@ -1004,7 +1006,7 @@ SQL;
             //the file wasn't uploaded and they should check if there  .
             //is enough disk space                                     .
             unlink($audio_file); //remove the file after failed rename
-            unlink($id_file); // Also remove the identifier file
+            //unlink($id_file); // Also remove the identifier file
     
             throw new Exception("The file was not uploaded, this error can occur if the computer "
                             ."hard drive does not have enough disk space or the stor "

airtime_mvc/application/modules/rest/controllers/MediaController.php

@@ -335,7 +335,15 @@ class Rest_MediaController extends Zend_Rest_Controller
                 
         $tempFilePath = $_FILES['file']['tmp_name'];
         $tempFileName = basename($tempFilePath);
-                
+        
+        //Only accept files with a file extension that we support.
+        $fileExtension = pathinfo($originalFilename, PATHINFO_EXTENSION);
+        if (!in_array(strtolower($fileExtension), explode(",", "ogg,mp3,oga,flac,wav,m4a,mp4,opus")))
+        {
+            @unlink($tempFilePath);
+            throw new Exception("Bad file extension.");
+        }
+            
         //TODO: Remove uploadFileAction from ApiController.php **IMPORTANT** - It's used by the recorder daemon...
          
         $storDir = Application_Model_MusicDir::getStorDir();
@@ -346,7 +354,9 @@ class Rest_MediaController extends Zend_Rest_Controller
             //and accessible by airtime_analyzer which could be running on a different machine.
             $newTempFilePath = Application_Model_StoredFile::copyFileToStor($tempFilePath, $originalFilename);
         } catch (Exception $e) {
+            @unlink($tempFilePath);
             Logging::error($e->getMessage());
+            return;
         }
         
         Logging::info($newTempFilePath);

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

@@ -15,12 +15,12 @@
     
             <div id="recent_uploads_filter">
             <form>
-                <input type="radio" name="upload_status" id="upload_status_all" checked></input><label for="upload_status_all">All</label>
-                <input type="radio" name="upload_status" id="upload_status_failed"></input><label for="upload_status_failed">Failed</label>
-                <input type="radio" name="upload_status" id="upload_status_pending"></input><label for="upload_status_pending">Pending</label>
+                <input type="radio" name="upload_status" id="upload_status_all" checked></input><label for="upload_status_all"><?php echo _("All")?></label>
+                <input type="radio" name="upload_status" id="upload_status_failed"></input><label for="upload_status_failed"><?php echo _("Failed")?></label>
+                <input type="radio" name="upload_status" id="upload_status_pending"></input><label for="upload_status_pending"><?php echo _("Pending")?></label>
             </form>        
         </div>
-        <H2>Recent Uploads</H2>
+        <H2><?php echo _("Recent Uploads")?></H2>
         <table id="recent_uploads_table" class="lib-content ui-widget ui-widget-content block-shadow alpha-block "></table>
     </div>
     <div style="clear: both;"></div>