Changeset 2550 for trunk/src/filter/AgaviFormPopulationFilter.class.php

Timestamp:

07/01/08 09:53:34 (6 months ago)

Author:

david

Message:

merge [2519:2549/branches/0.11]

Files:

• trunk/src/filter/AgaviFormPopulationFilter.class.php (modified) (10 diffs)

trunk/src/filter/AgaviFormPopulationFilter.class.php

@@ -47 +47 @@
   const ENCODING_ISO_8859_1 = 'iso-8859-1';
 
+  /**
+   * @var        DOMDocument Our (X)HTML document.
+   */
   protected $doc;
+
+  /**
+   * @var        DOMXPath Our XPath instance for the document.
+   */
   protected $xpath;
-  protected $ns;
+
+  /**
+   * @var        string The XML NS prefix we're working on with XPath, including
+   *                    a colon (or empty string if document has no NS).
+   */
+  protected $xmlnsPrefix = '';
 
   /**
@@ -151 +163 @@
       if($this->doc->documentElement && $this->doc->documentElement->namespaceURI) {
         $this->xpath->registerNamespace('html', $this->doc->documentElement->namespaceURI);
-        $this->ns = 'html:';
+        $this->xmlnsPrefix = 'html:';
       } else {
-        $this->ns = '';
+        $this->xmlnsPrefix = '';
       }
     } else {
       $this->doc->loadHTML($output);
       $this->xpath = new DomXPath($this->doc);
-      $this->ns = '';
+      $this->xmlnsPrefix = '';
     }
 
@@ -187 +199 @@
 
     $properXhtml = false;
-    foreach($this->xpath->query('//' . $this->ns . 'head/' . $this->ns . 'meta') as $meta) {
+    foreach($this->xpath->query(sprintf('//%1$shead/%1$smeta', $this->xmlnsPrefix)) as $meta) {
       if(strtolower($meta->getAttribute('http-equiv')) == 'content-type') {
         if($this->doc->encoding === null) {
@@ -221 +233 @@
     }
 
-    $base = $this->xpath->query('/' . $this->ns . 'html/' . $this->ns . 'head/' . $this->ns . 'base[@href]');
+    $base = $this->xpath->query(sprintf('/%1$shtml/%1$shead/%1$sbase[@href]', $this->xmlnsPrefix));
     if($base->length) {
       $baseHref = $base->item(0)->getAttribute('href');
@@ -234 +246 @@
       foreach(array_keys($populate) as $id) {
         if(is_string($id)) {
-          $query[] = '@id="' . $id . '"';
+          $query[] = sprintf('@id="%s"', $id);
         }
       }
       if($query) {
-        $forms = $this->xpath->query('//' . $this->ns . 'form[' . implode(' or ', $query) . ']');
+        $forms = $this->xpath->query(sprintf('//%1$sform[%2$s]', $this->xmlnsPrefix, implode(' or ', $query)));
       }
     } else {
-      $forms = $this->xpath->query('//' . $this->ns . 'form[@action]');
+      $forms = $this->xpath->query(sprintf('//%1$sform[@action]', $this->xmlnsPrefix));
     }
 
@@ -276 +288 @@
 
       // build the XPath query
-      $query = 'descendant::' . $this->ns . 'textarea[@name] | descendant::' . $this->ns . 'select[@name] | descendant::' . $this->ns . 'input[@name and (not(@type) or @type="text" or (@type="checkbox" and not(contains(@name, "[]"))) or (@type="checkbox" and contains(@name, "[]") and @value) or @type="radio" or @type="password" or @type="file"';
+      $query = sprintf('descendant::%1$stextarea[@name] | descendant::%1$sselect[@name] | descendant::%1$sinput[@name and (not(@type) or @type="text" or (@type="checkbox" and not(contains(@name, "[]"))) or (@type="checkbox" and contains(@name, "[]") and @value) or @type="radio" or @type="password" or @type="file"', $this->xmlnsPrefix);
       if($cfg['include_hidden_inputs']) {
         $query .= ' or @type="hidden"';
@@ -345 +357 @@
           $errorClassElements[] = $element;
           // all implicit labels
-          foreach($this->xpath->query('ancestor::' . $this->ns . 'label[not(@for)]', $element) as $label) {
+          foreach($this->xpath->query(sprintf('ancestor::%1$slabel[not(@for)]', $this->xmlnsPrefix), $element) as $label) {
             $errorClassElements[] = $label;
           }
           // and all explicit labels
           if(($id = $element->getAttribute('id')) != '') {
-            foreach($this->xpath->query('descendant::' . $this->ns . 'label[@for="' . $id . '"]', $form) as $label) {
+            foreach($this->xpath->query(sprintf('descendant::%1$slabel[@for="%2$s"]', $this->xmlnsPrefix, $id), $form) as $label) {
               $errorClassElements[] = $label;
             }
@@ -360 +372 @@
             foreach($cfg['error_class_map'] as $xpathExpression => $errorClassName) {
               // evaluate each xpath expression
-              $errorClassResults = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->ns)), $errorClassElement);
+              $errorClassResults = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $errorClassElement);
               if($errorClassResults && $errorClassResults->length) {
                 // we have results. the xpath expressions are used to locale the actual elements we set the error class on - doesn't necessarily have to be the erroneous element or the label!
@@ -457 +469 @@
           // select elements
           // yes, we still use XPath because there could be OPTGROUPs
-          foreach($this->xpath->query('descendant::' . $this->ns . 'option', $element) as $option) {
+          foreach($this->xpath->query(sprintf('descendant::%1$soption', $this->xmlnsPrefix), $element) as $option) {
             $option->removeAttribute('selected');
             if($p->hasParameter($pname) && ($option->getAttribute('value') === $value || ($multiple && is_array($value) && in_array($option->getAttribute('value'), $value)))) {
@@ -633 +645 @@
     $insertSuccessful = false;
     foreach($rules as $xpathExpression => $errorMessageInfo) {
-      $targets = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->ns)), $element);
+      $targets = $this->xpath->query(AgaviToolkit::expandVariables($xpathExpression, array('htmlnsPrefix' => $this->xmlnsPrefix)), $element);
 
       if(!$targets || !$targets->length) {