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

Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1

Browse source
This commit is contained in:
James 2011-09-29 15:22:40 -04:00
commit bf15b4cf0d
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
airtime_mvc/application/controllers/ApiController.php
View file

@ -112,6 +112,7 @@ class ApiController extends Zend_Controller_Action
$file_base_name = substr($file_base_name, 1);
header('Content-Disposition: attachment; filename="'.$file_base_name.'"');
}
$logger->info("Sending $filepath");
header("Content-Length: " . filesize($filepath));
// !! binary mode !!

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

@ -751,7 +751,7 @@ class StoredFile {
$chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0;
$chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0;
$fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : '';
Logging::log(__FILE__.':uploadFile(): filename='.$fileName);
Logging::log(__FILE__.":uploadFile(): filename=$fileName to $p_targetDir");
// Clean the fileName for security reasons
//this needs fixing for songs not in ascii.
//$fileName = preg_replace('/[^\w\._]+/', '', $fileName);