X-Git-Url: https://git-public.kairo.at/?a=blobdiff_plain;ds=sidebyside;f=classes%2Fdocument.php-class;h=a0800f2889c4643a36164cedd901820fdc823978;hb=5dd242eff6de2d320c75ec83e5f988cd7c769cea;hp=1933808002202d86d315fc2a553eedfb3d60122a;hpb=acaa2daa10fcee2745749592fa84e8a33aedd027;p=php-utility-classes.git diff --git a/classes/document.php-class b/classes/document.php-class index 1933808..a0800f2 100755 --- a/classes/document.php-class +++ b/classes/document.php-class @@ -16,6 +16,10 @@ class ExtendedDocument extends DOMDocument { // If a $doc is handed over (an ExtendedDocument or a derived class), load the content into that document. // returns an associative array with the following elements: 'html', 'head', 'title', 'body' // + // public function loadHTML5($source) { + // A version of loadHTML() - see DOMDocument documentation - that is made for loading HTML5 and not emitting warnings/errors for unknown elements. + // returns true on success, false otherwise, just like loadHTML5. + // // public function appendElement($name, [$value]) // appends a DOMDocument::createElement() as a child of this document (see there for params) // returns the new child @@ -266,7 +270,7 @@ class ExtendedDocument extends DOMDocument { static function initHTML5($doc = null) { if (is_null($doc)) { $doc = new ExtendedDocument(); } - $doc->loadHTML(''); // this seems to be the only way to get the DOCTYPE set properly. + $doc->loadHTML5(''); // this seems to be the only way to get the DOCTYPE set properly. // Created basic HTML document structure. $root = $doc->getElementsByTagName('html')->item(0); @@ -281,6 +285,28 @@ class ExtendedDocument extends DOMDocument { 'body' => $body); } + public function loadHTML5($source) { + // Do our own handling of DOMDocument error reporting so we can ignore "unknown tags" which are usually fine in HTML5. + libxml_use_internal_errors(true); + if (!preg_match('/^\s*'."\n".$source; + } + $result = $this->loadHTML($source); + // Handle DOMDocument loading errors, throw away warnings on unknown tags as HTML5 allows all kinds. + $errseverity = array(LIBXML_ERR_WARNING => 'Warning', LIBXML_ERR_ERROR => 'Error', LIBXML_ERR_FATAL => 'Fatal'); + foreach (libxml_get_errors() as $error) { + // $error is a libXMLError, see https://www.php.net/manual/en/class.libxmlerror.php + // See http://www.xmlsoft.org/html/libxml-xmlerror.html#xmlParserErrors for error numbers + if ($error->code != 801) { // XML_HTML_UNKNOWN_TAG gets no output, should not exist for HTML5. + trigger_error($errseverity[$error->level].' loading HTML5: '.$error->message.' (code '.$error->code.'), line: '.$error->line, E_USER_WARNING); + } + } + libxml_clear_errors(); + libxml_use_internal_errors(false); + return $result; + } + public function appendElement($name, $value = '') { return $this->appendChild($this->createElement($name, $value)); } @@ -390,10 +416,10 @@ class ExtendedDocument extends DOMDocument { public function appendHTMLMarkup($htmldata, $parentNode = null) { if (is_null($parentNode)) { $parentNode =& $this; } - // Use loadHTML() to parse and turn the markup into proper HTML. + // Use loadHTML5() to parse and turn the markup into proper HTML. $tmpdoc = new ExtendedDocument; // The XML line is needed to tell the parser that we need UTF-8 parsing. - $tmpdoc->loadHTML(''.$htmldata.''); + $tmpdoc->loadHTML5(''.$htmldata.''); foreach ($tmpdoc->getElementsByTagName('body')->item(0)->childNodes as $child) { $parentNode->appendChild($this->importNode($child, true)); } @@ -528,23 +554,25 @@ class ExtendedDocument extends DOMDocument { } public function createElementInputDate($name, $id = null, $min = null, $max = null, $value = null) { - $telfield = $this->createElement('input'); - $telfield->setAttribute('type', 'date'); - if (!is_null($id)) { $telfield->setAttribute('id', $id); } - if (!is_null($min)) { $rgfield->setAttribute('min', $min); } - if (!is_null($max)) { $rgfield->setAttribute('max', $max); } - if (!is_null($value)) { $telfield->setAttribute('value', $value); } - return $telfield; + $dtfield = $this->createElement('input'); + $dtfield->setAttribute('type', 'date'); + if (!is_null($id)) { $dtfield->setAttribute('id', $id); } + $dtfield->setAttribute('name', $name); + if (!is_null($min)) { $dtfield->setAttribute('min', $min); } + if (!is_null($max)) { $dtfield->setAttribute('max', $max); } + if (!is_null($value)) { $dtfield->setAttribute('value', $value); } + return $dtfield; } public function createElementInputTime($name, $id = null, $min = null, $max = null, $value = null) { - $telfield = $this->createElement('input'); - $telfield->setAttribute('type', 'time'); - if (!is_null($id)) { $telfield->setAttribute('id', $id); } - if (!is_null($min)) { $rgfield->setAttribute('min', $min); } - if (!is_null($max)) { $rgfield->setAttribute('max', $max); } - if (!is_null($value)) { $telfield->setAttribute('value', $value); } - return $telfield; + $timefield = $this->createElement('input'); + $timefield->setAttribute('type', 'time'); + if (!is_null($id)) { $timefield->setAttribute('id', $id); } + $timefield->setAttribute('name', $name); + if (!is_null($min)) { $timefield->setAttribute('min', $min); } + if (!is_null($max)) { $timefield->setAttribute('max', $max); } + if (!is_null($value)) { $timefield->setAttribute('value', $value); } + return $timefield; } public function createElementInputColor($name, $id = null, $value = null) {