X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fcbsm%2Futil%2Fdocument.php-class;h=1563e9fa13d1c08996f87057da9992e7570f175b;hp=a10041a9dc6c2b2e9cfaeb02b5816978e694f680;hb=b8d168371c98b48193b8c61f8521618038feac1e;hpb=645a7eb6de6a6b0ecdac1a9edb56fe18ce950829
diff --git a/include/cbsm/util/document.php-class b/include/cbsm/util/document.php-class
index a10041a..1563e9f 100755
--- a/include/cbsm/util/document.php-class
+++ b/include/cbsm/util/document.php-class
@@ -50,7 +50,11 @@ class ExtendedDocument extends DOMDocument {
// appends an ExtendedDocument::createElementImage() as a child of this document (see there for params)
// returns the new child
//
- // function appendFormDiv($action, $method, $name)
+ // function appendForm($action, $method, $name, [$id])
+ // appends an ExtendedDocument::createElementForm() as a child of this document (see there for params)
+ // returns the new child
+ //
+ // function appendFormDiv($action, $method, $name, [$id])
// appends an ExtendedDocument::createElementForm() as a child of this document (see there for params)
// returns an HTML
that is a child of the new child
//
@@ -187,7 +191,10 @@ class ExtendedDocument extends DOMDocument {
}
function appendElement($name, $value = '') {
- return $this->appendChild($this->createElement($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;
}
function appendElementXML($name, $xmldata) {
$aelem = $this->appendChild($this->createElement($name));
@@ -201,8 +208,11 @@ class ExtendedDocument extends DOMDocument {
function appendImage($src, $alt_text = '') {
return $this->appendChild($this->createElementImage($src, $alt_text));
}
- function appendFormDiv($action, $method, $name) {
- $formelem = $this->appendChild($this->createElementForm($action, $method, $name));
+ function appendForm($action, $method, $name, $id = null) {
+ return $this->appendChild($this->createElementForm($action, $method, $name, $id));
+ }
+ function appendFormDiv($action, $method, $name, $id = null) {
+ $formelem = $this->appendChild($this->createElementForm($action, $method, $name, $id));
return $formelem->appendElement('div');
}
function appendInputHidden($name, $value) {
@@ -270,23 +280,25 @@ class ExtendedDocument extends DOMDocument {
}
function createElementLink($target, $value = '') {
- $link = $this->createElement('a', $value);
+ $link = $this->createElement('a');
+ $link->appendText($value);
$link->setAttribute('href', $target); // XXX: take care of & etc. in links
return $link;
}
function createElementImage($src, $alt_text = '') {
- $link = $this->createElement('img');
- $link->setAttribute('src', $src);
- $link->setAttribute('alt', $alt_text);
- return $link;
+ $img = $this->createElement('img');
+ $img->setAttribute('src', $src);
+ $img->setAttribute('alt', $alt_text);
+ return $img;
}
- function createElementForm($action, $method, $name) {
+ function createElementForm($action, $method, $name, $id = null) {
$formelem = $this->createElement('form');
$formelem->setAttribute('action', $action);
$formelem->setAttribute('method', $method);
$formelem->setAttribute('name', $name);
+ $formelem->setAttribute('id', $id);
return $formelem;
}
@@ -310,14 +322,14 @@ class ExtendedDocument extends DOMDocument {
}
function createElementInputPassword($name, $maxlength, $size, $id = null, $value = null) {
- $txfield = $this->createElement('input');
- $txfield->setAttribute('type', 'password');
- if (!is_null($id)) { $txfield->setAttribute('id', $id); }
- $txfield->setAttribute('name', $name);
- $txfield->setAttribute('maxlength', $maxlength);
- $txfield->setAttribute('size', $size);
- if (!is_null($value)) { $txfield->setAttribute('value', $value); }
- return $txfield;
+ $pwfield = $this->createElement('input');
+ $pwfield->setAttribute('type', 'password');
+ if (!is_null($id)) { $pwfield->setAttribute('id', $id); }
+ $pwfield->setAttribute('name', $name);
+ $pwfield->setAttribute('maxlength', $maxlength);
+ $pwfield->setAttribute('size', $size);
+ if (!is_null($value)) { $pwfield->setAttribute('value', $value); }
+ return $pwfield;
}
function createElementInputRadio($name, $id, $value, $checked) {
@@ -426,7 +438,11 @@ class ExtendedElement extends DOMElement {
// appends an ExtendedDocument::createElementImage() as a child of this document (see there for params)
// returns the new child
//
- // function appendFormDiv($action, $method, $name)
+ // function appendForm($action, $method, $name, [$id])
+ // appends an ExtendedDocument::createElementForm() as a child of this element (see there for params)
+ // returns the new child
+ //
+ // function appendFormDiv($action, $method, $name, [$id])
// appends an ExtendedDocument::createElementForm() as a child of this element (see there for params)
// returns an HTML
that is a child of the new child
//
@@ -499,7 +515,10 @@ class ExtendedElement extends DOMElement {
// returns the new child
function appendElement($name, $value = '') {
- return $this->appendChild($this->ownerDocument->createElement($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;
}
function appendElementXML($name, $xmldata) {
$aelem = $this->appendChild($this->ownerDocument->createElement($name));
@@ -512,8 +531,11 @@ class ExtendedElement extends DOMElement {
function appendImage($src, $alt_text = '') {
return $this->appendChild($this->ownerDocument->createElementImage($src, $alt_text));
}
- function appendFormDiv($action, $method, $name) {
- $formelem = $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name));
+ function appendForm($action, $method, $name, $id = null) {
+ return $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name, $id));
+ }
+ function appendFormDiv($action, $method, $name, $id = null) {
+ $formelem = $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name, $id));
return $formelem->appendElement('div');
}
function appendInputHidden($name, $value) {
@@ -590,7 +612,11 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
// appends an ExtendedDocument::createElementImage() as a child of this document (see there for params)
// returns the new child
//
- // function appendFormDiv($action, $method, $name)
+ // function appendForm($action, $method, $name, [$id])
+ // appends an ExtendedDocument::createElementForm() as a child of this fragment (see there for params)
+ // returns the new child
+ //
+ // function appendFormDiv($action, $method, $name, [$id])
// appends an ExtendedDocument::createElementForm() as a child of this fragment (see there for params)
// returns an HTML
that is a child of the new child
//
@@ -663,7 +689,10 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
// returns the new child
function appendElement($name, $value = '') {
- return $this->appendChild($this->ownerDocument->createElement($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;
}
function appendElementXML($name, $xmldata) {
$aelem = $this->appendChild($this->ownerDocument->createElement($name));
@@ -676,8 +705,11 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
function appendImage($src, $alt_text = '') {
return $this->appendChild($this->ownerDocument->createElementImage($src, $alt_text));
}
- function appendFormDiv($action, $method, $name) {
- $formelem = $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name));
+ function appendForm($action, $method, $name, $id = null) {
+ return $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name, $id));
+ }
+ function appendFormDiv($action, $method, $name, $id = null) {
+ $formelem = $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name, $id));
return $formelem->appendElement('div');
}
function appendInputHidden($name, $value) {