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:
Martin Konecny 2012-04-03 18:29:44 -04:00
commit 3be1944fa4
4 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,21 +107,18 @@ class ApiController extends Zend_Controller_Action
$api_key = $this->_getParam('api_key');
$logger = Logging::getLogger();
if(!in_array($api_key, $CC_CONFIG["apiKey"]) &&
is_null(Zend_Auth::getInstance()->getStorage()->read()))
{
header('HTTP/1.0 401 Unauthorized');
print 'You are not allowed to access this resource.';
$logger->info("401 Unauthorized");
Logging::log("401 Unauthorized");
return;
}
$fileID = $this->_getParam("fileID");
$fileID = $this->_getParam("file");
$file_id = substr($fileID, 0, strpos($fileID, "."));
if (ctype_alnum($file_id) && strlen($file_id) == 32)
{
$media = Application_Model_StoredFile::RecallByGunid($file_id);