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

Fixed error logging and refactored ErrorController to get invoked

Browse source 
correctly when using API key authentication

* Along with the bugfixes, backported improved ErrorController from upstream branch,
  including style improvements.
This commit is contained in:
Albert Santoni 2015-03-20 17:20:34 -04:00
parent ddd75cb8e3
commit 32aa962138
10 changed files with 166 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
{
$this->_errorPage = array('module' => 'default',
'controller' => 'error',
'action' => 'denied');
'action' => 'error');
$this->_roleName = $roleName;
@ -111,7 +111,16 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
$controller = strtolower($request->getControllerName());
Application_Model_Auth::pinSessionToClient(Zend_Auth::getInstance());
if (in_array($controller, array("api", "auth", "locale", "upgrade", 'whmcs-login', "provisioning"))) {
if (in_array($controller, array(
"api",
"auth",
"error",
"locale",
"upgrade",
'whmcs-login',
"provisioning"
)))
{
$this->setRoleName("G");
} elseif (!Zend_Auth::getInstance()->hasIdentity()) {