From bd87a02b43b815f99ab9400709d8269ac56c32f3 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 10 Jun 2006 11:17:24 +0000
Subject: Fixed #221.

---
 COPYRIGHT                                 | 12 ++++++------
 framework/Security/TAuthorizationRule.php |  2 +-
 framework/Web/Services/TPageService.php   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/COPYRIGHT b/COPYRIGHT
index 72fe0bfe..f44d0d05 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-PRADO is free software released under the terms of the following BSD license.
+The PRADO framework and the included demos are freeware.
+They are released under the terms of the following BSD License.
 
-PRADO is released under the BSD License.
-Copyright 2004-2006, PradoSoft (http://www.pradosoft.com)
+Copyright 2004-2006, The PRADO Group (http://www.pradosoft.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -14,9 +14,9 @@ this list of conditions and the following disclaimer.
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-- Neither the name of the developer nor the names of its contributors may
-be used to endorse or promote products derived from this software without
-specific prior written permission.
+- Neither the name of the PRADO Group nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
 
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
diff --git a/framework/Security/TAuthorizationRule.php b/framework/Security/TAuthorizationRule.php
index 8248a45a..5c8f0f9b 100644
--- a/framework/Security/TAuthorizationRule.php
+++ b/framework/Security/TAuthorizationRule.php
@@ -137,7 +137,7 @@ class TAuthorizationRule extends TComponent
 	}
 
 	/**
-	 * @var boolean if this rule applies to everyone
+	 * @return boolean if this rule applies to everyone
 	 */
 	public function getEveryoneApplied()
 	{
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index af2ddce3..1df4ffde 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -695,7 +695,7 @@ class TPageConfiguration extends TComponent
 					$ps=explode(',',$pages);
 					foreach($ps as $p)
 					{
-						if($page===trim($p))
+						if(strcasecmp($page,trim($p))===0)
 						{
 							$ruleApplies=true;
 							break;
@@ -719,7 +719,7 @@ class TPageConfiguration extends TComponent
 					$properties=$node->getAttributes();
 					if(($id=$properties->itemAt('id'))===null)
 						throw new TConfigurationException('pageserviceconf_page_invalid',$configPath);
-					if($id===$page)
+					if(strcasecmp($id,$page)===0)
 						$this->_properties=array_merge($this->_properties,$properties->toArray());
 				}
 			}
-- 
cgit v1.2.3