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
This commit is contained in:
Naomi Aro 2011-08-03 18:33:08 +02:00
commit 9c31a158a3
2 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
LICENSE_3RD_PARTY
View file

@ -36,11 +36,12 @@ Linked code:
* Kombu * Kombu
- Web site: http://pypi.python.org/pypi/kombu/ - Web site: http://pypi.python.org/pypi/kombu/
- License: New BSD - License: New BSD
- Compatible with GPLv3? Yes. - Compatible with GPLv3? Yes
* pyinotify * pyinotify
- Web site: https://github.com/seb-m/pyinotify - Web site: https://github.com/seb-m/pyinotify
- License: MIT - License: MIT
- Compatible with GPLv3? Yes
* PHP-AMQPLIB * PHP-AMQPLIB
- Web site: https://github.com/tnc/php-amqplib - Web site: https://github.com/tnc/php-amqplib
@ -50,14 +51,17 @@ Linked code:
---------------- ----------------
Non-linked code: Non-linked code:
---------------- ----------------
* Linux * Linux 2.6
- Web site: http://www.kernel.org/
- License: GPLv2. See http://www.kernel.org/pub/linux/kernel/COPYING
* Apache Web Server 2.2 * Apache Web Server 2.2
- Web site: http://httpd.apache.org/ - Web site: http://httpd.apache.org/
- License: Apache 2.0. See http://httpd.apache.org/docs/2.2/license.html
* PostgreSQL 8.4 * PostgreSQL 8.4
- Web site: http://www.postgresql.org/ - Web site: http://www.postgresql.org/
- License: The PostgreSQL License. See http://www.opensource.org/licenses/postgresql - License: The PostgreSQL License. See http://www.postgresql.org/about/licence
* PHP 5.3 * PHP 5.3
- Web site: http://www.php.net/ - Web site: http://www.php.net/
@ -69,13 +73,15 @@ Non-linked code:
* Liquidsoap (pre-release of 1.0) * Liquidsoap (pre-release of 1.0)
- Web site: http://savonet.sourceforge.net/ - Web site: http://savonet.sourceforge.net/
- License: GPLv2 - License: GPLv2
* RabbitMQ (works with version 1.7.2 and above) * RabbitMQ (works with version 1.7.2 and above)
- Web site: http://www.rabbitmq.com/ - Web site: http://www.rabbitmq.com/
- License: Mozilla Public License (http://www.rabbitmq.com/mpl.html) - License: Mozilla Public License (http://www.rabbitmq.com/mpl.html)
* mp3cut from the package poc-streamer * mp3cut from the package poc-streamer
- Web site: https://bl0rg.net/software/poc/
- License: BSD 3-Clause
* ecasound 2.7.2 * ecasound 2.7.2
- Web site: http://www.eca.cx/ecasound/ - Web site: http://www.eca.cx/ecasound/
@ -124,5 +130,5 @@ Non-linked code:
* Server Browse * Server Browse
- Web site: http://code.google.com/p/jq-serverbrowse/ - Web site: http://code.google.com/p/jq-serverbrowse/
- License: BSD 2-Clause - License: BSD 2-Clause

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

@ -103,8 +103,14 @@ class ApiController extends Zend_Controller_Action
//We just want the basename which is the file name with the path //We just want the basename which is the file name with the path
//information stripped away. We are using Content-Disposition to specify //information stripped away. We are using Content-Disposition to specify
//to the browser what name the file should be saved as. //to the browser what name the file should be saved as.
$path_parts = pathinfo($media->getPropelOrm()->getDbFilepath()); //
header('Content-Disposition: attachment; filename="'.$path_parts['basename'].'"'); // By james.moon:
// I'm removing pathinfo() since it strips away UTF-8 characters.
// Using manualy parsing
$full_path = $media->getPropelOrm()->getDbFilepath();
$file_base_name = strrchr($full_path, '/');
$file_base_name = substr($file_base_name, 1);
header('Content-Disposition: attachment; filename="'.$file_base_name.'"');
} }
header("Content-Length: " . filesize($filepath)); header("Content-Length: " . filesize($filepath));