From ae1c1995b2fec431afe7cca23b2697e1bef17baf Mon Sep 17 00:00:00 2001
From: xue <>
Date: Fri, 17 Feb 2006 04:28:06 +0000
Subject: moved shortcut methods from TComponent to TControl.

---
 framework/Web/UI/TClientScriptManager.php |  4 +-
 framework/Web/UI/TControl.php             | 83 ++++++++++++++++++++++++++++++-
 framework/Web/UI/TPageStatePersister.php  | 13 +++--
 framework/Web/UI/TTemplateManager.php     | 12 ++---
 framework/Web/UI/TThemeManager.php        | 12 ++---
 5 files changed, 103 insertions(+), 21 deletions(-)

(limited to 'framework/Web/UI')

diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php
index 1ea4175d..fd5a6eec 100644
--- a/framework/Web/UI/TClientScriptManager.php
+++ b/framework/Web/UI/TClientScriptManager.php
@@ -140,7 +140,7 @@ class TClientScriptManager extends TComponent
 				$base = Prado::getFrameworkPath();
 				$clientScripts = self::SCRIPT_DIR;
 				$file = "{$base}/{$clientScripts}/{$lib}.js";
-				$this->publishFilePath($file);
+				Prado::getApplication()->getAssetManager()->publishFilePath($file);
 				$this->_publishedScriptFiles[$lib] = true;
 			}
 		}
@@ -159,7 +159,7 @@ class TClientScriptManager extends TComponent
 			$base = Prado::getFrameworkPath();
 			$clientScripts = self::SCRIPT_DIR;
 			$file = "{$base}/{$clientScripts}/{$scriptFile}";
-			$url= $this->publishFilePath($file);
+			$url= Prado::getApplication()->getAssetManager()->publishFilePath($file);
 			$this->_publishedScriptFiles[$scriptFile] = $url;
 			return $url;
 		}
diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 4f905a1a..ded7049b 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -164,6 +164,13 @@ class TControl extends TComponent
 	 */
 	private $_rf=array();
 
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+	}
+
 	/**
 	 * Returns a property value by name or a control by ID.
 	 * This overrides the parent implementation by allowing accessing
@@ -1549,6 +1556,80 @@ class TControl extends TComponent
 			}
 		}
 	}
+
+
+	/**
+	 * @return TApplication current application instance
+	 */
+	public function getApplication()
+	{
+		return Prado::getApplication();
+	}
+
+	/**
+	 * @return IService the current service
+	 */
+	public function getService()
+	{
+		return Prado::getApplication()->getService();
+	}
+
+	/**
+	 * @return THttpRequest the current user request
+	 */
+	public function getRequest()
+	{
+		return Prado::getApplication()->getRequest();
+	}
+
+	/**
+	 * @return THttpResponse the response
+	 */
+	public function getResponse()
+	{
+		return Prado::getApplication()->getResponse();
+	}
+
+	/**
+	 * @return THttpSession user session
+	 */
+	public function getSession()
+	{
+		return Prado::getApplication()->getSession();
+	}
+
+	/**
+	 * @return IUser user
+	 */
+	public function getUser()
+	{
+		return Prado::getApplication()->getUser();
+	}
+
+	/**
+	 * Publishes a private asset and gets its URL.
+	 * This method will publish a private asset (file or directory)
+	 * and gets the URL to the asset. Note, if the asset refers to
+	 * a directory, all contents under that directory will be published.
+	 * @param string path of the asset that is relative to the directory containing the control class file.
+	 * @return string URL to the asset path.
+	 */
+	public function publishAsset($assetPath)
+	{
+		$class=new ReflectionClass(get_class($this));
+		$fullPath=dirname($class->getFileName()).'/'.$assetPath;
+		return $this->publishFilePath($fullPath);
+	}
+
+	/**
+	 * Publishes a file or directory and returns its URL.
+	 * @param string absolute path of the file or directory to be published
+	 * @return string URL to the published file or directory
+	 */
+	public function publishFilePath($fullPath)
+	{
+		return $this->getApplication()->getAssetManager()->publishFilePath($fullPath);
+	}
 }
 
 
