Changeset 224

Timestamp:

12/24/2005 09:26:35 PM (3 years ago)

Author:

xue

Message:

Fixed HTML encoding problem.

Location:

trunk/framework/Web

Files:

• THttpRequest.php (modified) (2 diffs)
• UI/THtmlWriter.php (modified) (2 diffs)
• UI/TTemplateManager.php (modified) (5 diffs)

trunk/framework/Web/THttpRequest.php

@@ -336 +336 @@
          * @param string service parameter
          * @param array GET parameters, null if not needed
+         * @param boolean whether to encode the ampersand in URL, defaults to false.
          * @return string URL
          */
-        public function constructUrl($serviceID,$serviceParam,$getItems=null)
+        public function constructUrl($serviceID,$serviceParam,$getItems=null,$encodeAmpersand=false)
         {
                 $url=$this->getApplicationPath();
@@ -344 +345 @@
                 if(!empty($serviceParam))
                         $url.=$serviceParam;
+                $amp=$encodeAmpersand?'&':'&';
                 if(is_array($getItems) || $getItems instanceof Traversable)
                 {
                         foreach($getItems as $name=>$value)
-                                $url.='&'.urlencode($name).'='.urlencode($value);
+                                $url.=$amp.urlencode($name).'='.urlencode($value);
                 }
                 if(defined('SID') && SID != '')
-                        $url.='&'.SID;
+                        $url.=$amp.SID;
                 return $url;
         }

trunk/framework/Web/UI/THtmlWriter.php

@@ -114 +114 @@
                 'abbr'=>true,
                 'accesskey'=>true,
-                'align'=>false,
                 'alt'=>true,
-                'autocomplete'=>false,
                 'axis'=>true,
                 'background'=>true,
-                'bgcolor'=>false,
-                'border'=>false,
-                'bordercolor'=>false,
-                'cellpadding'=>false,
-                'cellspacing'=>false,
-                'checked'=>false,
                 'class'=>true,
-                'cols'=>false,
-                'colspan'=>false,
                 'content'=>true,
-                'coords'=>false,
-                'dir'=>false,
-                'disabled'=>false,
-                'for'=>false,
                 'headers'=>true,
-                'height'=>false,
                 'href'=>true,
-                'id'=>false,
                 'longdesc'=>true,
-                'maxlength'=>false,
-                'multiple'=>false,
-                'name'=>false,
-                'nowrap'=>false,
                 'onclick'=>true,
                 'onchange'=>true,
-                'readonly'=>false,
-                'rel'=>false,
-                'rows'=>false,
-                'rowspan'=>false,
-                'rules'=>false,
-                'scope'=>false,
-                'selected'=>false,
-                'shape'=>false,
-                'size'=>false,
                 'src'=>true,
-                'style'=>false,
-                'tabindex'=>false,
-                'target'=>false,
                 'title'=>true,
-                'type'=>false,
-                'usemap'=>false,
-                'valign'=>false,
-                'value'=>true,
-                'vcard_name'=>false,
-                'width'=>false,
-                'wrap'=>false
+                'value'=>true
         );
         private static $_styleEncode=array(
                 'background-image'=>true,
-                'font-family'=>false,
                 'list-style-image'=>true
         );
@@ -199 +160 @@
         public function addStyleAttribute($name,$value)
         {
-                if(isset(self::$_styleEncode[$name]))
-                        $this->_styles[$name]=THttpUtility::htmlEncode($value);
-                else
-                        $this->_styles[$name]=$value;
+                $this->_styles[$name]=isset(self::$_styleEncode[$name])?THttpUtility::htmlEncode($value):$value;
         }
 

trunk/framework/Web/UI/TTemplateManager.php

@@ -318 +318 @@
         protected function configureEvent($component,$name,$value)
         {
+                $value=THttpUtility::htmlDecode($value);
                 if(strpos($value,'.')===false)
                         $component->attachEventHandler($name,array($component,'TemplateControl.'.$value));
@@ -337 +338 @@
                         if(is_array($value))
                         {
+                                $v=THttpUtility::htmlDecode($value[1]);
                                 switch($value[0])
                                 {
                                         case self::CONFIG_DATABIND:
-                                                $component->bindProperty($name,$value[1]);
+                                                $component->bindProperty($name,$v);
                                                 break;
                                         case self::CONFIG_EXPRESSION:
-                                                $component->$setter($component->evaluateExpression($value[1]));
+                                                $component->$setter($component->evaluateExpression($v));
                                                 break;
                                         case self::CONFIG_ASSET:                // asset URL
-                                                $url=$this->_assetManager->publishFilePath($this->_contextPath.'/'.$value[1]);
+                                                $url=$this->_assetManager->publishFilePath($this->_contextPath.'/'.$v);
                                                 $component->$setter($url);
                                                 break;
                                         case self::CONFIG_PARAMETER:            // application parameter
-                                                $component->$setter(Prado::getApplication()->getParameters()->itemAt($value[1]));
+                                                $component->$setter(Prado::getApplication()->getParameters()->itemAt($v));
                                                 break;
                                         default:        // an error if reaching here
@@ -357 +359 @@
                         }
                         else
-                                $component->$setter($value);
+                                $component->$setter(THttpUtility::htmlDecode($value));
                 }
                 else
@@ -373 +375 @@
                 if(is_array($value))
                 {
+                        $v=THttpUtility::htmlDecode($value[1]);
                         switch($value[0])
                         {
                                 case self::CONFIG_DATABIND:             // databinding
-                                        $component->bindProperty($name,$value[1]);
+                                        $component->bindProperty($name,$v);
                                         break;
                                 case self::CONFIG_EXPRESSION:           // expression
-                                        $component->setSubProperty($name,$component->evaluateExpression($value[1]));
+                                        $component->setSubProperty($name,$component->evaluateExpression($v));
                                         break;
                                 case self::CONFIG_ASSET:                // asset URL
-                                        $url=$this->_assetManager->publishFilePath($this->_contextPath.'/'.$value[1]);
+                                        $url=$this->_assetManager->publishFilePath($this->_contextPath.'/'.$v);
                                         $component->setSubProperty($name,$url);
                                         break;
                                 case self::CONFIG_PARAMETER:            // application parameter
-                                        $component->setSubProperty($name,Prado::getApplication()->getParameters()->itemAt($value[1]));
+                                        $component->setSubProperty($name,Prado::getApplication()->getParameters()->itemAt($v));
                                         break;
                                 default:        // an error if reaching here
@@ -393 +396 @@
                 }
                 else
-                        $component->setSubProperty($name,$value);
+                        $component->setSubProperty($name,THttpUtility::htmlDecode($value));
         }