Changeset 1752

Timestamp:

08/23/06 09:08:02 (3 years ago)

Author:

fabien

Message:

• added a new charset parameter in settings.yml (defaults to utf-8)
  
• changed default content-type from text/html; charset=utf-8 to text/html in view.yml skeleton
  
• changed all occurences of UTF-8 in symfony core by sfConfig::get('sf_charset') (escpecially all htmlentities() calls)
  
• use the new charset for the sfFillFormFilter filter (and iconv to convert back to utf-8 - needed by DOMElement::setAttribute())
  
• automatically add the charset to the content-type when sending headers to the browser
  

I hope this will fix all our problems with non utf-8 charset support in symfony and it does not break BC.
If you have a non UTF-8 symfony website, please test it and give us some feedback.

Files:

• trunk/data/config/settings.yml (modified) (1 diff)
• trunk/data/skeleton/app/app/config/view.yml (modified) (1 diff)
• trunk/lib/config/sfViewConfigHandler.class.php (modified) (1 diff)
• trunk/lib/debug/sfWebDebug.class.php (modified) (2 diffs)
• trunk/lib/filter/sfFillInFormFilter.class.php (modified) (4 diffs)
• trunk/lib/helper/EscapingHelper.php (modified) (1 diff)
• trunk/lib/response/sfWebResponse.class.php (modified) (4 diffs)

trunk/data/config/settings.yml

@@ -71 +71 @@
-
-    autoloading_functions: ~
+
+    charset: utf-8

trunk/data/skeleton/app/app/config/view.yml

@@ -1 +1 @@
-default:
-  http_metas:
-; charset=utf-8
+
-
-  metas:

trunk/lib/config/sfViewConfigHandler.class.php

@@ -176 +176 @@
-    foreach ($this->mergeConfigValue('metas', $viewName) as $name => $content)
-    {
-'UTF-8'
+sfConfig::get('sf_charset')
-    }
-

trunk/lib/debug/sfWebDebug.class.php

@@ -131 +131 @@
-
-    // escape HTML
-'UTF-8'
+sfConfig::get('sf_charset')
-
-    // replace constants value with constant name
@@ -373 +373 @@
-    $content = '
-    <h2>'.$id.' <a href="#" onclick="sfWebDebugToggle(\'sfWebDebug'.$id.'\'); return false;"><img src="'.$this->base_image_path.'/toggle.gif" alt="" /></a></h2>
-'UTF-8'
+sfConfig::get('sf_charset')
-    ';
-

trunk/lib/filter/sfFillInFormFilter.class.php

@@ -26 +26 @@
-    $request  = $context->getRequest();
-
-'UTF-8'
+sfConfig::get('sf_charset')
-    @$doc->loadHTML($response->getContent());
-    $xpath = new DomXPath($doc);
@@ -86 +86 @@
-            if ($request->hasParameter($element->getAttribute('name')))
-            {
-pac
+cap
-            }
-          }
@@ -96 +96 @@
-            $element->removeChild($child_node);
-          }
-pac
+cap
-        }
-        else if ($element->nodeName == 'select')
@@ -131 +131 @@
-  }
-
-pac
+cap
-  {
-    $value = $request->getParameter($name);
+
+    if (extension_loaded('iconv') && strtolower(sfConfig::get('sf_charset')) != 'utf-8')
+    {
+      $new_value = iconv(sfConfig::get('sf_charset'), 'UTF-8', $value);
+      if (false !== $new_value)
+      {
+        $value = $new_value;
+      }
+    }
+
-    if (isset($this->escapers[$name]))
-    {

trunk/lib/helper/EscapingHelper.php

@@ -42 +42 @@
-  // Numbers and boolean values get turned into strings which can cause problems
-  // with type comparisons (e.g. === or is_int() etc).
-'UTF-8'
+sfConfig::get('sf_charset')
-}
-

trunk/lib/response/sfWebResponse.class.php

@@ -244 +244 @@
-    }
-
+    $this->fixHeaders();
+
-    // headers
-    foreach ($this->headers as $name => $values)
@@ -277 +279 @@
-  }
-
+  private function fixHeaders()
+  {
+    // add charset to the content-type header if needed
+    if (false === stripos($this->getContentType(), 'charset'))
+    {
+      $this->setContentType($this->getContentType().'; charset='.sfConfig::get('sf_charset'));
+    }
+  }
+
-  private function normalizeHeaderName($name)
-  {
@@ -377 +388 @@
-      if (!$doNotEscape)
-      {
-'UTF-8'
+sfConfig::get('sf_charset')
-      }
-
@@ -400 +411 @@
-      }
-
-'UTF-8'
+sfConfig::get('sf_charset')
-    }
-