From 656c339879a071f2f875831281ed833b876e4361 Mon Sep 17 00:00:00 2001 From: "ctrlaltca@gmail.com" <> Date: Mon, 20 Jun 2011 10:48:45 +0000 Subject: 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 --- framework/Web/Services/TRpcService.php | 2 - framework/Web/Services/TSoapService.php | 1 - framework/Web/THttpRequest.php | 31 +++- framework/Web/THttpResponseAdapter.php | 1 - framework/Web/TUrlMapping.php | 173 ++++++++++----------- .../Web/UI/ActiveControls/TActiveDataGrid.php | 18 +-- .../Web/UI/ActiveControls/TActiveRatingList.php | 2 +- .../Web/UI/ActiveControls/TActiveRepeater.php | 4 +- .../Web/UI/ActiveControls/TActiveTableCell.php | 4 +- .../Web/UI/ActiveControls/TActiveTableRow.php | 4 +- framework/Web/UI/ActiveControls/TAutoComplete.php | 1 - .../Web/UI/ActiveControls/TBaseActiveControl.php | 3 +- .../UI/ActiveControls/TCallbackClientScript.php | 1 - .../UI/ActiveControls/TCallbackEventParameter.php | 5 +- .../UI/ActiveControls/TCallbackResponseAdapter.php | 1 - framework/Web/UI/ActiveControls/TDraggable.php | 1 - framework/Web/UI/ActiveControls/TDropContainer.php | 2 - .../Web/UI/ActiveControls/TTriggeredCallback.php | 5 +- framework/Web/UI/TClientScriptManager.php | 2 - framework/Web/UI/TControl.php | 74 ++------- framework/Web/UI/TControlAdapter.php | 3 +- framework/Web/UI/THtmlWriter.php | 3 +- framework/Web/UI/TPage.php | 136 +--------------- framework/Web/UI/TTemplateManager.php | 1 - framework/Web/UI/TThemeManager.php | 1 - framework/Web/UI/WebControls/TBulletedList.php | 3 +- framework/Web/UI/WebControls/TCustomValidator.php | 3 +- framework/Web/UI/WebControls/TDataGrid.php | 9 +- framework/Web/UI/WebControls/TDataList.php | 3 +- .../Web/UI/WebControls/TDataSourceControl.php | 4 +- framework/Web/UI/WebControls/TDataSourceView.php | 4 +- .../Web/UI/WebControls/TDropDownListColumn.php | 3 +- framework/Web/UI/WebControls/THtmlArea.php | 3 +- framework/Web/UI/WebControls/TImageButton.php | 3 +- framework/Web/UI/WebControls/TImageMap.php | 3 +- framework/Web/UI/WebControls/TListItem.php | 4 +- framework/Web/UI/WebControls/TPager.php | 4 +- framework/Web/UI/WebControls/TRepeater.php | 3 +- framework/Web/UI/WebControls/TStyle.php | 4 +- framework/Web/UI/WebControls/TWizard.php | 33 ++-- framework/Web/UI/WebControls/TXmlTransform.php | 3 +- 41 files changed, 182 insertions(+), 386 deletions(-) (limited to 'framework/Web') diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php index afde9bb1..6eff6542 100644 --- a/framework/Web/Services/TRpcService.php +++ b/framework/Web/Services/TRpcService.php @@ -166,7 +166,6 @@ class TRpcServer extends TModule */ public function __construct(TRpcProtocol $protocolHandler) { - parent::__construct(); $this->handler = $protocolHandler; } @@ -247,7 +246,6 @@ abstract class TRpcApiProvider extends TModule public function __construct(TRpcServer $rpcServer) { - parent::__construct(); $this->rpcServer = $rpcServer; foreach($this->registerMethods() as $_methodName => $_methodDetails) diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php index 4db97544..ddb5cecb 100644 --- a/framework/Web/Services/TSoapService.php +++ b/framework/Web/Services/TSoapService.php @@ -101,7 +101,6 @@ class TSoapService extends TService */ public function __construct() { - parent::__construct(); $this->setID('soap'); } diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php index 925160c8..c16b07a8 100644 --- a/framework/Web/THttpRequest.php +++ b/framework/Web/THttpRequest.php @@ -70,6 +70,8 @@ Prado::using('System.Web.TUrlManager'); */ class THttpRequest extends TApplicationComponent implements IteratorAggregate,ArrayAccess,Countable,IModule { + const CGIFIX__PATH_INFO = 1; + const CGIFIX__SCRIPT_NAME = 2; /** * @var TUrlManager the URL manager module */ @@ -110,6 +112,7 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar private $_services; private $_requestResolved=false; private $_enableCookieValidation=false; + private $_cgiFix=0; /** * @var string request URL */ @@ -183,7 +186,9 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar else // TBD: in this case, SCRIPT_NAME need to be escaped $this->_requestUri=$_SERVER['SCRIPT_NAME'].(empty($_SERVER['QUERY_STRING'])?'':'?'.$_SERVER['QUERY_STRING']); - if(isset($_SERVER['PATH_INFO'])) + if($this->_cgiFix&self::CGIFIX__PATH_INFO && isset($_SERVER['ORIG_PATH_INFO'])) + $this->_pathInfo=substr($_SERVER['ORIG_PATH_INFO'], strlen($_SERVER['SCRIPT_NAME'])); + elseif(isset($_SERVER['PATH_INFO'])) $this->_pathInfo=$_SERVER['PATH_INFO']; else if(strpos($_SERVER['PHP_SELF'],$_SERVER['SCRIPT_NAME'])===0 && $_SERVER['PHP_SELF']!==$_SERVER['SCRIPT_NAME']) $this->_pathInfo=substr($_SERVER['PHP_SELF'],strlen($_SERVER['SCRIPT_NAME'])); @@ -394,6 +399,9 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar */ public function getApplicationUrl() { + if($this->_cgiFix&self::CGIFIX__SCRIPT_NAME && isset($_SERVER['ORIG_SCRIPT_NAME'])) + return $_SERVER['ORIG_SCRIPT_NAME']; + return $_SERVER['SCRIPT_NAME']; } @@ -518,6 +526,26 @@ class THttpRequest extends TApplicationComponent implements IteratorAggregate,Ar $this->_enableCookieValidation=TPropertyValue::ensureBoolean($value); } + /** + * @return integer whether to use ORIG_PATH_INFO and/or ORIG_SCRIPT_NAME. Defaults to 0. + * @see THttpRequest::CGIFIX__PATH_INFO, THttpRequest::CGIFIX__SCRIPT_NAME + */ + public function getCgiFix() + { + return $this->_cgiFix; + } + + /** + * Enable this, if you're using PHP via CGI with php.ini setting "cgi.fix_pathinfo=1" + * and have trouble with friendly URL feature. Enable this only if you really know what you are doing! + * @param integer enable bitwise to use ORIG_PATH_INFO and/or ORIG_SCRIPT_NAME. + * @see THttpRequest::CGIFIX__PATH_INFO, THttpRequest::CGIFIX__SCRIPT_NAME + */ + public function setCgiFix($value) + { + $this->_cgiFix=TPropertyValue::ensureInteger($value); + } + /** * @return THttpCookieCollection list of cookies to be sent */ @@ -857,7 +885,6 @@ class THttpCookieCollection extends TList public function __construct($owner=null) { $this->_o=$owner; - parent::__construct(); } /** diff --git a/framework/Web/THttpResponseAdapter.php b/framework/Web/THttpResponseAdapter.php index 2d06d620..6aaaf775 100644 --- a/framework/Web/THttpResponseAdapter.php +++ b/framework/Web/THttpResponseAdapter.php @@ -34,7 +34,6 @@ class THttpResponseAdapter extends TApplicationComponent */ public function __construct($response) { - parent::__construct(); $this->_response=$response; } 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 * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 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 - * - * - * - * This rule will match an URL like http://example.com/index.php/admin/edituser - * 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: - * - * - * - * 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: - * - * - * - * To enable automatic parameter encoding in a path format fro wildcard patterns you can set - * {@setUrlFormat UrlFormat} to 'Path': - * - * - * - * This will create and parse URLs of the form - * .../index.php/admin/listuser/param1/value1/param2/value2. - * - * Use {@setUrlParamSeparator} to define another separator character between parameter - * name and value. Parameter/value pairs are always separated by a '/'. - * - * - * - * .../index.php/admin/listuser/param1-value1/param2-value2. - * + * 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 + * + * + * + * This rule will match an URL like http://example.com/index.php/admin/edituser + * 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: + * + * + * + * 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: + * + * + * + * To enable automatic parameter encoding in a path format fro wildcard patterns you can set + * {@setUrlFormat UrlFormat} to 'Path': + * + * + * + * This will create and parse URLs of the form + * .../index.php/admin/listuser/param1/value1/param2/value2. + * + * Use {@setUrlParamSeparator} to define another separator character between parameter + * name and value. Parameter/value pairs are always separated by a '/'. + * + * + * + * .../index.php/admin/listuser/param1-value1/param2-value2. + * * @author Wei Zhuo * @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.*)$/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?'&':'&'; if($encodeGetItems) diff --git a/framework/Web/UI/ActiveControls/TActiveDataGrid.php b/framework/Web/UI/ActiveControls/TActiveDataGrid.php index c298bd2a..13ba650a 100644 --- a/framework/Web/UI/ActiveControls/TActiveDataGrid.php +++ b/framework/Web/UI/ActiveControls/TActiveDataGrid.php @@ -49,7 +49,7 @@ Prado::using('System.Web.UI.WebControls.TCheckBoxColumn'); * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveDataGrid extends TDataGrid implements IActiveControl, ISurroundable { /** @@ -185,7 +185,7 @@ class TActiveDataGrid extends TDataGrid implements IActiveControl, ISurroundable * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveBoundColumn extends TBoundColumn { protected function initializeHeaderCell($cell,$columnIndex) { @@ -264,7 +264,7 @@ class TActiveBoundColumn extends TBoundColumn { * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveEditCommandColumn extends TEditCommandColumn { protected function createButton($commandName,$text,$causesValidation,$validationGroup) { @@ -306,7 +306,7 @@ class TActiveEditCommandColumn extends TEditCommandColumn { * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveButtonColumn extends TButtonColumn { public function initializeCell($cell,$columnIndex,$itemType) { @@ -353,7 +353,7 @@ class TActiveButtonColumn extends TButtonColumn { * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveTemplateColumn extends TTemplateColumn { protected function initializeHeaderCell($cell,$columnIndex) { @@ -422,7 +422,7 @@ class TActiveTemplateColumn extends TTemplateColumn { * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveHyperLinkColumn extends THyperLinkColumn { @@ -502,7 +502,7 @@ class TActiveHyperLinkColumn extends THyperLinkColumn * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveCheckBoxColumn extends TCheckBoxColumn { @@ -608,7 +608,7 @@ class TActiveCheckBoxColumn extends TCheckBoxColumn * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveDropDownListColumn extends TDropDownListColumn { @@ -696,7 +696,7 @@ class TActiveDropDownListColumn extends TDropDownListColumn * * @author Fabio Bas * @package System.Web.UI.ActiveControls - * @since 3.2.0a + * @since 3.1.9 */ class TActiveLiteralColumn extends TLiteralColumn { protected function initializeHeaderCell($cell,$columnIndex) { diff --git a/framework/Web/UI/ActiveControls/TActiveRatingList.php b/framework/Web/UI/ActiveControls/TActiveRatingList.php index cee1bcd4..473ca06a 100644 --- a/framework/Web/UI/ActiveControls/TActiveRatingList.php +++ b/framework/Web/UI/ActiveControls/TActiveRatingList.php @@ -31,9 +31,9 @@ class TActiveRatingList extends TRatingList implements IActiveControl, ICallback */ public function __construct() { - parent::__construct(); $this->setAdapter(new TActiveListControlAdapter($this)); $this->setAutoPostBack(true); + parent::__construct(); } /** diff --git a/framework/Web/UI/ActiveControls/TActiveRepeater.php b/framework/Web/UI/ActiveControls/TActiveRepeater.php index ccfda4aa..8b30bbe2 100644 --- a/framework/Web/UI/ActiveControls/TActiveRepeater.php +++ b/framework/Web/UI/ActiveControls/TActiveRepeater.php @@ -4,7 +4,7 @@ * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 * @version $Id: TActiveRepeater.php 2707 2009-09-29 10:33:30Z Christophe.Boulain $ */ @@ -22,7 +22,7 @@ * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveRepeater extends TRepeater implements IActiveControl, ISurroundable { diff --git a/framework/Web/UI/ActiveControls/TActiveTableCell.php b/framework/Web/UI/ActiveControls/TActiveTableCell.php index 833ce6e7..32c9bd46 100644 --- a/framework/Web/UI/ActiveControls/TActiveTableCell.php +++ b/framework/Web/UI/ActiveControls/TActiveTableCell.php @@ -47,7 +47,7 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter'); * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls * @version $Id$ - * @since 3.2 + * @since 3.1.9 */ class TActiveTableCell extends TTableCell implements ICallbackEventHandler, IActiveControl { @@ -212,7 +212,7 @@ class TActiveTableCell extends TTableCell implements ICallbackEventHandler, IAct * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveTableCellEventParameter extends TCallbackEventParameter { diff --git a/framework/Web/UI/ActiveControls/TActiveTableRow.php b/framework/Web/UI/ActiveControls/TActiveTableRow.php index 31287617..f021de7e 100644 --- a/framework/Web/UI/ActiveControls/TActiveTableRow.php +++ b/framework/Web/UI/ActiveControls/TActiveTableRow.php @@ -48,7 +48,7 @@ Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter'); * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls * @version $Id$ - * @since 3.2 + * @since 3.1.9 */ class TActiveTableRow extends TTableRow implements ICallbackEventHandler, IActiveControl { @@ -231,7 +231,7 @@ class TActiveTableRow extends TTableRow implements ICallbackEventHandler, IActiv * * @author LANDWEHR Computer und Software GmbH * @package System.Web.UI.ActiveControls - * @since 3.2 + * @since 3.1.9 */ class TActiveTableRowEventParameter extends TCallbackEventParameter { diff --git a/framework/Web/UI/ActiveControls/TAutoComplete.php b/framework/Web/UI/ActiveControls/TAutoComplete.php index f5977a01..2ae01d2b 100644 --- a/framework/Web/UI/ActiveControls/TAutoComplete.php +++ b/framework/Web/UI/ActiveControls/TAutoComplete.php @@ -425,7 +425,6 @@ class TAutoCompleteTemplate extends TComponent implements ITemplate public function __construct($template) { - parent::__construct(); $this->_template = $template; } /** diff --git a/framework/Web/UI/ActiveControls/TBaseActiveControl.php b/framework/Web/UI/ActiveControls/TBaseActiveControl.php index 2afec4d1..92dd3194 100644 --- a/framework/Web/UI/ActiveControls/TBaseActiveControl.php +++ b/framework/Web/UI/ActiveControls/TBaseActiveControl.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.ActiveControls @@ -44,7 +44,6 @@ class TBaseActiveControl extends TComponent */ public function __construct($control) { - parent::__construct(); $this->_control = $control; $this->_options = new TMap; } diff --git a/framework/Web/UI/ActiveControls/TCallbackClientScript.php b/framework/Web/UI/ActiveControls/TCallbackClientScript.php index 220b5323..d35e89a0 100644 --- a/framework/Web/UI/ActiveControls/TCallbackClientScript.php +++ b/framework/Web/UI/ActiveControls/TCallbackClientScript.php @@ -44,7 +44,6 @@ class TCallbackClientScript extends TApplicationComponent */ public function __construct() { - parent::__construct(); $this->_actions = new TList; } diff --git a/framework/Web/UI/ActiveControls/TCallbackEventParameter.php b/framework/Web/UI/ActiveControls/TCallbackEventParameter.php index 060c4431..2dbb581c 100644 --- a/framework/Web/UI/ActiveControls/TCallbackEventParameter.php +++ b/framework/Web/UI/ActiveControls/TCallbackEventParameter.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.ActiveControls @@ -14,7 +14,7 @@ * TCallbackEventParameter class. * * The TCallbackEventParameter provides the parameter passed during the callback - * requestion in the {@link getCallbackParameter CallbackParameter} property. The + * request in the {@link getCallbackParameter CallbackParameter} property. The * callback response content (e.g. new HTML content) must be rendered * using an THtmlWriter obtained from the {@link getNewWriter NewWriter} * property, which returns a NEW instance of TCallbackResponseWriter. @@ -48,7 +48,6 @@ class TCallbackEventParameter extends TEventParameter */ public function __construct($response, $parameter) { - parent::__construct(); $this->_response = $response; $this->_parameter = $parameter; } diff --git a/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php b/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php index 32e93a86..6425b123 100755 --- a/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php +++ b/framework/Web/UI/ActiveControls/TCallbackResponseAdapter.php @@ -126,7 +126,6 @@ class TCallbackResponseWriter extends TTextWriter */ public function __construct() { - parent::__construct(); $this->_boundary = sprintf('%x',crc32(microtime())); } diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php index 773babca..34d8c548 100755 --- a/framework/Web/UI/ActiveControls/TDraggable.php +++ b/framework/Web/UI/ActiveControls/TDraggable.php @@ -238,4 +238,3 @@ class TDraggableRevertOptions extends TEnumerable const Revert='Revert'; const Failure='Failure'; } -?> diff --git a/framework/Web/UI/ActiveControls/TDropContainer.php b/framework/Web/UI/ActiveControls/TDropContainer.php index 5271cde6..915aa8f9 100755 --- a/framework/Web/UI/ActiveControls/TDropContainer.php +++ b/framework/Web/UI/ActiveControls/TDropContainer.php @@ -265,7 +265,6 @@ class TDropContainerEventParameter extends TEventParameter public function __construct($dropParams) { - parent::__construct(); $this->_dragElementId = $dropParams->DragElementID; $this->_screenX = $dropParams->ScreenX; $this->_screenY = $dropParams->ScreenY; @@ -309,4 +308,3 @@ class TDropContainerEventParameter extends TEventParameter return $control; } } -?> diff --git a/framework/Web/UI/ActiveControls/TTriggeredCallback.php b/framework/Web/UI/ActiveControls/TTriggeredCallback.php index 7ae0781d..72a709d0 100644 --- a/framework/Web/UI/ActiveControls/TTriggeredCallback.php +++ b/framework/Web/UI/ActiveControls/TTriggeredCallback.php @@ -4,14 +4,13 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.ActiveControls */ - -prado::using('System.Web.UI.ActiveControls.TCallback'); +Prado::using('System.Web.UI.ActiveControls.TCallback'); /** * TTriggeredCallback abstract Class * diff --git a/framework/Web/UI/TClientScriptManager.php b/framework/Web/UI/TClientScriptManager.php index cf5f33d4..ee078b9b 100644 --- a/framework/Web/UI/TClientScriptManager.php +++ b/framework/Web/UI/TClientScriptManager.php @@ -88,7 +88,6 @@ class TClientScriptManager extends TApplicationComponent */ public function __construct(TPage $owner) { - parent::__construct(); $this->_page=$owner; } @@ -696,7 +695,6 @@ abstract class TClientSideOptions extends TComponent */ public function __construct() { - parent::__construct(); $this->_options = Prado::createComponent('System.Collections.TMap'); } diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php index 0181d206..1c03a04d 100644 --- a/framework/Web/UI/TControl.php +++ b/framework/Web/UI/TControl.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI @@ -172,17 +172,12 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable * @var array a collection of rare control data */ private $_rf=array(); - /** - * @var number this is how many times the control was told not to render - */ - private $_renderblockcount=0; /** * Constructor. */ public function __construct() { - parent::__construct(); } /** @@ -241,21 +236,6 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable return $this->_parent; } - /** - * @return TControl the parent of this control of type - */ - public function getParentOfType($type,$strict=false) - { - $control = $this->Parent; - do { - if(is_object($control) && (get_class($control)===$type || (!$strict && ($control instanceof $type)))) - return $control; - $control = $control->Parent; - } while($control); - - return null; - } - /** * @return TControl the naming container of this control */ @@ -316,32 +296,6 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable return $this->_tplControl; } - /** - * This adds a block to the rendering of the control - */ - public function addRenderBlock() - { - ++$this->_renderblockcount; - } - - /** - * @return boolean true if the rendering is currently blocked - */ - public function getIsRenderBlocked() - { - return $this->_renderblockcount > 0; - } - - /** - * removes a block. This also has an interesting effect of forcing the render if called in the reverse - * of the typical order. eg. removeRenderBlock(); ...... addRenderBlock(); - */ - public function removeRenderBlock() - { - --$this->_renderblockcount; - } - - /** * @return TTemplateControl the control whose template is loaded from * some external storage, such as file, db, and whose template ultimately @@ -490,13 +444,6 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable $this->_rf[self::RF_SKIN_ID]=$value; } - /** - * @return boolean whether the skin has been applied or is past the phase of skin application - */ - public function getIsSkinApplied() { - return ($this->_flags & self::IS_SKIN_APPLIED) || $this->_stage>self::CS_CHILD_INITIALIZED; - } - /** * @return boolean whether theming is enabled for this control. * The theming is enabled if the control and all its parents have it enabled. @@ -1617,8 +1564,6 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable { if($this->getHasControls()) { - if($this->IsRenderBlocked) return; - foreach($this->_rf[self::RF_CONTROLS] as $control) { if(is_string($control)) @@ -2052,14 +1997,14 @@ interface IValidatable * @return mixed the value of the property to be validated. */ public function getValidationPropertyValue(); - /** - * @return boolean wether this control's validators validated successfully (must default to true) - */ - public function getIsValid(); - /** - * @return boolean wether this control's validators validated successfully - */ - public function setIsValid($value); + /** + * @return boolean wether this control's validators validated successfully (must default to true) + */ + public function getIsValid(); + /** + * @return boolean wether this control's validators validated successfully + */ + public function setIsValid($value); } /** @@ -2318,7 +2263,6 @@ class TCommandEventParameter extends TEventParameter */ public function __construct($name='',$parameter='') { - parent::__construct(); $this->_name=$name; $this->_param=$parameter; } diff --git a/framework/Web/UI/TControlAdapter.php b/framework/Web/UI/TControlAdapter.php index b59da59c..16a8c839 100644 --- a/framework/Web/UI/TControlAdapter.php +++ b/framework/Web/UI/TControlAdapter.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI @@ -34,7 +34,6 @@ class TControlAdapter extends TApplicationComponent */ public function __construct($control) { - parent::__construct(); $this->_control=$control; } diff --git a/framework/Web/UI/THtmlWriter.php b/framework/Web/UI/THtmlWriter.php index 1a888508..8af52452 100644 --- a/framework/Web/UI/THtmlWriter.php +++ b/framework/Web/UI/THtmlWriter.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI @@ -108,7 +108,6 @@ class THtmlWriter extends TApplicationComponent implements ITextWriter */ public function __construct($writer) { - parent::__construct(); $this->_writer=$writer; } diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php index 5405391d..cde3b3db 100644 --- a/framework/Web/UI/TPage.php +++ b/framework/Web/UI/TPage.php @@ -22,6 +22,7 @@ Prado::using('System.Web.UI.TClientScriptManager'); * TPage class * * @author Qiang Xue + * @author Brad Anderson * @version $Id$ * @package System.Web.UI * @since 3.0 @@ -50,21 +51,13 @@ class TPage extends TTemplateControl implements IPageEvents 'PRADO_CALLBACK_PARAMETER'=>true ); /** - * @var THtml html instance + * @var TForm form instance */ - private $_html; + private $_form; /** * @var THead head instance */ private $_head; - /** - * @var TBody body instance - */ - private $_body; - /** - * @var TForm form instance - */ - private $_form; /** * @var array list of registered validators */ @@ -77,10 +70,6 @@ class TPage extends TTemplateControl implements IPageEvents * @var TTheme page theme */ private $_theme; - /** - * @var collection of all the skins - */ - private $_skincontrols = array(); /** * @var string page title set when Head is not in page yet */ @@ -578,11 +567,8 @@ class TPage extends TTemplateControl implements IPageEvents */ public function applyControlSkin($control) { - if(($theme=$this->getTheme())!==null) { + if(($theme=$this->getTheme())!==null) $theme->applySkin($control); - if($control->SkinID) - $this->registerSkin($control); - } } /** @@ -1012,48 +998,6 @@ class TPage extends TTemplateControl implements IPageEvents $this->_enableJavaScript=TPropertyValue::ensureBoolean($value); } - /** - * @return THtml, null if not available - */ - public function getHtml() - { - return $this->_html; - } - - /** - * @param THead page head - * @throws TInvalidOperationException if a head already exists - */ - public function setHtml(THtml $value) - { - if($this->_html===null) - $this->_html = $value; - else - throw new TInvalidOperationException('page_body_duplicated'); - } - - /** - * @return TBody the body on the page - */ - public function getBody() - { - return $this->_body; - } - - /** - * Registers the TBody instance on the page. - * Note, a page can contain at most one TBody instance. - * @param TBody the form on the page - * @throws TInvalidOperationException if this method is invoked more than once. - */ - public function setBody(TBody $body) - { - if($this->_body===null) - $this->_body=$body; - else - throw new TInvalidOperationException('page_body_duplicated'); - } - /** * @return THead page head, null if not available */ @@ -1246,78 +1190,6 @@ class TPage extends TTemplateControl implements IPageEvents } } - /** - * Registers a controls skin id with the page. This function links the control to its skin on the page for access. - * @param TControl the object to register the skinid - */ - protected function registerSkin($control) - { - $id = $control->SkinID; - if(!$id) return; - - if(!is_array($this->_skincontrols)) - $this->_skincontrols = array(); - - if(!isset($this->_skincontrols[$id])) - $this->_skincontrols[$id] = array(); - - $this->_skincontrols[$id][] = $control; - } - - /** - * This gets a control based on its SkinId. If there are multiple controls with the same skin, - * you can give this method the second parameter for an index into all the controls with that - * skin id. This will return the first one if and index is not specifiec - * @param string $skinid the skin to look for within the page - * @param index $index the index of the skin if there are many of the same name, defaults to 0 or the first - */ - public function getSkinControl($skinid, $index = 0) - { - if(isset($this->_skincontrols[$skinid][$index])) - return $this->_skincontrols[$skinid][$index]; - } - - /** - * This gets a control based on its SkinId. If there are multiple controls with the same skin, - * you can give this method the second parameter for an index into all the controls with that - * skin id. This will return the first one if and index is not specifiec - * @param string $skinid the skin to look for within the page - */ - public function getSkinControls($skinid) - { - if(isset($this->_skincontrols[$skinid])) - return $this->_skincontrols[$skinid]; - } - - /** - * Return the count of the skins with that id - * @param integer $skinid the skin to look for within the page - */ - public function getSkinControlCount($skinid) - { - if(isset($this->_skincontrols[$skinid])) - return count($this->_skincontrols[$skinid]); - } - public function getSkinControlsByType($skinid, $type) - { - $result = array(); - if(isset($this->_skincontrols[$skinid])) - foreach($this->_skincontrols[$skinid] as $ctl) - if($ctl instanceof $type) - $result[] = $ctl; - - return $result; - } - - public function getSkinControlByType($skinid, $type, $index = 0) - { - if(isset($this->_skincontrols[$skinid])) - foreach($this->_skincontrols[$skinid] as $ctl) - if(($ctl instanceof $type) && $index--) - return $ctl; - } - - /** * @return TStack stack of {@link TOutputCache} objects */ diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php index 49873340..5d1f5e44 100644 --- a/framework/Web/UI/TTemplateManager.php +++ b/framework/Web/UI/TTemplateManager.php @@ -239,7 +239,6 @@ class TTemplate extends TApplicationComponent implements ITemplate */ public function __construct($template,$contextPath,$tplFile=null,$startingLine=0,$sourceTemplate=true) { - parent::__construct(); $this->_sourceTemplate=$sourceTemplate; $this->_contextPath=$contextPath; $this->_tplFile=$tplFile; diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php index 59b794ce..410976c4 100644 --- a/framework/Web/UI/TThemeManager.php +++ b/framework/Web/UI/TThemeManager.php @@ -229,7 +229,6 @@ class TTheme extends TApplicationComponent implements ITheme */ public function __construct($themePath,$themeUrl) { - parent::__construct(); $this->_themeUrl=$themeUrl; $this->_themePath=realpath($themePath); $this->_name=basename($themePath); diff --git a/framework/Web/UI/WebControls/TBulletedList.php b/framework/Web/UI/WebControls/TBulletedList.php index 2c8e3c97..5f4aa49c 100644 --- a/framework/Web/UI/WebControls/TBulletedList.php +++ b/framework/Web/UI/WebControls/TBulletedList.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -431,7 +431,6 @@ class TBulletedListEventParameter extends TEventParameter */ public function __construct($index) { - parent::__construct(); $this->_index=$index; } diff --git a/framework/Web/UI/WebControls/TCustomValidator.php b/framework/Web/UI/WebControls/TCustomValidator.php index f0e05370..7fed2b84 100644 --- a/framework/Web/UI/WebControls/TCustomValidator.php +++ b/framework/Web/UI/WebControls/TCustomValidator.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -180,7 +180,6 @@ class TServerValidateEventParameter extends TEventParameter */ public function __construct($value,$isValid) { - parent::__construct(); $this->_value=$value; $this->setIsValid($isValid); } diff --git a/framework/Web/UI/WebControls/TDataGrid.php b/framework/Web/UI/WebControls/TDataGrid.php index 4c7fca97..b4916342 100644 --- a/framework/Web/UI/WebControls/TDataGrid.php +++ b/framework/Web/UI/WebControls/TDataGrid.php @@ -9,7 +9,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -1689,7 +1689,6 @@ class TDataGridItemEventParameter extends TEventParameter */ public function __construct(TDataGridItem $item) { - parent::__construct(); $this->_item=$item; } @@ -1728,7 +1727,6 @@ class TDataGridPagerEventParameter extends TEventParameter */ public function __construct(TDataGridPager $pager) { - parent::__construct(); $this->_pager=$pager; } @@ -1830,7 +1828,6 @@ class TDataGridSortCommandEventParameter extends TEventParameter */ public function __construct($source,TDataGridCommandEventParameter $param) { - parent::__construct(); $this->_source=$source; $this->_sortExpression=$param->getCommandParameter(); } @@ -1885,7 +1882,6 @@ class TDataGridPageChangedEventParameter extends TEventParameter */ public function __construct($source,$newPageIndex) { - parent::__construct(); $this->_source=$source; $this->_newIndex=$newPageIndex; } @@ -1950,7 +1946,6 @@ class TDataGridItem extends TTableRow implements INamingContainer */ public function __construct($itemIndex,$dataSourceIndex,$itemType) { - parent::__construct(); $this->_itemIndex=$itemIndex; $this->_dataSourceIndex=$dataSourceIndex; $this->setItemType($itemType); @@ -2070,7 +2065,6 @@ class TDataGridPager extends TPanel implements INamingContainer */ public function __construct($dataGrid) { - parent::__construct(); $this->_dataGrid=$dataGrid; } @@ -2162,7 +2156,6 @@ class TDataGridColumnCollection extends TList */ public function __construct(TDataGrid $owner) { - parent::__construct(); $this->_o=$owner; } diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php index 0bbfc9ac..1349d6a6 100644 --- a/framework/Web/UI/WebControls/TDataList.php +++ b/framework/Web/UI/WebControls/TDataList.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -1517,7 +1517,6 @@ class TDataListItemEventParameter extends TEventParameter */ public function __construct($item) { - parent::__construct(); $this->_item=$item; } diff --git a/framework/Web/UI/WebControls/TDataSourceControl.php b/framework/Web/UI/WebControls/TDataSourceControl.php index 1deaa857..1d0823ff 100644 --- a/framework/Web/UI/WebControls/TDataSourceControl.php +++ b/framework/Web/UI/WebControls/TDataSourceControl.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -103,8 +103,6 @@ class TReadOnlyDataSource extends TDataSourceControl { if(!is_array($dataSource) && !($dataSource instanceof IDataSource) && !($dataSource instanceof Traversable)) throw new TInvalidDataTypeException('readonlydatasource_datasource_invalid'); - - parent::__construct(); $this->_dataSource=$dataSource; $this->_dataMember=$dataMember; } diff --git a/framework/Web/UI/WebControls/TDataSourceView.php b/framework/Web/UI/WebControls/TDataSourceView.php index d631352d..7297fd45 100644 --- a/framework/Web/UI/WebControls/TDataSourceView.php +++ b/framework/Web/UI/WebControls/TDataSourceView.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -87,8 +87,6 @@ abstract class TDataSourceView extends TComponent public function __construct(IDataSource $owner,$viewName) { - parent::__construct(); - $this->_owner=$owner; $this->_name=$viewName; } diff --git a/framework/Web/UI/WebControls/TDropDownListColumn.php b/framework/Web/UI/WebControls/TDropDownListColumn.php index c7bd5ef8..a225abac 100644 --- a/framework/Web/UI/WebControls/TDropDownListColumn.php +++ b/framework/Web/UI/WebControls/TDropDownListColumn.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -66,7 +66,6 @@ class TDropDownListColumn extends TDataGridColumn public function __construct() { - parent::__construct(); $this->_listControl=new TDropDownList; } diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php index ba31b713..0352319b 100644 --- a/framework/Web/UI/WebControls/THtmlArea.php +++ b/framework/Web/UI/WebControls/THtmlArea.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -221,7 +221,6 @@ class THtmlArea extends TTextBox */ public function __construct() { - parent::__construct(); $this->setWidth('470px'); $this->setHeight('250px'); } diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php index 65cf972f..3fa9845a 100644 --- a/framework/Web/UI/WebControls/TImageButton.php +++ b/framework/Web/UI/WebControls/TImageButton.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -402,7 +402,6 @@ class TImageClickEventParameter extends TEventParameter */ public function __construct($x,$y) { - parent::__construct(); $this->_x=$x; $this->_y=$y; } diff --git a/framework/Web/UI/WebControls/TImageMap.php b/framework/Web/UI/WebControls/TImageMap.php index 89b77c71..d0cd8a0a 100644 --- a/framework/Web/UI/WebControls/TImageMap.php +++ b/framework/Web/UI/WebControls/TImageMap.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -244,7 +244,6 @@ class TImageMapEventParameter extends TEventParameter */ public function __construct($postBackValue) { - parent::__construct(); $this->_postBackValue=$postBackValue; } diff --git a/framework/Web/UI/WebControls/TListItem.php b/framework/Web/UI/WebControls/TListItem.php index 9ba24bec..eb72d183 100644 --- a/framework/Web/UI/WebControls/TListItem.php +++ b/framework/Web/UI/WebControls/TListItem.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-20010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -57,8 +57,6 @@ class TListItem extends TComponent */ public function __construct($text='',$value='',$enabled=true,$selected=false) { - parent::__construct(); - $this->setText($text); $this->setValue($value); $this->setEnabled($enabled); diff --git a/framework/Web/UI/WebControls/TPager.php b/framework/Web/UI/WebControls/TPager.php index a33b523a..51ea2a11 100644 --- a/framework/Web/UI/WebControls/TPager.php +++ b/framework/Web/UI/WebControls/TPager.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -726,8 +726,6 @@ class TPagerPageChangedEventParameter extends TEventParameter */ public function __construct($source,$newPageIndex) { - parent::__construct(); - $this->_source=$source; $this->_newIndex=$newPageIndex; } diff --git a/framework/Web/UI/WebControls/TRepeater.php b/framework/Web/UI/WebControls/TRepeater.php index fa4d7b7f..a6c9903d 100644 --- a/framework/Web/UI/WebControls/TRepeater.php +++ b/framework/Web/UI/WebControls/TRepeater.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -802,7 +802,6 @@ class TRepeaterItemEventParameter extends TEventParameter */ public function __construct($item) { - parent::__construct(); $this->_item=$item; } diff --git a/framework/Web/UI/WebControls/TStyle.php b/framework/Web/UI/WebControls/TStyle.php index b507c8e3..1b94cc8e 100644 --- a/framework/Web/UI/WebControls/TStyle.php +++ b/framework/Web/UI/WebControls/TStyle.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -54,8 +54,6 @@ class TStyle extends TComponent */ public function __construct($style=null) { - parent::__construct(); - if($style!==null) $this->copyFrom($style); } diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php index 4252a159..a9268b2b 100644 --- a/framework/Web/UI/WebControls/TWizard.php +++ b/framework/Web/UI/WebControls/TWizard.php @@ -4,7 +4,7 @@ * * @author Qiang Xue * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Web.UI.WebControls @@ -1397,21 +1397,21 @@ class TWizard extends TWebControl implements INamingContainer else if(strcasecmp($command,self::CMD_MOVETO)===0) { if($this->_cancelNavigation) // may be set in onSideBarButtonClick - $navParam->setCancelNavigation(true); - $requestedStep=$param->getCommandParameter(); - if (!is_numeric($requestedStep)) - { - $requestedIndex=-1; - foreach ($this->getWizardSteps() as $index=>$step) - if ($step->getId()===$requestedStep) - { - $requestedIndex=$index; - break; - } - if ($requestedIndex<0) - throw new TConfigurationException('wizard_step_invalid'); - } - else + $navParam->setCancelNavigation(true); + $requestedStep=$param->getCommandParameter(); + if (!is_numeric($requestedStep)) + { + $requestedIndex=-1; + foreach ($this->getWizardSteps() as $index=>$step) + if ($step->getId()===$requestedStep) + { + $requestedIndex=$index; + break; + } + if ($requestedIndex<0) + throw new TConfigurationException('wizard_step_invalid'); + } + else $requestedIndex=TPropertyValue::ensureInteger($requestedStep); $navParam->setNextStepIndex($requestedIndex); $handled=true; @@ -1693,7 +1693,6 @@ class TWizardStepCollection extends TList */ public function __construct(TWizard $wizard) { - parent::__construct(); $this->_wizard=$wizard; } diff --git a/framework/Web/UI/WebControls/TXmlTransform.php b/framework/Web/UI/WebControls/TXmlTransform.php index d00ab974..c1a372e1 100644 --- a/framework/Web/UI/WebControls/TXmlTransform.php +++ b/framework/Web/UI/WebControls/TXmlTransform.php @@ -5,7 +5,7 @@ * @author Knut Urdalen * @author Qiang Xue * @link http://www.pradosoft.com - * @copyright Copyright © 2005-2010 PradoSoft + * @copyright Copyright © 2005-2008 PradoSoft * @license http://www.pradosoft.com/license/ * @package System.Web.UI.WebControls */ @@ -49,7 +49,6 @@ class TXmlTransform extends TControl { if(!class_exists('XSLTProcessor', false)) { throw new TConfigurationException('xmltransform_xslextension_required'); } - parent::__construct(); } /** -- cgit v1.2.3