Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Yuchen Wang 2011-12-14 22:21:58 -05:00
commit 150ea0baaf
7 changed files with 388 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
airtime_mvc/application/models/StoredFile.php
View file

@ -810,12 +810,9 @@ class Application_Model_StoredFile {
$contentType = $_SERVER["CONTENT_TYPE"];
// create temp file name (CC-3086)
$command = "mktemp --tmpdir=".$p_targetDir;
$tempFilePath= exec($command);
if($tempFilePath == ""){
die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Unable to create tmp file."}, "id" : "id"}');
}
// we are not using mktemp command anymore.
// plupload support unique_name feature.
$tempFilePath= $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
if (strpos($contentType, "multipart") !== false) {
if (isset($_FILES['file']['tmp_name']) && is_uploaded_file($_FILES['file']['tmp_name'])) {

2
airtime_mvc/public/js/airtime/library/plupload.js
View file

@ -6,6 +6,7 @@ $(document).ready(function() {
runtimes : 'gears, html5, html4',
url : '/Plupload/upload/format/json',
chunk_size: '5mb',
unique_names: 'true',
multiple_queues : 'true',
filters : [
{title: "Audio Files", extensions: "ogg,mp3"}
@ -52,7 +53,6 @@ $(document).ready(function() {
uploadProgress = false;
});
$(window).bind('beforeunload', function(){
if(uploadProgress){
if(!confirm("You are currently uploading files.\nGoing to another screen will cancel the upload process.\nAre you sure you want to cancel the upload process and go to the screen you clicked on?")){