From 3f5229142af88f0cc44644cc756d908138e5a790 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sun, 16 Sep 2007 19:32:58 +0000
Subject: Make auth rules more consistently handled.

---
 framework/Web/Services/TPageService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'framework/Web')

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);
 		}
-- 
cgit v1.2.3