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

Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas

Browse source 
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
This commit is contained in:
Albert Santoni 2014-07-02 13:43:09 -04:00
commit 35e98e468d
36 changed files with 2083 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,8 +118,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
return;
}
if (in_array($controller, array("api", "auth", "locale", "upgrade"))) {
if (in_array($controller, array("api", "auth", "locale", "upgrade", 'whmcs-login'))) {
$this->setRoleName("G");
} elseif (!Zend_Auth::getInstance()->hasIdentity()) {