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

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

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
This commit is contained in:
Naomi Aro 2012-03-07 10:33:00 +01:00
commit a4d07b3060
8 changed files with 24 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,10 +116,9 @@ class ApiController extends Zend_Controller_Action
return;
}
$name = $this->_getParam("name");
$filename = $this->_getParam("filename");
$file_id = substr($filename, 0, strpos($filename, "."));
$fileID = $this->_getParam("fileID");
$file_id = substr($fileID, 0, strpos($fileID, "."));
if (ctype_alnum($file_id) && strlen($file_id) == 32)
{
$media = Application_Model_StoredFile::RecallByGunid($file_id);
@ -132,7 +131,7 @@ class ApiController extends Zend_Controller_Action
$file_base_name = substr($file_base_name, 1);
// possibly use fileinfo module here in the future.
// http://www.php.net/manual/en/book.fileinfo.php
$ext = pathinfo($filename, PATHINFO_EXTENSION);
$ext = pathinfo($fileID, PATHINFO_EXTENSION);
//Download user left clicks a track and selects Download.
if ("true" == $this->_getParam('download')){
//path_info breaks up a file path into seperate pieces of informaiton.
@ -146,7 +145,7 @@ class ApiController extends Zend_Controller_Action
header('Content-Disposition: attachment; filename="'.$file_base_name.'"');
}else{
//user clicks play button for track and downloads it.
header("Content-Disposition: inline; filename=$file_base_name");
header('Content-Disposition: inline; filename="'.$file_base_name.'"');
}
$this->smartReadFile($filepath, $ext);

6
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -198,8 +198,7 @@ class PlaylistController extends Zend_Controller_Action
public function audioPreviewPlayerAction()
{
$name = $this->_getParam('name');
$fileName = $this->_getParam('filename');
$fileID = $this->_getParam('fileID');
$playlistIndex = $this->_getParam('index');
$request = $this->getRequest();
@ -218,8 +217,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png";
}
$this->view->name = $name;
$this->view->fileName = $fileName;
$this->view->fileName = $fileID;
$this->view->playlistIndex= $playlistIndex;
}