Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for ACL REST error

This commit is contained in:
Albert Santoni 2015-02-06 14:28:25 -05:00
parent ae3c9c1f5a
commit 74e142c3d7
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
airtime_mvc/application/controllers/plugins/Acl_plugin.php
View File

@ -118,8 +118,10 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
// If we don't have an identity and we're making a RESTful request, // If we don't have an identity and we're making a RESTful request,
// we need to do API key verification // we need to do API key verification
if ($request->getModuleName() == "rest") { if ($request->getModuleName() == "rest") {
$this->verifyAuth(); if (!$this->verifyAuth()) {
return; $this->getResponse()->sendResponse();
die();
}
} }
if ($controller !== 'login') { if ($controller !== 'login') {
@ -185,10 +187,11 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
if ($this->verifyAPIKey()) { if ($this->verifyAPIKey()) {
return true; return true;
} }
$this->getResponse() $this->getResponse()
->setHttpResponseCode(401) ->setHttpResponseCode(401)
->appendBody("ERROR: Incorrect API key."); ->appendBody("ERROR: Incorrect API key.");
return false; return false;
} }