@@ -1577,7 +1658,6 @@ class TControlList extends TList
 	 */
 	public function __construct(TControl $owner)
 	{
-		parent::__construct();
 		$this->_o=$owner;
 	}
 
@@ -1661,7 +1741,6 @@ class TEmptyControlList extends TList
 	 */
 	public function __construct(TControl $owner)
 	{
-		parent::__construct();
 		$this->_o=$owner;
 	}
 
diff --git a/framework/Web/UI/TPageStatePersister.php b/framework/Web/UI/TPageStatePersister.php
index 49321ff5..90af9665 100644
--- a/framework/Web/UI/TPageStatePersister.php
+++ b/framework/Web/UI/TPageStatePersister.php
@@ -55,12 +55,13 @@ class TPageStatePersister extends TComponent implements IPageStatePersister
 	public function save($state)
 	{
 		Prado::trace("Saving state",'System.Web.UI.TPageStatePersister');
+		$sm=Prado::getApplication()->getSecurityManager();
 		if($this->_page->getEnableStateValidation())
-			$data=$this->getApplication()->getSecurityManager()->hashData(Prado::serialize($state));
+			$data=$sm->hashData(Prado::serialize($state));
 		else
 			$data=Prado::serialize($state);
 		if($this->_page->getEnableStateEncryption())
-			$data=$this->getApplication()->getSecurityManager()->encrypt($data);
+			$data=$sm->encrypt($data);
 		if(extension_loaded('zlib'))
 			$data=gzcompress($data);
 		$this->_page->getClientScript()->registerHiddenField(TPage::FIELD_PAGESTATE,base64_encode($data));
@@ -74,7 +75,9 @@ class TPageStatePersister extends TComponent implements IPageStatePersister
 	public function load()
 	{
 		Prado::trace("Loading state",'System.Web.UI.TPageStatePersister');
-		$str=base64_decode($this->getRequest()->itemAt(TPage::FIELD_PAGESTATE));
+		$application=Prado::getApplication();
+		$sm=$application->getSecurityManager();
+		$str=base64_decode($application->getRequest()->itemAt(TPage::FIELD_PAGESTATE));
 		if($str==='')
 			return null;
 		if(extension_loaded('zlib'))
@@ -84,10 +87,10 @@ class TPageStatePersister extends TComponent implements IPageStatePersister
 		if($data!==false)
 		{
 			if($this->_page->getEnableStateEncryption())
-				$data=$this->getApplication()->getSecurityManager()->decrypt($data);
+				$data=$sm->decrypt($data);
 			if($this->_page->getEnableStateValidation())
 			{
-				if(($data=$this->getApplication()->getSecurityManager()->validateData($data))!==false)
+				if(($data=$sm->validateData($data))!==false)
 					return Prado::unserialize($data);
 			}
 			else
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index 67bda1b2..e87a23eb 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -50,7 +50,7 @@ class TTemplateManager extends TModule
 	 */
 	public function init($config)
 	{
-		$this->getService()->setTemplateManager($this);
+		$this->getApplication()->getPageService()->setTemplateManager($this);
 	}
 
 	/**
@@ -259,7 +259,7 @@ class TTemplate extends TComponent implements ITemplate
 	public function instantiateIn($tplControl)
 	{
 		if(($page=$tplControl->getPage())===null)
-			$page=$this->getService()->getRequestedPage();
+			$page=Prado::getApplication()->getPageService()->getRequestedPage();
 		$controls=array();
 		foreach($this->_tpl as $key=>$object)
 		{
@@ -371,11 +371,11 @@ class TTemplate extends TComponent implements ITemplate
 					$component->$setter($value[1]);
 					break;
 				case self::CONFIG_ASSET:		// asset URL
-					$url=$this->publishFilePath($this->_contextPath.'/'.$value[1]);
+					$url=Prado::getApplication()->getAssetManager()->publishFilePath($this->_contextPath.'/'.$value[1]);
 					$component->$setter($url);
 					break;
 				case self::CONFIG_PARAMETER:		// application parameter
-					$component->$setter($this->getApplication()->getParameters()->itemAt($value[1]));
+					$component->$setter(Prado::getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
 					Prado::using('System.I18N.Translation');
@@ -411,11 +411,11 @@ class TTemplate extends TComponent implements ITemplate
 					$component->setSubProperty($name,$value[1]);
 					break;
 				case self::CONFIG_ASSET:		// asset URL
-					$url=$this->publishFilePath($this->_contextPath.'/'.$value[1]);
+					$url=Prado::getApplication()->getAssetManager()->publishFilePath($this->_contextPath.'/'.$value[1]);
 					$component->setSubProperty($name,$url);
 					break;
 				case self::CONFIG_PARAMETER:		// application parameter
-					$component->setSubProperty($name,$this->getApplication()->getParameters()->itemAt($value[1]));
+					$component->setSubProperty($name,Prado::getApplication()->getParameters()->itemAt($value[1]));
 					break;
 				case self::CONFIG_LOCALIZATION:
 					$component->setSubProperty($name,localize($value[1]));
diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index 37e477d9..9110db7f 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -63,7 +63,7 @@ class TThemeManager extends TModule
 	public function init($config)
 	{
 		$this->_initialized=true;
-		$this->getService()->setThemeManager($this);
+		$this->getApplication()->getPageService()->setThemeManager($this);
 	}
 
 	/**
@@ -86,7 +86,7 @@ class TThemeManager extends TModule
 	{
 		if($this->_basePath===null)
 		{
-			$this->_basePath=dirname($this->getRequest()->getPhysicalApplicationPath()).'/'.self::DEFAULT_BASEPATH;
+			$this->_basePath=dirname($this->getApplication()->getRequest()->getPhysicalApplicationPath()).'/'.self::DEFAULT_BASEPATH;
 			if(($basePath=realpath($this->_basePath))===false || !is_dir($basePath))
 				throw new TConfigurationException('thememanager_basepath_invalid',$this->_basePath);
 			$this->_basePath=$basePath;
@@ -119,11 +119,11 @@ class TThemeManager extends TModule
 	{
 		if($this->_baseUrl===null)
 		{
-			$appPath=dirname($this->getRequest()->getPhysicalApplicationPath());
+			$appPath=dirname($this->getApplication()->getRequest()->getPhysicalApplicationPath());
 			$basePath=$this->getBasePath();
 			if(strpos($basePath,$appPath)===false)
 				throw new TConfigurationException('thememanager_baseurl_required');
-			$appUrl=rtrim(dirname($this->getRequest()->getApplicationPath()),'/\\');
+			$appUrl=rtrim(dirname($this->getApplication()->getRequest()->getApplicationPath()),'/\\');
 			$this->_baseUrl=$appUrl.strtr(substr($basePath,strlen($appPath)),'\\','/');
 		}
 		return $this->_baseUrl;
@@ -209,14 +209,14 @@ class TTheme extends TComponent implements ITheme
 	{
 		$this->_themeUrl=$themeUrl;
 		$this->_name=basename($themePath);
-		if(($cache=$this->getApplication()->getCache())!==null)
+		if(($cache=Prado::getApplication()->getCache())!==null)
 		{
 			$array=$cache->get(self::THEME_CACHE_PREFIX.$themePath);
 			if(is_array($array))
 			{
 				list($skins,$cssFiles,$jsFiles,$timestamp)=$array;
 				$cacheValid=true;
-				if($this->getApplication()->getMode()!==TApplication::STATE_PERFORMANCE)
+				if(Prado::getApplication()->getMode()!==TApplication::STATE_PERFORMANCE)
 				{
 					if(($dir=opendir($themePath))===false)
 						throw new TIOException('theme_path_inexistent',$themePath);
-- 
cgit v1.2.3