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

CC-2740: Upload issue 

- fixed a bug for uploading a file with "+" signs in IE
This commit is contained in:
James 2011-08-30 15:25:33 -04:00
parent 7335dcc2b3
commit d0ecd0acf1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
airtime_mvc/application/models/StoredFile.php
View File

@ -728,7 +728,7 @@ class StoredFile {
$chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0; $chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0;
$chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0; $chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0;
$fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : ''; $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : '';
Logging::log(__FILE__.':uploadFile(): filename='.$fileName);
// Clean the fileName for security reasons // Clean the fileName for security reasons
//this needs fixing for songs not in ascii. //this needs fixing for songs not in ascii.
//$fileName = preg_replace('/[^\w\._]+/', '', $fileName); //$fileName = preg_replace('/[^\w\._]+/', '', $fileName);
@ -823,7 +823,7 @@ class StoredFile {
public static function copyFileToStor($p_targetDir, $fileName){ public static function copyFileToStor($p_targetDir, $fileName){
$audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName; $audio_file = $p_targetDir . DIRECTORY_SEPARATOR . $fileName;
Logging::log('copyFileToStor: moving file '.$audio_file);
$md5 = md5_file($audio_file); $md5 = md5_file($audio_file);
$duplicate = StoredFile::RecallByMd5($md5); $duplicate = StoredFile::RecallByMd5($md5);
if ($duplicate) { if ($duplicate) {
@ -844,6 +844,7 @@ class StoredFile {
$audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName; $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName;
$r = @copy($audio_file, $audio_stor); $r = @copy($audio_file, $audio_stor);
//$r = @unlink($audio_file);
} }
public static function getFileCount() public static function getFileCount()

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

@ -25,7 +25,7 @@ $(document).ready(function() {
$("#plupload_error").find("table").append(row); $("#plupload_error").find("table").append(row);
}else{ }else{
$.get('/Plupload/copyfile/format/json/name/'+file.name, function(json){ $.get('/Plupload/copyfile/format/json/name/'+encodeURIComponent(file.name), function(json){
var jr = jQuery.parseJSON(json); var jr = jQuery.parseJSON(json);
if(jr.error !== undefined) { if(jr.error !== undefined) {
var row = $("<tr/>") var row = $("<tr/>")