X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fcbsm%2Futil%2Fdocument.php-class;h=c267623a5f26831a85b21a281399d066cb576c42;hp=c64d9a4a81c3f6e501036f9136beeca86bc4e962;hb=4bb9d784670b699918e82a2cf21d36835c6db9ee;hpb=262e0bbb3441a51237f0330fa5ed7e53e70baf0e
diff --git a/include/cbsm/util/document.php-class b/include/cbsm/util/document.php-class
index c64d9a4..c267623 100755
--- a/include/cbsm/util/document.php-class
+++ b/include/cbsm/util/document.php-class
@@ -82,6 +82,10 @@ class ExtendedDocument extends DOMDocument {
// appends an ExtendedDocument::createElementInputCheckbox() as a child of this document (see there for params)
// returns the new child
//
+ // function appendInputFile($name, $id, $accept)
+ // appends an ExtendedDocument::createElementInputFile() as a child of this document (see there for params)
+ // returns the new child
+ //
// function appendInputSubmit($value)
// appends an ExtendedDocument::createElementInputSubmit() as a child of this document (see there for params)
// returns the new child
@@ -163,6 +167,9 @@ class ExtendedDocument extends DOMDocument {
// returns an ExtendedElement that is an HTML of type 'checkbox' with the given name, id, value and
// checked state
//
+ // function createElementInputFile($name, $id, $accept)
+ // returns an ExtendedElement that is an HTML of type 'file' with the given name, id and accept
+ //
// function createElementInputSubmit($value)
// returns an ExtendedElement that is an HTML of type 'submit' with the given value as label
//
@@ -199,10 +206,7 @@ class ExtendedDocument extends DOMDocument {
}
function appendElement($name, $value = '') {
- // Adding the $value in createElement does NOT escape it, so use appendText to support that.
- $aelem = $this->appendChild($this->createElement($name));
- $aelem->appendText($value);
- return $aelem;
+ return $this->appendChild($this->createElement($name, $value));
}
function appendElementXML($name, $xmldata) {
$aelem = $this->appendChild($this->createElement($name));
@@ -241,6 +245,9 @@ class ExtendedDocument extends DOMDocument {
function appendInputCheckbox($name, $id, $value, $checked) {
return $this->appendChild($this->createElementInputCheckbox($name, $id, $value, $checked));
}
+ function appendInputFile($name, $id, $accept) {
+ return $this->appendChild($this->createElementInputFile($name, $id, $accept));
+ }
function appendInputSubmit($value) {
return $this->appendChild($this->createElementInputSubmit($value));
}
@@ -290,9 +297,15 @@ class ExtendedDocument extends DOMDocument {
}
}
+ function createElement($name, $value = '') {
+ // Adding the $value in DOMDocument's createElement does NOT escape it, so override it and use appendText to support that.
+ $aelem = parent::createElement($name);
+ $aelem->appendText($value);
+ return $aelem;
+ }
+
function createElementLink($target, $value = '') {
- $link = $this->createElement('a');
- $link->appendText($value);
+ $link = $this->createElement('a', $value);
$link->setAttribute('href', $target); // XXX: take care of & etc. in links
return $link;
}
@@ -358,7 +371,7 @@ class ExtendedDocument extends DOMDocument {
$radio = $this->createElement('input');
$radio->setAttribute('type', 'radio');
$radio->setAttribute('name', $name);
- $radio->setAttribute('id', $id);
+ if (!is_null($id)) { $radio->setAttribute('id', $id); }
$radio->setAttribute('value', $value);
if ($checked) { $radio->setAttribute('checked', ''); }
return $radio;
@@ -368,12 +381,21 @@ class ExtendedDocument extends DOMDocument {
$cbox = $this->createElement('input');
$cbox->setAttribute('type', 'checkbox');
$cbox->setAttribute('name', $name);
- $cbox->setAttribute('id', $id);
+ if (!is_null($id)) { $cbox->setAttribute('id', $id); }
$cbox->setAttribute('value', $value);
if ($checked) { $cbox->setAttribute('checked', ''); }
return $cbox;
}
+ function createElementInputFile($name, $id, $accept) {
+ $fileinput = $this->createElement('input');
+ $fileinput->setAttribute('type', 'file');
+ $fileinput->setAttribute('name', $name);
+ if (!is_null($id)) { $fileinput->setAttribute('id', $id); }
+ $fileinput->setAttribute('accept', $accept);
+ return $fileinput;
+ }
+
function createElementInputSubmit($value) {
$submitbtn = $this->createElement('input');
$submitbtn->setAttribute('type', 'submit');
@@ -492,6 +514,10 @@ class ExtendedElement extends DOMElement {
// appends an ExtendedDocument::createElementInputCheckbox() as a child of this element (see there for params)
// returns the new child
//
+ // function appendInputFile($name, $id, $accept)
+ // appends an ExtendedDocument::createElementInputFile() as a child of this element (see there for params)
+ // returns the new child
+ //
// function appendInputSubmit($value)
// appends an ExtendedDocument::createElementInputSubmit() as a child of this element (see there for params)
// returns the new child
@@ -541,10 +567,7 @@ class ExtendedElement extends DOMElement {
// returns the new child
function appendElement($name, $value = '') {
- // Adding the $value in createElement does NOT escape it, so use appendText to support that.
- $aelem = $this->appendChild($this->ownerDocument->createElement($name));
- $aelem->appendText($value);
- return $aelem;
+ return $this->appendChild($this->ownerDocument->createElement($name, $value));
}
function appendElementXML($name, $xmldata) {
$aelem = $this->appendChild($this->ownerDocument->createElement($name));
@@ -582,6 +605,9 @@ class ExtendedElement extends DOMElement {
function appendInputCheckbox($name, $id, $value, $checked) {
return $this->appendChild($this->ownerDocument->createElementInputCheckbox($name, $id, $value, $checked));
}
+ function appendInputFile($name, $id, $accept) {
+ return $this->appendChild($this->ownerDocument->createElementInputFile($name, $id, $accept));
+ }
function appendInputSubmit($value) {
return $this->appendChild($this->ownerDocument->createElementInputSubmit($value));
}
@@ -673,6 +699,10 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
// appends an ExtendedDocument::createElementInputCheckbox() as a child of this fragment (see there for params)
// returns the new child
//
+ // function appendInputFile($name, $id, $accept)
+ // appends an ExtendedDocument::createElementInputFile() as a child of this fragment (see there for params)
+ // returns the new child
+ //
// function appendInputSubmit($value)
// appends an ExtendedDocument::createElementInputSubmit() as a child of this fragment (see there for params)
// returns the new child
@@ -722,10 +752,7 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
// returns the new child
function appendElement($name, $value = '') {
- // Adding the $value in createElement does NOT escape it, so use appendText to support that.
- $aelem = $this->appendChild($this->ownerDocument->createElement($name));
- $aelem->appendText($value);
- return $aelem;
+ return $this->appendChild($this->ownerDocument->createElement($name, $value));
}
function appendElementXML($name, $xmldata) {
$aelem = $this->appendChild($this->ownerDocument->createElement($name));
@@ -763,6 +790,9 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
function appendInputCheckbox($name, $id, $value, $checked) {
return $this->appendChild($this->ownerDocument->createElementInputCheckbox($name, $id, $value, $checked));
}
+ function appendInputFile($name, $id, $accept) {
+ return $this->appendChild($this->ownerDocument->createElementInputFile($name, $id, $accept));
+ }
function appendInputSubmit($value) {
return $this->appendChild($this->ownerDocument->createElementInputSubmit($value));
}