fix html body output by widgets

joachimdoerr · joachimdoerr · commit 6bb609a96492 · 2018-09-12T15:09:27.000+02:00
diff --git a/lib/classes/Parser/MFormParser.php b/lib/classes/Parser/MFormParser.php
@@ -660,6 +660,12 @@ private function generateMediaElement(MFormItem $item)
                     }
                 }
                 $html = $dom->C14N(false, true);
+                if (strpos($html, '<body') !== false) {
+                    preg_match("/<body>(.*)<\/body>/ism", $html, $matches);
+                    if (isset($matches[1])) {
+                        $html = $matches[1];
+                    }
+                }
 
                 break;
             case 'medialist':
@@ -681,6 +687,12 @@ private function generateMediaElement(MFormItem $item)
                     }
                 }
                 $html = $dom->C14N(false, true);
+                if (strpos($html, '<body') !== false) {
+                    preg_match("/<body>(.*)<\/body>/ism", $html, $matches);
+                    if (isset($matches[1])) {
+                        $html = $matches[1];
+                    }
+                }
 
                 break;
         }
@@ -781,9 +793,9 @@ private function generateCustomLinkElement(MFormItem $item)
                             }
                         }
                         if (($childNode->hasAttribute('class')
-                            && $childNode->getAttribute('class') == 'form-control')
+                                && $childNode->getAttribute('class') == 'form-control')
                             && ($childNode->hasAttribute('value')
-                            && $childNode->getAttribute('value') == '')) {
+                                && $childNode->getAttribute('value') == '')) {
                             $childNode->setAttribute('value', $item->getValue());
                             if (is_array($item->getAttributes()) && sizeof($item->getAttributes()) > 0) {
                                 foreach ($item->getAttributes() as $key => $value) {
@@ -794,6 +806,12 @@ private function generateCustomLinkElement(MFormItem $item)
                     }
                     // $html = utf8_encode($divItem->C14N(false,true));
                     $html = $divItem->C14N(false, true);
+                    if (strpos($html, '<body') !== false) {
+                        preg_match("/<body>(.*)<\/body>/ism", $html, $matches);
+                        if (isset($matches[1])) {
+                            $html = $matches[1];
+                        }
+                    }
                     break;
                 }
             }
@@ -842,6 +860,12 @@ private function generateLinkElement(MFormItem $item)
                     }
                 }
                 $html = $dom->C14N(false, true);
+                if (strpos($html, '<body') !== false) {
+                    preg_match("/<body>(.*)<\/body>/ism", $html, $matches);
+                    if (isset($matches[1])) {
+                        $html = $matches[1];
+                    }
+                }
 
                 break;
             case 'linklist':
@@ -863,6 +887,12 @@ private function generateLinkElement(MFormItem $item)
                     }
                 }
                 $html = $dom->C14N(false, true);
+                if (strpos($html, '<body') !== false) {
+                    preg_match("/<body>(.*)<\/body>/ism", $html, $matches);
+                    if (isset($matches[1])) {
+                        $html = $matches[1];
+                    }
+                }
 
                 break;
         }

Original file line number	Diff line number	Diff line change
`@@ -660,6 +660,12 @@ private function generateMediaElement(MFormItem $item)`
`660`	`660`	`}`
`661`	`661`	`}`
`662`	`662`	`$html = $dom->C14N(false, true);`
	`663`	`+ if (strpos($html, '<body') !== false) {`
	`664`	`+ preg_match("/<body>(.*)<\/body>/ism", $html, $matches);`
	`665`	`+ if (isset($matches[1])) {`
	`666`	`+ $html = $matches[1];`
	`667`	`+ }`
	`668`	`+ }`
`663`	`669`
`664`	`670`	`break;`
`665`	`671`	`case 'medialist':`
`@@ -681,6 +687,12 @@ private function generateMediaElement(MFormItem $item)`
`681`	`687`	`}`
`682`	`688`	`}`
`683`	`689`	`$html = $dom->C14N(false, true);`
	`690`	`+ if (strpos($html, '<body') !== false) {`
	`691`	`+ preg_match("/<body>(.*)<\/body>/ism", $html, $matches);`
	`692`	`+ if (isset($matches[1])) {`
	`693`	`+ $html = $matches[1];`
	`694`	`+ }`
	`695`	`+ }`
`684`	`696`
`685`	`697`	`break;`
`686`	`698`	`}`
`@@ -781,9 +793,9 @@ private function generateCustomLinkElement(MFormItem $item)`
`781`	`793`	`}`
`782`	`794`	`}`
`783`	`795`	`if (($childNode->hasAttribute('class')`
`784`		`- && $childNode->getAttribute('class') == 'form-control')`
	`796`	`+ && $childNode->getAttribute('class') == 'form-control')`
`785`	`797`	`&& ($childNode->hasAttribute('value')`
`786`		`- && $childNode->getAttribute('value') == '')) {`
	`798`	`+ && $childNode->getAttribute('value') == '')) {`
`787`	`799`	`$childNode->setAttribute('value', $item->getValue());`
`788`	`800`	`if (is_array($item->getAttributes()) && sizeof($item->getAttributes()) > 0) {`
`789`	`801`	`foreach ($item->getAttributes() as $key => $value) {`
`@@ -794,6 +806,12 @@ private function generateCustomLinkElement(MFormItem $item)`
`794`	`806`	`}`
`795`	`807`	`// $html = utf8_encode($divItem->C14N(false,true));`
`796`	`808`	`$html = $divItem->C14N(false, true);`
	`809`	`+ if (strpos($html, '<body') !== false) {`
	`810`	`+ preg_match("/<body>(.*)<\/body>/ism", $html, $matches);`
	`811`	`+ if (isset($matches[1])) {`
	`812`	`+ $html = $matches[1];`
	`813`	`+ }`
	`814`	`+ }`
`797`	`815`	`break;`
`798`	`816`	`}`
`799`	`817`	`}`
`@@ -842,6 +860,12 @@ private function generateLinkElement(MFormItem $item)`
`842`	`860`	`}`
`843`	`861`	`}`
`844`	`862`	`$html = $dom->C14N(false, true);`
	`863`	`+ if (strpos($html, '<body') !== false) {`
	`864`	`+ preg_match("/<body>(.*)<\/body>/ism", $html, $matches);`
	`865`	`+ if (isset($matches[1])) {`
	`866`	`+ $html = $matches[1];`
	`867`	`+ }`
	`868`	`+ }`
`845`	`869`
`846`	`870`	`break;`
`847`	`871`	`case 'linklist':`
`@@ -863,6 +887,12 @@ private function generateLinkElement(MFormItem $item)`
`863`	`887`	`}`
`864`	`888`	`}`
`865`	`889`	`$html = $dom->C14N(false, true);`
	`890`	`+ if (strpos($html, '<body') !== false) {`
	`891`	`+ preg_match("/<body>(.*)<\/body>/ism", $html, $matches);`
	`892`	`+ if (isset($matches[1])) {`
	`893`	`+ $html = $matches[1];`
	`894`	`+ }`
	`895`	`+ }`
`866`	`896`
`867`	`897`	`break;`
`868`	`898`	`}`