From 36b52fa8ecbcd3b1559a1f49cbfdb4bf413e2773 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 9 Mar 2006 02:18:49 +0000
Subject: Many small fixes due to the result of zend analyzer.

---
 framework/Web/Services/TPageService.php             | 1 -
 framework/Web/THttpSession.php                      | 2 +-
 framework/Web/UI/TTemplateManager.php               | 3 ++-
 framework/Web/UI/WebControls/TBoundColumn.php       | 2 +-
 framework/Web/UI/WebControls/TBulletedList.php      | 4 +++-
 framework/Web/UI/WebControls/TCheckBoxColumn.php    | 2 +-
 framework/Web/UI/WebControls/TDataList.php          | 1 -
 framework/Web/UI/WebControls/TDatePicker.php        | 1 -
 framework/Web/UI/WebControls/TImage.php             | 2 +-
 framework/Web/UI/WebControls/TInlineFrame.php       | 2 +-
 framework/Web/UI/WebControls/TMultiView.php         | 2 +-
 framework/Web/UI/WebControls/TRatingList.php        | 2 +-
 framework/Web/UI/WebControls/TSafeHtml.php          | 2 +-
 framework/Web/UI/WebControls/TTextBox.php           | 4 ++--
 framework/Web/UI/WebControls/TValidationSummary.php | 8 ++++----
 15 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'framework/Web')

diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index cebedc63..991da05b 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -417,7 +417,6 @@ class TPageService extends TService
 	public function run()
 	{
 		Prado::trace("Running page service",'System.Web.Services.TPageService');
-		$page=null;
 		$path=$this->getBasePath().'/'.strtr($this->getRequestedPagePath(),'.','/');
 		if(is_file($path.self::PAGE_FILE_EXT))
 		{
diff --git a/framework/Web/THttpSession.php b/framework/Web/THttpSession.php
index 1292b548..ad7d272a 100644
--- a/framework/Web/THttpSession.php
+++ b/framework/Web/THttpSession.php
@@ -193,7 +193,7 @@ class THttpSession extends TApplicationComponent implements IteratorAggregate,Ar
 		else if(ctype_alnum($value))
 			session_name($value);
 		else
-			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$name);
+			throw new TInvalidDataValueException('httpsession_sessionname_invalid',$value);
 	}
 
 	/**
diff --git a/framework/Web/UI/TTemplateManager.php b/framework/Web/UI/TTemplateManager.php
index b2b2f830..7c32e6a1 100644
--- a/framework/Web/UI/TTemplateManager.php
+++ b/framework/Web/UI/TTemplateManager.php
@@ -583,7 +583,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 				}
 				else if(strpos($str,'<!--')===0)	// HTML comments
 				{
-					$state=0;
+					// do nothing
 				}
 				else if(strpos($str,'<!')===0)		// template comments
 				{
@@ -685,6 +685,7 @@ class TTemplate extends TApplicationComponent implements ITemplate
 			return array(self::CONFIG_LOCALIZATION,trim(substr($value,3,strlen($value)-6)));
 		else if($value[2]==='$')
 			return array(self::CONFIG_PARAMETER,trim(substr($value,3,strlen($value)-5)));
+		return '';
 	}
 
 	protected function validateAttributes($type,$attributes)
diff --git a/framework/Web/UI/WebControls/TBoundColumn.php b/framework/Web/UI/WebControls/TBoundColumn.php
index f5b5517c..393d5c11 100644
--- a/framework/Web/UI/WebControls/TBoundColumn.php
+++ b/framework/Web/UI/WebControls/TBoundColumn.php
@@ -111,7 +111,7 @@ class TBoundColumn extends TDataGridColumn
 			case 'Item':
 			case 'AlternatingItem':
 			case 'SelectedItem':
-				if(($dataField=$this->getDataField())!=='')
+				if($this->getDataField()!=='')
 					$cell->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 				break;
 		}
diff --git a/framework/Web/UI/WebControls/TBulletedList.php b/framework/Web/UI/WebControls/TBulletedList.php
index 233ace4e..fd0226c0 100644
--- a/framework/Web/UI/WebControls/TBulletedList.php
+++ b/framework/Web/UI/WebControls/TBulletedList.php
@@ -273,12 +273,14 @@ class TBulletedList extends TListControl implements IPostBackEventHandler
 		switch($this->getDisplayMode())
 		{
 			case 'Text':
-				return $this->renderTextItem($writer, $item, $index);
+				$this->renderTextItem($writer, $item, $index);
+				break;
 			case 'HyperLink':
 				$this->renderHyperLinkItem($writer, $item, $index);
 				break;
 			case 'LinkButton':
 				$this->renderLinkButtonItem($writer, $item, $index);
+				break;
 		}
 		if(($accesskey=$this->getAccessKey())!=='')
 			$writer->addAttribute('accesskey',$accesskey);
diff --git a/framework/Web/UI/WebControls/TCheckBoxColumn.php b/framework/Web/UI/WebControls/TCheckBoxColumn.php
index 4b13a171..f695bcdc 100644
--- a/framework/Web/UI/WebControls/TCheckBoxColumn.php
+++ b/framework/Web/UI/WebControls/TCheckBoxColumn.php
@@ -83,7 +83,7 @@ class TCheckBoxColumn extends TDataGridColumn
 				$checkBox->setEnabled(false);
 			$cell->setHorizontalAlign('Center');
 			$cell->getControls()->add($checkBox);
-			if(($dataField=$this->getDataField())!=='')
+			if($this->getDataField()!=='')
 				$checkBox->attachEventHandler('OnDataBinding',array($this,'dataBindColumn'));
 		}
 	}
diff --git a/framework/Web/UI/WebControls/TDataList.php b/framework/Web/UI/WebControls/TDataList.php
index ab1e8085..56e8d43c 100644
--- a/framework/Web/UI/WebControls/TDataList.php
+++ b/framework/Web/UI/WebControls/TDataList.php
@@ -926,7 +926,6 @@ class TDataList extends TBaseDataList implements INamingContainer, IRepeatInfoUs
 
 		$headerStyle=$this->getViewState('HeaderStyle',null);
 		$footerStyle=$this->getViewState('FooterStyle',null);
-		$pagerStyle=$this->getViewState('PagerStyle',null);
 		$separatorStyle=$this->getViewState('SeparatorStyle',null);
 
 		foreach($this->getControls() as $index=>$item)
diff --git a/framework/Web/UI/WebControls/TDatePicker.php b/framework/Web/UI/WebControls/TDatePicker.php
index 71358ee7..70f116a8 100644
--- a/framework/Web/UI/WebControls/TDatePicker.php
+++ b/framework/Web/UI/WebControls/TDatePicker.php
@@ -622,7 +622,6 @@ class TDatePicker extends TTextBox
 	 */
 	protected function publishDefaultButtonImage()
 	{
-		$cs = $this->getPage()->getClientScript();
 		$image = 'System.Web.Javascripts.datepicker.calendar';
 		if(($file =  Prado::getPathOfNamespace($image, '.png'))!==null)
 			return $this->publishFilePath($file);
diff --git a/framework/Web/UI/WebControls/TImage.php b/framework/Web/UI/WebControls/TImage.php
index f995da8e..e4b07f79 100644
--- a/framework/Web/UI/WebControls/TImage.php
+++ b/framework/Web/UI/WebControls/TImage.php
@@ -47,7 +47,7 @@ class TImage extends TWebControl
 			$writer->addAttribute('longdesc',$desc);
 		if(($align=$this->getImageAlign())!=='')
 			$writer->addAttribute('align',$align);
-		if(($width=$this->getBorderWidth())==='')
+		if($this->getBorderWidth()==='')
 			$writer->addStyleAttribute('border-width','0px');
 		parent::addAttributesToRender($writer);
 	}
