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/Collections/TList.php | 1 - framework/Collections/TMap.php | 1 - framework/Data/TXmlDocument.php | 2 - framework/Exceptions/TErrorHandler.php | 2 +- framework/Security/TAuthManager.php | 8 +-- framework/Security/TAuthorizationRule.php | 1 - framework/Security/TUserManager.php | 1 - framework/TApplication.php | 2 - framework/TComponent.php | 87 ------------------------------- framework/Web/Services/TPageService.php | 6 +-- framework/Web/THttpRequest.php | 19 +++++-- framework/Web/THttpResponse.php | 9 +++- framework/Web/THttpSession.php | 8 +++ 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 ++--- framework/core.php | 16 ++++++ 19 files changed, 159 insertions(+), 128 deletions(-) (limited to 'framework') diff --git a/framework/Collections/TList.php b/framework/Collections/TList.php index 1090ce77..7383b684 100644 --- a/framework/Collections/TList.php +++ b/framework/Collections/TList.php @@ -58,7 +58,6 @@ class TList extends TComponent implements IteratorAggregate,ArrayAccess */ public function __construct($data=null) { - parent::__construct(); if($data!==null) $this->copyFrom($data); } diff --git a/framework/Collections/TMap.php b/framework/Collections/TMap.php index 4d810503..7c46ae70 100644 --- a/framework/Collections/TMap.php +++ b/framework/Collections/TMap.php @@ -53,7 +53,6 @@ class TMap extends TComponent implements IteratorAggregate,ArrayAccess */ public function __construct($data=null) { - parent::__construct(); if($data!==null) $this->copyFrom($data); } diff --git a/framework/Data/TXmlDocument.php b/framework/Data/TXmlDocument.php index bb22b254..dfd65ebe 100644 --- a/framework/Data/TXmlDocument.php +++ b/framework/Data/TXmlDocument.php @@ -55,7 +55,6 @@ class TXmlElement extends TComponent */ public function __construct($tagName) { - parent::__construct(); $this->setTagName($tagName); } @@ -404,7 +403,6 @@ class TXmlElementList extends TList */ public function __construct(TXmlElement $owner) { - parent::__construct(); $this->_o=$owner; } diff --git a/framework/Exceptions/TErrorHandler.php b/framework/Exceptions/TErrorHandler.php index 87f6b1c2..2bbc3c7b 100644 --- a/framework/Exceptions/TErrorHandler.php +++ b/framework/Exceptions/TErrorHandler.php @@ -124,7 +124,7 @@ class TErrorHandler extends TModule else { $handling=true; - if(($response=$this->getResponse())!==null) + if(($response=$this->getApplication()->getResponse())!==null) $response->clear(); if(!headers_sent()) header('Content-Type: text/html; charset=UTF-8'); diff --git a/framework/Security/TAuthManager.php b/framework/Security/TAuthManager.php index 819b7b36..a41da914 100644 --- a/framework/Security/TAuthManager.php +++ b/framework/Security/TAuthManager.php @@ -133,7 +133,7 @@ class TAuthManager extends TModule { $this->onAuthenticate($param); - $service=$this->getService(); + $service=$this->getApplication()->getService(); if(($service instanceof TPageService) && $service->getRequestedPagePath()===$this->getLoginPage()) $this->_skipAuthorization=true; } @@ -181,7 +181,7 @@ class TAuthManager extends TModule */ public function getReturnUrl() { - return $this->getSession()->itemAt(self::RETURN_URL_VAR); + return $this->getApplication()->getSession()->itemAt(self::RETURN_URL_VAR); } /** @@ -244,7 +244,7 @@ class TAuthManager extends TModule { if(!$user->getIsGuest()) { - if(($session=$this->getSession())===null) + if(($session=$this->getApplication()->getSession())===null) throw new TConfigurationException('authmanager_session_required'); else $session->add($this->generateUserSessionKey(),$user->saveToString()); @@ -279,7 +279,7 @@ class TAuthManager extends TModule */ public function logout() { - if(($session=$this->getSession())===null) + if(($session=$this->getApplication()->getSession())===null) throw new TConfigurationException('authmanager_session_required'); else { diff --git a/framework/Security/TAuthorizationRule.php b/framework/Security/TAuthorizationRule.php index 81955a44..8248a45a 100644 --- a/framework/Security/TAuthorizationRule.php +++ b/framework/Security/TAuthorizationRule.php @@ -63,7 +63,6 @@ class TAuthorizationRule extends TComponent */ public function __construct($action,$users,$roles,$verb='') { - parent::__construct(); $action=strtolower(trim($action)); if($action==='allow' || $action==='deny') $this->_action=$action; diff --git a/framework/Security/TUserManager.php b/framework/Security/TUserManager.php index 06b5d321..c799c446 100644 --- a/framework/Security/TUserManager.php +++ b/framework/Security/TUserManager.php @@ -52,7 +52,6 @@ class TUser extends TComponent implements IUser */ public function __construct($manager=null) { - parent::__construct(); $this->_manager=$manager; } diff --git a/framework/TApplication.php b/framework/TApplication.php index b61fa30d..8cc1e9f9 100644 --- a/framework/TApplication.php +++ b/framework/TApplication.php @@ -289,8 +289,6 @@ class TApplication extends TComponent */ public function __construct($basePath='protected',$cacheConfig=true) { - parent::__construct(); - // register application as a singleton Prado::setApplication($this); diff --git a/framework/TComponent.php b/framework/TComponent.php index 8d6be46e..7443168d 100644 --- a/framework/TComponent.php +++ b/framework/TComponent.php @@ -78,20 +78,6 @@ class TComponent */ private $_e=array(); - /** - * Constructor. - */ - public function __construct() - { - } - - /** - * Destructor. - */ - public function __destruct() - { - } - /** * Returns a property value or an event handler list by property or event name. * Do not call this method. This is a PHP magic method that we override @@ -426,79 +412,6 @@ class TComponent throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage()); } } - - /** - * @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); - } } /** diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php index bb80b902..013bb35f 100644 --- a/framework/Web/Services/TPageService.php +++ b/framework/Web/Services/TPageService.php @@ -202,7 +202,7 @@ class TPageService extends TService */ protected function determineRequestedPagePath() { - $pagePath=$this->getRequest()->getServiceParameter(); + $pagePath=$this->getApplication()->getRequest()->getServiceParameter(); if(empty($pagePath)) $pagePath=$this->getDefaultPage(); return $pagePath; @@ -441,7 +441,7 @@ class TPageService extends TService else throw new THttpException(404,'pageservice_page_unknown',$this->getRequestedPagePath()); - $this->_page->run($this->getResponse()->createHtmlWriter()); + $this->_page->run($this->getApplication()->getResponse()->createHtmlWriter()); } /** @@ -453,7 +453,7 @@ class TPageService extends TService */ public function constructUrl($pagePath,$getParams=null,$encodeAmpersand=false) { - return $this->getRequest()->constructUrl($this->_id,$pagePath,$getParams,$encodeAmpersand); + return $this->getApplication()->getRequest()->constructUrl($this->_id,$pagePath,$getParams,$encodeAmpersand); } } diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php index a0fa50e4..201addd1 100644 --- a/framework/Web/THttpRequest.php +++ b/framework/Web/THttpRequest.php @@ -533,6 +533,22 @@ class THttpRequest extends TMap implements IModule { $this->_serviceParam=$value; } + + /** + * @return THttpResponse response module + */ + public function getResponse() + { + return Prado::getApplication()->getResponse(); + } + + /** + * @return TApplication application instance + */ + public function getApplication() + { + return Prado::getApplication(); + } } /** @@ -558,7 +574,6 @@ class THttpCookieCollection extends TList */ public function __construct($owner=null) { - parent::__construct(); $this->_o=$owner; } @@ -643,7 +658,6 @@ class THttpCookie extends TComponent */ public function __construct($name,$value) { - parent::__construct(); $this->_name=$name; $this->_value=$value; } @@ -825,7 +839,6 @@ class TUri extends TComponent */ public function __construct($uri) { - parent::__construct(); if(($ret=@parse_url($uri))!==false) { // decoding??? diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php index 1607b9d5..3da9a5d5 100644 --- a/framework/Web/THttpResponse.php +++ b/framework/Web/THttpResponse.php @@ -79,7 +79,6 @@ class THttpResponse extends TModule implements ITextWriter { if($this->_bufferOutput) @ob_end_flush(); - parent::__destruct(); } /** @@ -396,6 +395,14 @@ class THttpResponse extends TModule implements ITextWriter $type=$this->_htmlWriterType; return Prado::createComponent($type,$this); } + + /** + * @return THttpRequest request module + */ + public function getRequest() + { + return $this->getApplication()->getRequest(); + } } ?> \ No newline at end of file diff --git a/framework/Web/THttpSession.php b/framework/Web/THttpSession.php index 8d35b008..605b858a 100644 --- a/framework/Web/THttpSession.php +++ b/framework/Web/THttpSession.php @@ -606,6 +606,14 @@ class THttpSession extends TComponent implements IteratorAggregate,ArrayAccess,I { unset($_SESSION[$offset]); } + + /** + * @return TApplication application instance + */ + public function getApplication() + { + return Prado::getApplication(); + } } /** 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); diff --git a/framework/core.php b/framework/core.php index e43b1168..93d19002 100644 --- a/framework/core.php +++ b/framework/core.php @@ -295,6 +295,14 @@ abstract class TModule extends TComponent implements IModule { $this->_id=$value; } + + /** + * @return TApplication current application instance + */ + public function getApplication() + { + return Prado::getApplication(); + } } /** @@ -346,6 +354,14 @@ abstract class TService extends TComponent implements IService public function run() { } + + /** + * @return TApplication current application instance + */ + public function getApplication() + { + return Prado::getApplication(); + } } /** -- cgit v1.2.3