From d11d7c6003569ae5c8994c23a533757a1f9ae981 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Sat, 20 Jan 2007 15:31:22 +0000
Subject: refactored TPageService.

---
 framework/Web/Services/TPageService.php | 66 ++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 5d9e74fb..8d1eb3f4 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -428,34 +428,56 @@ class TPageService extends TService
 	public function run()
 	{
 		Prado::trace("Running page service",'System.Web.Services.TPageService');
-		$path=$this->getBasePath().'/'.strtr($this->getRequestedPagePath(),'.','/');
-		if(is_file($path.self::PAGE_FILE_EXT))
-		{
-			if(is_file($path.Prado::CLASS_FILE_EXT))
-			{
-				$className=basename($path);
-				if(!class_exists($className,false))
-					include_once($path.Prado::CLASS_FILE_EXT);
-				if(!class_exists($className,false))
-					throw new TConfigurationException('pageservice_pageclass_unknown',$className);
-			}
-			else
-				$className=$this->getBasePageClass();
+		$this->_page=$this->createPage($this->getRequestedPagePath());
+		$this->runPage($this->_page,$this->_properties);
+	}
 
-			$this->_page=Prado::createComponent($className);
+	/**
+	 * Creates a page instance based on requested page path.
+	 * @param string requested page path
+	 * @return TPage the requested page instance
+	 * @throws THttpException if requested page path is invalid
+	 * @throws TConfigurationException if the page class cannot be found
+	 */
+	protected function createPage($pagePath)
+	{
+		$path=$this->getBasePath().'/'.strtr($pagePath,'.','/');
+		$hasTemplateFile=is_file($path.self::PAGE_FILE_EXT);
+		$hasClassFile=is_file($path.Prado::CLASS_FILE_EXT);
 
-			$this->_page->setPagePath($this->getRequestedPagePath());
-			// initialize page properties with those set in configurations
-			foreach($this->_properties as $name=>$value)
-				$this->_page->setSubProperty($name,$value);
+		if(!$hasTemplateFile && !$hasClassFile)
+			throw new THttpException(404,'pageservice_page_unknown',$pagePath);
 
-			// set page template
-			$this->_page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+		if($hasClassFile)
+		{
+			$className=basename($path);
+			if(!class_exists($className,false))
+				include_once($path.Prado::CLASS_FILE_EXT);
+			if(!class_exists($className,false) || !is_subclass_of($className,'TPage'))
+				throw new TConfigurationException('pageservice_pageclass_unknown',$className);
 		}
 		else
-			throw new THttpException(404,'pageservice_page_unknown',$this->getRequestedPagePath());
+			$className=$this->getBasePageClass();
+
+		$page=Prado::createComponent($className);
+		$page->setPagePath($pagePath);
+
+		if($hasTemplateFile)
+			$page->setTemplate($this->getTemplateManager()->getTemplateByFileName($path.self::PAGE_FILE_EXT));
+
+		return $page;
+	}
 
-		$this->_page->run($this->getResponse()->createHtmlWriter());
+	/**
+	 * Executes a page.
+	 * @param TPage the page instance to be run
+	 * @param array list of initial page properties
+	 */
+	protected function runPage($page,$properties)
+	{
+		foreach($properties as $name=>$value)
+			$page->setSubProperty($name,$value);
+		$page->run($this->getResponse()->createHtmlWriter());
 	}
 
 	/**
-- 
cgit v1.2.3