Style fixes.
This commit is contained in:
parent
a7a59b690a
commit
8b44550f06
42 changed files with 186 additions and 148 deletions
|
|
@ -3,7 +3,7 @@
|
|||
namespace Httpcb;
|
||||
|
||||
use Phalcon\Config,
|
||||
Phalcon\Acl\Enum,
|
||||
Phalcon\Acl\Enum,
|
||||
Phalcon\Acl\Role,
|
||||
Phalcon\Acl\Adapter\Memory as Adapter;
|
||||
|
||||
|
|
@ -40,7 +40,7 @@ class Acl
|
|||
$pos = strpos($resource, '/');
|
||||
if ($pos !== false) {
|
||||
// Construct the wildcard resource.
|
||||
$wildcard = substr($resource, 0, $pos+1) . '*';
|
||||
$wildcard = substr($resource, 0, $pos + 1) . '*';
|
||||
|
||||
// If we have this wildcard resource, check against that instead.
|
||||
if ($this->hasResource($wildcard)) {
|
||||
|
|
@ -62,7 +62,7 @@ class Acl
|
|||
public function fromConfig(Config $config)
|
||||
{
|
||||
// Add roles.
|
||||
foreach($config->roles as $name => $def) {
|
||||
foreach ($config->roles as $name => $def) {
|
||||
|
||||
$inherits = null;
|
||||
$description = null;
|
||||
|
|
@ -70,7 +70,6 @@ class Acl
|
|||
if ($def instanceof Config) {
|
||||
$inherits = $def->get('inherits');
|
||||
$description = $def->get('description');
|
||||
|
||||
}
|
||||
|
||||
$role = new Role($name, $description);
|
||||
|
|
@ -78,33 +77,33 @@ class Acl
|
|||
}
|
||||
|
||||
// Zones
|
||||
foreach($config->zones as $name => $resources) {
|
||||
foreach ($config->zones as $name => $resources) {
|
||||
|
||||
if (!($resources instanceof Config)) {
|
||||
$resources = new Config([ $resources ]);
|
||||
$resources = new Config([$resources]);
|
||||
}
|
||||
|
||||
foreach($resources as $resource) {
|
||||
foreach ($resources as $resource) {
|
||||
$this->_adapter->addComponent($resource, 'All');
|
||||
}
|
||||
}
|
||||
|
||||
// Grant access for roles and resources.
|
||||
foreach($config->roles as $name => $def) {
|
||||
foreach ($config->roles as $name => $def) {
|
||||
|
||||
$zones = $def->get('allowed-zones', []);
|
||||
|
||||
if (is_string($zones)) {
|
||||
$zones = [ $zones ];
|
||||
$zones = [$zones];
|
||||
}
|
||||
|
||||
foreach($zones as $zone) {
|
||||
foreach ($zones as $zone) {
|
||||
$resources = $config->zones->get($zone);
|
||||
if (!($resources instanceof Config)) {
|
||||
$resources = new Config([ $resources ]);
|
||||
}
|
||||
foreach($resources as $resource) {
|
||||
$this->_adapter->allow($name, $resource, 'All');
|
||||
if (!($resources instanceof Config)) {
|
||||
$resources = new Config([$resources]);
|
||||
}
|
||||
foreach ($resources as $resource) {
|
||||
$this->_adapter->allow($name, $resource, 'All');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue