removed useless calls to empty contructor; reverted some additional undocumented changes; upported the "cgi workaround" to trunk/; large (fake) changeset are due to mixed cr/crlf used previously

1 files changed, 86 insertions, 87 deletions

diff --git a/framework/Web/TUrlMapping.php b/framework/Web/TUrlMapping.php
index 049a02a0..732d1a54 100644
--- a/framework/Web/TUrlMapping.php
+++ b/framework/Web/TUrlMapping.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft

+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web

@@ -328,8 +328,8 @@ class TUrlMapping extends TUrlManager
 	 		if(!(is_array($getItems) || ($getItems instanceof Traversable)))

 	 			$getItems=array();

 			$key=$serviceID.':'.$serviceParam;

-			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?

-				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';

+			$wildCardKey = ($pos=strrpos($serviceParam,'.'))!==false ?
+				$serviceID.':'.substr($serviceParam,0,$pos).'.*' : $serviceID.':*';
 			if(isset($this->_constructRules[$key]))

 			{

 				foreach($this->_constructRules[$key] as $rule)

@@ -337,16 +337,16 @@ class TUrlMapping extends TUrlManager
 					if($rule->supportCustomUrl($getItems))

 						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);

 				}

-			}

-			elseif(isset($this->_constructRules[$wildCardKey]))

-			{

+			} 
+			elseif(isset($this->_constructRules[$wildCardKey]))
+			{
 				foreach($this->_constructRules[$wildCardKey] as $rule)

 				{

 					if($rule->supportCustomUrl($getItems))

-					{

-						$getItems['*']= $pos ? substr($serviceParam,$pos+1) : $serviceParam;

+					{
+						$getItems['*']= $pos ? substr($serviceParam,$pos+1) : $serviceParam;
 						return $rule->constructUrl($getItems,$encodeAmpersand,$encodeGetItems);

-					}

+					}
 				}

 			}

 		}

@@ -408,42 +408,42 @@ class TUrlMapping extends TUrlManager
  * The {@link setServiceParameter ServiceParameter} and {@link setServiceID ServiceID}

  * (the default ID is 'page') set the service parameter and service id respectively.

  *

- * Since 3.1.4 you can also use simplyfied wildcard patterns to match multiple

- * ServiceParameters with a single rule. The pattern must contain the placeholder

- * {*} for the ServiceParameter. For example

- *

- * <url ServiceParameter="adminpages.*" pattern="admin/{*}" />

- *

- * This rule will match an URL like <tt>http://example.com/index.php/admin/edituser</tt>

- * and resolve it to the page Application.pages.admin.edituser. The wildcard matching

- * is non-recursive. That means you have to add a rule for every subdirectory you

- * want to access pages in:

- *

- * <url ServiceParameter="adminpages.users.*" pattern="useradmin/{*}" />

- *

- * It is still possible to define an explicit rule for a page in the wildcard path.

- * This rule has to preceed the wildcard rule.

- *

- * You can also use parameters with wildcard patterns. The parameters are then

- * available with every matching page:

- *

- * <url ServiceParameter="adminpages.*" pattern="admin/{*}/{id}" parameters.id="\d+" />

- *

- * To enable automatic parameter encoding in a path format fro wildcard patterns you can set

- * {@setUrlFormat UrlFormat} to 'Path':

- *

- * <url ServiceParameter="adminpages.*" pattern="admin/{*}" UrlFormat="Path" />

- *

- * This will create and parse URLs of the form

- * <tt>.../index.php/admin/listuser/param1/value1/param2/value2</tt>.

- *

- * Use {@setUrlParamSeparator} to define another separator character between parameter

- * name and value. Parameter/value pairs are always separated by a '/'.

- *

- * <url ServiceParameter="adminpages.*" pattern="admin/{*}" UrlFormat="Path" UrlParamSeparator="-" />

- *

- * <tt>.../index.php/admin/listuser/param1-value1/param2-value2</tt>.

- *

+ * Since 3.1.4 you can also use simplyfied wildcard patterns to match multiple
+ * ServiceParameters with a single rule. The pattern must contain the placeholder 
+ * {*} for the ServiceParameter. For example
+ *
+ * <url ServiceParameter="adminpages.*" pattern="admin/{*}" />
+ *
+ * This rule will match an URL like <tt>http://example.com/index.php/admin/edituser</tt>
+ * and resolve it to the page Application.pages.admin.edituser. The wildcard matching
+ * is non-recursive. That means you have to add a rule for every subdirectory you
+ * want to access pages in: 
+ *
+ * <url ServiceParameter="adminpages.users.*" pattern="useradmin/{*}" />
+ *
+ * It is still possible to define an explicit rule for a page in the wildcard path.
+ * This rule has to preceed the wildcard rule.
+ *
+ * You can also use parameters with wildcard patterns. The parameters are then 
+ * available with every matching page:
+ *
+ * <url ServiceParameter="adminpages.*" pattern="admin/{*}/{id}" parameters.id="\d+" />
+ *
+ * To enable automatic parameter encoding in a path format fro wildcard patterns you can set 
+ * {@setUrlFormat UrlFormat} to 'Path': 
+ *
+ * <url ServiceParameter="adminpages.*" pattern="admin/{*}" UrlFormat="Path" />
+ *
+ * This will create and parse URLs of the form 
+ * <tt>.../index.php/admin/listuser/param1/value1/param2/value2</tt>.
+ *
+ * Use {@setUrlParamSeparator} to define another separator character between parameter
+ * name and value. Parameter/value pairs are always separated by a '/'.
+ *
+ * <url ServiceParameter="adminpages.*" pattern="admin/{*}" UrlFormat="Path" UrlParamSeparator="-" />
+ *
+ * <tt>.../index.php/admin/listuser/param1-value1/param2-value2</tt>.
+ *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>

  * @version $Id$

  * @package System.Web

@@ -477,7 +477,7 @@ class TUrlMappingPattern extends TComponent
 	private $_manager;

 

 	private $_caseSensitive=true;

-

+
 	private $_isWildCardPattern=false;

 

 	private $_urlFormat=THttpRequestUrlFormat::Get;

@@ -496,7 +496,6 @@ class TUrlMappingPattern extends TComponent
 	 */

 	public function __construct(TUrlManager $manager)

 	{

-		parent::__construct();

 		$this->_manager=$manager;

 		$this->_parameters=new TAttributeCollection;

 		$this->_parameters->setCaseSensitive(true);

@@ -519,8 +518,8 @@ class TUrlMappingPattern extends TComponent
 	{

 		if($this->_serviceParameter===null)

 			throw new TConfigurationException('urlmappingpattern_serviceparameter_required', $this->getPattern());

-		if(strpos($this->_serviceParameter,'*')!==false)

-		    $this->_isWildCardPattern=true;

+		if(strpos($this->_serviceParameter,'*')!==false) 
+		    $this->_isWildCardPattern=true;
 	}

 

 	/**

@@ -537,19 +536,19 @@ class TUrlMappingPattern extends TComponent
 			$params[]='{'.$key.'}';

 			$values[]='(?P<'.$key.'>'.$value.')';

 		}

-		if ($this->getIsWildCardPattern()) {

-		    $params[]='{*}';

-		    // service parameter must not contain '=' and '/'

-		    $values[]='(?P<'.$this->getServiceID().'>[^=/]+)';

-		}

+		if ($this->getIsWildCardPattern()) {
+		    $params[]='{*}';
+		    // service parameter must not contain '=' and '/'
+		    $values[]='(?P<'.$this->getServiceID().'>[^=/]+)';
+		}
 		$params[]='/';

 		$values[]='\\/';

 		$regexp=str_replace($params,$values,trim($this->getPattern(),'/').'/');

-		if ($this->_urlFormat===THttpRequestUrlFormat::Get)

+		if ($this->_urlFormat===THttpRequestUrlFormat::Get)
 		    $regexp='/^'.$regexp.'$/u';

-		else

+		else 
 		    $regexp='/^'.$regexp.'(?P<urlparams>.*)$/u';

-

+
 		if(!$this->getCaseSensitive())

 			$regexp.='i';

 		return $regexp;

@@ -664,30 +663,30 @@ class TUrlMappingPattern extends TComponent
 			preg_match($pattern,$request->getPathInfo(),$matches);

 		else

 			preg_match($this->getParameterizedPattern(),trim($request->getPathInfo(),'/').'/',$matches);

-

-		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))

-			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);

-

-		if (isset($matches['urlparams']))

-		{

-			$params=explode('/',$matches['urlparams']);

-			if ($this->_separator==='/')

-			{

-				while($key=array_shift($params))

-					$matches[$key]=($value=array_shift($params)) ? $value : '';

-			}

-			else

-			{

-				array_pop($params);

-				foreach($params as $param)

-				{

-					list($key,$value)=explode($this->_separator,$param,2);

-					$matches[$key]=$value;

-				}

-			}

-			unset($matches['urlparams']);

-		}

-

+
+		if($this->getIsWildCardPattern() && isset($matches[$this->_serviceID]))
+			$matches[$this->_serviceID]=str_replace('*',$matches[$this->_serviceID],$this->_serviceParameter);
+
+		if (isset($matches['urlparams']))
+		{
+			$params=explode('/',$matches['urlparams']);
+			if ($this->_separator==='/') 
+			{
+				while($key=array_shift($params))
+					$matches2[$key]=($value=array_shift($params)) ? $value : '';
+			} 
+			else 
+			{
+				array_pop($params);
+				foreach($params as $param)
+				{
+					list($key,$value)=explode($this->_separator,$param,2);
+					$matches[$key]=$value;
+				}
+			}
+			unset($matches['urlparams']);
+		}
+
 		return $matches;

 	}

 

@@ -823,12 +822,12 @@ class TUrlMappingPattern extends TComponent
 		// for the rest of the GET variables, put them in the query string

 		if(count($extra)>0)

 		{

-			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {

-				foreach ($extra as $name=>$value)

-					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);

-				return $url;

-			}

-

+			if ($this->_urlFormat===THttpRequestUrlFormat::Path && $this->getIsWildCardPattern()) {
+				foreach ($extra as $name=>$value)
+					$url.='/'.$name.$this->_separator.($encodeGetItems?rawurlencode($value):$value);
+				return $url;
+			}
+
 			$url2='';

 			$amp=$encodeAmpersand?'&amp;':'&';

 			if($encodeGetItems)