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

Merge branch '1.9.1' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
This commit is contained in:
martin 2011-10-04 13:59:27 -04:00
commit 5190a0c24c
7 changed files with 46 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,6 +122,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 !!
@ -539,6 +540,7 @@ class ApiController extends Zend_Controller_Action
$filepath = $md['MDATA_KEY_FILEPATH'];
$filepath = str_replace("\\", "", $filepath);
$files = Application_Model_StoredFile::RecallByPartialFilepath($filepath);
foreach($files as $file){
$file->delete();
}