diff --git a/framework/Web/UI/WebControls/TInlineFrame.php b/framework/Web/UI/WebControls/TInlineFrame.php
index 0daee2d3..0bc38c30 100644
--- a/framework/Web/UI/WebControls/TInlineFrame.php
+++ b/framework/Web/UI/WebControls/TInlineFrame.php
@@ -170,7 +170,7 @@ class TInlineFrame extends TWebControl
 	 */
 	protected function addAttributesToRender($writer)
 	{
-		if(($id=$this->getID())!=='')
+		if($this->getID()!=='')
 			$writer->addAttribute('name',$this->getUniqueID());
 
 		if(($src=$this->getFrameUrl())!=='')
diff --git a/framework/Web/UI/WebControls/TMultiView.php b/framework/Web/UI/WebControls/TMultiView.php
index fc4385c6..d44668f4 100644
--- a/framework/Web/UI/WebControls/TMultiView.php
+++ b/framework/Web/UI/WebControls/TMultiView.php
@@ -109,7 +109,7 @@ class TMultiView extends TControl
 		$index=$this->getActiveViewIndex();
 		$views=$this->getViews();
 		if($index>=$views->getCount())
-			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$value);
+			throw new TInvalidDataValueException('multiview_activeviewindex_invalid',$index);
 		if($index<0)
 			return null;
 		$view=$views->itemAt($index);
diff --git a/framework/Web/UI/WebControls/TRatingList.php b/framework/Web/UI/WebControls/TRatingList.php
index 9a6932b0..6397660f 100644
--- a/framework/Web/UI/WebControls/TRatingList.php
+++ b/framework/Web/UI/WebControls/TRatingList.php
@@ -58,7 +58,7 @@ class TRatingList extends TRadioButtonList
 		if($this->getAllowInput())
 			$this->setSelectedIndex($value);
 		else
-			return $this->setViewState('Rating', TPropertyValue::ensureFloat($value),0);
+			$this->setViewState('Rating', TPropertyValue::ensureFloat($value),0);
 	}
 
 	/**
diff --git a/framework/Web/UI/WebControls/TSafeHtml.php b/framework/Web/UI/WebControls/TSafeHtml.php
index 5015a5ac..432cb104 100644
--- a/framework/Web/UI/WebControls/TSafeHtml.php
+++ b/framework/Web/UI/WebControls/TSafeHtml.php
@@ -41,7 +41,7 @@ class TSafeHtml extends TControl
 	protected function parseSafeHtml($text)
 	{
 		$renderer = Prado::createComponent('System.3rdParty.SafeHtml.TSafeHtmlParser');
-		return $renderer->parse($content);
+		return $renderer->parse($text);
 	}
 }
 
diff --git a/framework/Web/UI/WebControls/TTextBox.php b/framework/Web/UI/WebControls/TTextBox.php
index b91a72ef..7d1b9cba 100644
--- a/framework/Web/UI/WebControls/TTextBox.php
+++ b/framework/Web/UI/WebControls/TTextBox.php
@@ -120,9 +120,9 @@ class TTextBox extends TWebControl implements IPostBackDataHandler, IValidatable
 						$writer->addAttribute('vcard_name','BusinessCountry');
 					else
 					{
-						if(($pos=strpos($act,'Business'))===0)
+						if(strpos($act,'Business')===0)
 							$act='Business'.'.'.substr($act,8);
-						else if(($pos=strpos($act,'Home'))===0)
+						else if(strpos($act,'Home')===0)
 							$act='Home'.'.'.substr($act,4);
 						$writer->addAttribute('vcard_name','vCard.'.$act);
 					}
diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php
index 41362264..437e10d6 100644
--- a/framework/Web/UI/WebControls/TValidationSummary.php
+++ b/framework/Web/UI/WebControls/TValidationSummary.php
@@ -275,14 +275,14 @@ class TValidationSummary extends TWebControl
 			switch($this->getDisplayMode())
 			{
 				case 'List':
-					$content = $this->renderList($writer);
+					$this->renderList($writer);
 					break;
 				case 'SingleParagraph':
-					$content = $this->renderSingleParagraph($writer);
+					$this->renderSingleParagraph($writer);
 					break;
 				case 'BulletList':
-				default:
-					$content = $this->renderBulletList($writer);
+					$this->renderBulletList($writer);
+					break;
 			}
 		}
 	}
-- 
cgit v1.2.3