summaryrefslogtreecommitdiff
path: root/framework/Web/Services
diff options
context:
space:
mode:
authorxue <>2007-09-16 19:32:58 +0000
committerxue <>2007-09-16 19:32:58 +0000
commit3f5229142af88f0cc44644cc756d908138e5a790 (patch)
tree515f36e7c43cf8269802515040a20761cd4cf19e /framework/Web/Services
parent7f671b818300ccf529e8a8143cd108a56fc56eb1 (diff)
Make auth rules more consistently handled.
Diffstat (limited to 'framework/Web/Services')
-rw-r--r--framework/Web/Services/TPageService.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index ced01641..568e9a40 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -653,7 +653,7 @@ class TPageConfiguration extends TComponent
{
$patterns=$node->getAttribute('pages');
$ruleApplies=false;
- if(empty($patterns)) // null or empty string
+ if(empty($patterns) || trim($patterns)==='*') // null or empty string
$ruleApplies=true;
else
{
@@ -681,7 +681,7 @@ class TPageConfiguration extends TComponent
}
}
if($ruleApplies)
- $rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ip'));
+ $rules[]=new TAuthorizationRule($node->getTagName(),$node->getAttribute('users'),$node->getAttribute('roles'),$node->getAttribute('verb'),$node->getAttribute('ips'));
}
$this->_rules=array_merge($rules,$this->_rules);
}