that is a child of an HTML // with the given action, method, and name // - // function createElementInputHidden($name, $value) + // public function createElementInputHidden($name, $value) // returns an ExtendedElement that is an HTML of type 'hidden' with the given name and value // - // function createElementInputText($name, $maxlength, $size, [$id], [$value]) + // public function createElementInputText($name, $maxlength, $size, [$id], [$value]) // returns an ExtendedElement that is an HTML of type 'text' with the given name, maxlength, size, // and optionally id and value // - // function createElementInputNumber($name, $maxlength, $size, [$id], [$value]) + // public function createElementInputNumber($name, $maxlength, $size, [$id], [$value]) // returns an ExtendedElement that is an HTML of type 'number' with the given name, maxlength, size, // and optionally id and value // - // function createElementInputPassword($name, $maxlength, $size, [$id], [$value]) + // public function createElementInputPassword($name, $maxlength, $size, [$id], [$value]) // returns an ExtendedElement that is an HTML of type 'password' with the given name, maxlength, size, // and optionally id and value // - // function createElementInputRadio($name, $id, $value, $checked) + // public function createElementInputRadio($name, $id, $value, $checked) // returns an ExtendedElement that is an HTML of type 'radio' with the given name, id, value and // checked state // - // function createElementInputCheckbox($name, $id, $value, $checked) + // public function createElementInputCheckbox($name, $id, $value, $checked) // returns an ExtendedElement that is an HTML of type 'checkbox' with the given name, id, value and // checked state // - // function createElementInputFile($name, $id, $accept) + // public 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) + // public function createElementInputSubmit($value) // returns an ExtendedElement that is an HTML of type 'submit' with the given value as label // - // function createElementButton($value, $onclick = null) + // public function createElementButton($value, $onclick = null) // returns an ExtendedElement that is an HTML button with the given value as label and optionally onclick attribute // - // function createElementTextArea($name, $columns, $rows, [$id], [$value]) + // public function createElementTextArea($name, $columns, $rows, [$id], [$value]) // returns an ExtendedElement that is an HTML

with the given name, columns, rows,
   //   and optionally id and value
   //
-  // function createElementSelect($name, [$id], [$options], [$default])
+  // public function createElementSelect($name, [$id], [$options], [$default])
   //   returns an ExtendedElement that is an HTML <select> with the given name, and optionally id,
   //   array of options (key => description) and key of the by-default selected entry
   //
-  // function createElementOption($key, $desc, [$selected])
+  // public function createElementOption($key, $desc, [$selected])
   //   returns an ExtendedElement that is an HTML <option> with the given key (value) and description (content)
   //   and optionally bool that tells if the entry is selected
   //
-  // function createElementLabel($for_id, $value)
+  // public function createElementLabel($for_id, $value)
   //   returns an ExtendedElement that is an HTML <label> with the given 'for' and value
   //
-  // function createElementJS($jsdata)
+  // public function createElementJS($jsdata)
   //   returns an ExtendedElement that is an HTML <script> of JavaScript type with the JS data inside
   //
-  // function createCOMElement($module, $attributes)
+  // public function createCOMElement($module, $attributes)
   //   returns an ExtendedElement that is in COM_NS namespace, with the given module as name and the
   //     given name=>value array as attributes
 
@@ -220,87 +220,87 @@ class ExtendedDocument extends DOMDocument {
                  'body' => $body);
   }
 
-  function appendElement($name, $value = '') {
+  public function appendElement($name, $value = '') {
     return $this->appendChild($this->createElement($name, $value));
   }
-  function appendElementXML($name, $xmldata) {
+  public function appendElementXML($name, $xmldata) {
     $aelem = $this->appendChild($this->createElement($name));
     $aelem->appendXMLMarkup($xmldata);
     //$aelem->appendChild($this->createXMLFragment($xmldata));
     return $aelem;
   }
-  function appendLink($target, $value = '') {
+  public function appendLink($target, $value = '') {
     return $this->appendChild($this->createElementLink($target, $value));
   }
-  function appendImage($src, $alt_text = '') {
+  public function appendImage($src, $alt_text = '') {
     return $this->appendChild($this->createElementImage($src, $alt_text));
   }
-  function appendForm($action, $method, $name, $id = null) {
+  public function appendForm($action, $method, $name, $id = null) {
     return $this->appendChild($this->createElementForm($action, $method, $name, $id));
   }
-  function appendFormDiv($action, $method, $name, $id = null) {
+  public function appendFormDiv($action, $method, $name, $id = null) {
     $formelem = $this->appendChild($this->createElementForm($action, $method, $name, $id));
     return $formelem->appendElement('div');
   }
-  function appendInputHidden($name, $value) {
+  public function appendInputHidden($name, $value) {
     return $this->appendChild($this->createElementInputHidden($name, $value));
   }
-  function appendInputText($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputText($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->createElementInputText($name, $maxlength, $size, $id, $value));
   }
-  function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->createElementInputNumber($name, $maxlength, $size, $id, $value));
   }
-  function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->createElementInputPassword($name, $maxlength, $size, $id, $value));
   }
-  function appendInputRadio($name, $id, $value, $checked) {
+  public function appendInputRadio($name, $id, $value, $checked) {
     return $this->appendChild($this->createElementInputRadio($name, $id, $value, $checked));
   }
-  function appendInputCheckbox($name, $id, $value, $checked) {
+  public function appendInputCheckbox($name, $id, $value, $checked) {
     return $this->appendChild($this->createElementInputCheckbox($name, $id, $value, $checked));
   }
-  function appendInputFile($name, $id, $accept) {
+  public function appendInputFile($name, $id, $accept) {
     return $this->appendChild($this->createElementInputFile($name, $id, $accept));
   }
-  function appendInputSubmit($value) {
+  public function appendInputSubmit($value) {
     return $this->appendChild($this->createElementInputSubmit($value));
   }
-  function appendButton($value, $onclick = null) {
+  public function appendButton($value, $onclick = null) {
     return $this->appendChild($this->createElementButton($value, $onclick));
   }
-  function appendTextArea($name, $columns, $rows, $id = null, $value = null) {
+  public function appendTextArea($name, $columns, $rows, $id = null, $value = null) {
     return $this->appendChild($this->createElementTextArea($name, $columns, $rows, $id, $value));
   }
-  function appendElementSelect($name, $id = null, $options = array(), $default = null) {
+  public function appendElementSelect($name, $id = null, $options = array(), $default = null) {
     return $this->appendChild($this->createElementSelect($name, $id, $options, $default));
   }
-  function appendElementOption($key, $desc, $selected = false) {
+  public function appendElementOption($key, $desc, $selected = false) {
     return $this->appendChild($this->createElementOption($key, $desc, $selected));
   }
-  function appendLabel($for_id, $value) {
+  public function appendLabel($for_id, $value) {
     return $this->appendChild($this->createElementLabel($for_id, $value));
   }
-  function appendText($text) {
+  public function appendText($text) {
     return $this->appendChild($this->createTextNode($text));
   }
-  function appendComment($comment_data) {
+  public function appendComment($comment_data) {
     return $this->appendChild($this->createComment($comment_data));
   }
-  function appendJSElement($jsdata) {
+  public function appendJSElement($jsdata) {
     $this->appendChild($this->createElementJS($jsdata));
   }
-  function appendCOMElement($module, $attributes) {
+  public function appendCOMElement($module, $attributes) {
     $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
   }
 
-  function appendHTMLMarkup($htmldata, $parentNode = null) {
+  public function appendHTMLMarkup($htmldata, $parentNode = null) {
     if (is_null($parentNode)) { $parentNode =& $this; }
     // XXX: just a workaround for now!
     $parentNode->appendChild($this->createCDATASection($htmldata));
   }
 
-  function appendXMLMarkup($xmldata, $parentNode = null) {
+  public function appendXMLMarkup($xmldata, $parentNode = null) {
     if (is_null($parentNode)) { $parentNode =& $this; }
     $tmpdoc = new ExtendedDocument;
     $tmpxml = '<?xml version="1.0" encoding="utf-8"?>'."\n";
@@ -312,27 +312,27 @@ class ExtendedDocument extends DOMDocument {
     }
   }
 
-  function createElement($name, $value = '') {
+  public 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 = '') {
+  public function createElementLink($target, $value = '') {
     $link = $this->createElement('a', $value);
     $link->setAttribute('href', $target); // XXX: take care of & etc. in links
     return $link;
   }
 
-  function createElementImage($src, $alt_text = '') {
+  public function createElementImage($src, $alt_text = '') {
     $img = $this->createElement('img');
     $img->setAttribute('src', $src);
     $img->setAttribute('alt', $alt_text);
     return $img;
   }
 
-  function createElementForm($action, $method, $name, $id = null) {
+  public function createElementForm($action, $method, $name, $id = null) {
     $formelem = $this->createElement('form');
     $formelem->setAttribute('action', $action);
     $formelem->setAttribute('method', $method);
@@ -341,7 +341,7 @@ class ExtendedDocument extends DOMDocument {
     return $formelem;
   }
 
-  function createElementInputHidden($name, $value) {
+  public function createElementInputHidden($name, $value) {
     $hidden = $this->createElement('input');
     $hidden->setAttribute('type', 'hidden');
     $hidden->setAttribute('name', $name);
@@ -349,7 +349,7 @@ class ExtendedDocument extends DOMDocument {
     return $hidden;
   }
 
-  function createElementInputText($name, $maxlength, $size, $id = null, $value = null) {
+  public function createElementInputText($name, $maxlength, $size, $id = null, $value = null) {
     $txfield = $this->createElement('input');
     $txfield->setAttribute('type', 'text');
     if (!is_null($id)) { $txfield->setAttribute('id', $id); }
@@ -360,7 +360,7 @@ class ExtendedDocument extends DOMDocument {
     return $txfield;
   }
 
-  function createElementInputNumber($name, $maxlength, $size, $id = null, $value = null) {
+  public function createElementInputNumber($name, $maxlength, $size, $id = null, $value = null) {
     $txfield = $this->createElement('input');
     $txfield->setAttribute('type', 'number');
     if (!is_null($id)) { $txfield->setAttribute('id', $id); }
@@ -371,7 +371,7 @@ class ExtendedDocument extends DOMDocument {
     return $txfield;
   }
 
-  function createElementInputPassword($name, $maxlength, $size, $id = null, $value = null) {
+  public function createElementInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     $pwfield = $this->createElement('input');
     $pwfield->setAttribute('type', 'password');
     if (!is_null($id)) { $pwfield->setAttribute('id', $id); }
@@ -382,7 +382,7 @@ class ExtendedDocument extends DOMDocument {
     return $pwfield;
   }
 
-  function createElementInputRadio($name, $id, $value, $checked) {
+  public function createElementInputRadio($name, $id, $value, $checked) {
     $radio = $this->createElement('input');
     $radio->setAttribute('type', 'radio');
     $radio->setAttribute('name', $name);
@@ -392,7 +392,7 @@ class ExtendedDocument extends DOMDocument {
     return $radio;
   }
 
-  function createElementInputCheckbox($name, $id, $value, $checked) {
+  public function createElementInputCheckbox($name, $id, $value, $checked) {
     $cbox = $this->createElement('input');
     $cbox->setAttribute('type', 'checkbox');
     $cbox->setAttribute('name', $name);
@@ -402,7 +402,7 @@ class ExtendedDocument extends DOMDocument {
     return $cbox;
   }
 
-  function createElementInputFile($name, $id, $accept) {
+  public function createElementInputFile($name, $id, $accept) {
     $fileinput = $this->createElement('input');
     $fileinput->setAttribute('type', 'file');
     $fileinput->setAttribute('name', $name);
@@ -411,14 +411,14 @@ class ExtendedDocument extends DOMDocument {
     return $fileinput;
   }
 
-  function createElementInputSubmit($value) {
+  public function createElementInputSubmit($value) {
     $submitbtn = $this->createElement('input');
     $submitbtn->setAttribute('type', 'submit');
     $submitbtn->setAttribute('value', $value);
     return $submitbtn;
   }
 
-  function createElementButton($value, $onclick = null) {
+  public function createElementButton($value, $onclick = null) {
     $btn = $this->createElement('input');
     $btn->setAttribute('type', 'button');
     $btn->setAttribute('value', $value);
@@ -426,7 +426,7 @@ class ExtendedDocument extends DOMDocument {
     return $btn;
   }
 
-  function createElementTextArea($name, $columns, $rows, $id = null, $value = null) {
+  public function createElementTextArea($name, $columns, $rows, $id = null, $value = null) {
     $txtarea = $this->createElement('textarea', $value);
     $txtarea->setAttribute('name', $name);
     $txtarea->setAttribute('cols', $columns);
@@ -435,7 +435,7 @@ class ExtendedDocument extends DOMDocument {
     return $txtarea;
   }
 
-  function createElementSelect($name, $id = null, $options = array(), $default = null) {
+  public function createElementSelect($name, $id = null, $options = array(), $default = null) {
     $select = $this->createElement('select');
     $select->setAttribute('name', $name);
     if (!is_null($id)) { $select->setAttribute('id', $id); }
@@ -445,27 +445,27 @@ class ExtendedDocument extends DOMDocument {
     return $select;
   }
 
-  function createElementOption($key, $desc, $selected = false) {
+  public function createElementOption($key, $desc, $selected = false) {
     $option = $this->createElement('option', $desc);
     $option->setAttribute('value', $key);
     if ($selected) { $option->setAttribute('selected', ''); }
     return $option;
   }
 
-  function createElementLabel($for_id, $value) {
+  public function createElementLabel($for_id, $value) {
     $label = $this->createElement('label', $value);
     $label->setAttribute('for', $for_id);
     return $label;
   }
 
-  function createElementJS($jsdata) {
+  public function createElementJS($jsdata) {
     $jselem = $this->createElement('script');
     $jselem->setAttribute('type', 'text/javascript');
     $jselem->appendChild($this->createCDATASection($jsdata));
     return $jselem;
   }
 
-  function createCOMElement($module, $attributes) {
+  public function createCOMElement($module, $attributes) {
     $com_elem = $this->createElementNS(COM_NS, $module);
     if (is_array($attributes) && count($attributes)) {
       foreach ($attributes as $name=>$value) {
@@ -480,183 +480,183 @@ class ExtendedElement extends DOMElement {
   // ExtendedElement PHP class
   // this extends the general PHP DOM Element class to simplify some usual constructs
   //
-  // function appendElement($name, [$value])
+  // public function appendElement($name, [$value])
   //   appends a DOMDocument::createElement() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendElementXML($name, $xmldata)
+  // public function appendElementXML($name, $xmldata)
   //   appends a DOMDocument::createElement() with the given name as a child of this element,
   //   with an ExtendedDocument::createXMLFragment() of the given XML data inside
   //     returns the new child
   //
-  // function appendLink($target, [$value])
+  // public function appendLink($target, [$value])
   //   appends an ExtendedDocument::createElementLink() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendImage($src, [$alt_text])
+  // public function appendImage($src, [$alt_text])
   //   appends an ExtendedDocument::createElementImage() as a child of this document (see there for params)
   //     returns the new child
   //
-  // function appendForm($action, $method, $name, [$id])
+  // public 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])
+  // public function appendFormDiv($action, $method, $name, [$id])
   //   appends an ExtendedDocument::createElementForm() as a child of this element (see there for params)
   //     returns an HTML <div> that is a child of the new child
   //
-  // function appendInputHidden($name, $value)
+  // public function appendInputHidden($name, $value)
   //   appends an ExtendedDocument::createElementInputHidden() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendInputText($name, $maxlength, $size, [$id], [$value])
+  // public function appendInputText($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputText() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendInputNumber($name, $maxlength, $size, [$id], [$value])
+  // public function appendInputNumber($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputNumber() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendInputPassword($name, $maxlength, $size, [$id], [$value])
+  // public function appendInputPassword($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputPassword() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendInputRadio($name, $id, $value, $checked)
+  // public function appendInputRadio($name, $id, $value, $checked)
   //   appends an ExtendedDocument::createElementInputRadio() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendInputCheckbox($name, $id, $value, $checked)
+  // public function appendInputCheckbox($name, $id, $value, $checked)
   //   appends an ExtendedDocument::createElementInputCheckbox() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendInputFile($name, $id, $accept)
+  // public 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)
+  // public function appendInputSubmit($value)
   //   appends an ExtendedDocument::createElementInputSubmit() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendButton($value, $onclick = null)
+  // public function appendButton($value, $onclick = null)
   //   appends an ExtendedDocument::createElementButton() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendTextArea($name, $columns, $rows, [$id], [$value])
+  // public function appendTextArea($name, $columns, $rows, [$id], [$value])
   //   appends an ExtendedDocument::createElementTextArea() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendElementSelect($name, [$id], [$options], [$default])
+  // public function appendElementSelect($name, [$id], [$options], [$default])
   //   appends an ExtendedDocument::createElementSelect() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendElementOption($key, $desc, [$selected])
+  // public function appendElementOption($key, $desc, [$selected])
   //   appends an ExtendedDocument::createElementOption() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendLabel($for_id, $value)
+  // public function appendLabel($for_id, $value)
   //   appends an ExtendedDocument::createElementLabel() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendText($text)
+  // public function appendText($text)
   //   appends a DOMDocument::createTextNode() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendComment($comment_data)
+  // public function appendComment($comment_data)
   //   appends a DOMDocument::createComment() as a child of this element (see there for params)
   //     returns the new child
   //
-  // function appendHTMLMarkup($htmldata)
+  // public function appendHTMLMarkup($htmldata)
   //   appends a representation of the HTML data as children of this element
   //     NO return value!
   //
-  // function appendXMLMarkup($xmldata)
+  // public function appendXMLMarkup($xmldata)
   //   appends a representation of the XML data as children of this element
   //     NO return value!
   //
-  // function appendJSElement($jsdata)
+  // public function appendJSElement($jsdata)
   //   appends an ExtendedDocument::createElementJS() as a child of this element (see there for params)
   //     NO return value!
   //
-  // function appendCOMElement($module, $attributes)
+  // public function appendCOMElement($module, $attributes)
   //   appends an ExtendedDocument::createCOMElement() as a child of this element (see there for params)
   //     returns the new child
 
-  function appendElement($name, $value = '') {
+  public function appendElement($name, $value = '') {
     return $this->appendChild($this->ownerDocument->createElement($name, $value));
   }
-  function appendElementXML($name, $xmldata) {
+  public function appendElementXML($name, $xmldata) {
     $aelem = $this->appendChild($this->ownerDocument->createElement($name));
     $aelem->appendXMLMarkup($xmldata);
     return $aelem;
   }
-  function appendLink($target, $value = '') {
+  public function appendLink($target, $value = '') {
     return $this->appendChild($this->ownerDocument->createElementLink($target, $value));
   }
-  function appendImage($src, $alt_text = '') {
+  public function appendImage($src, $alt_text = '') {
     return $this->appendChild($this->ownerDocument->createElementImage($src, $alt_text));
   }
-  function appendForm($action, $method, $name, $id = null) {
+  public function appendForm($action, $method, $name, $id = null) {
     return $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name, $id));
   }
-  function appendFormDiv($action, $method, $name, $id = null) {
+  public 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) {
+  public function appendInputHidden($name, $value) {
     return $this->appendChild($this->ownerDocument->createElementInputHidden($name, $value));
   }
-  function appendInputText($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputText($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputText($name, $maxlength, $size, $id, $value));
   }
-  function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputNumber($name, $maxlength, $size, $id, $value));
   }
-  function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputPassword($name, $maxlength, $size, $id, $value));
   }
-  function appendInputRadio($name, $id, $value, $checked) {
+  public function appendInputRadio($name, $id, $value, $checked) {
     return $this->appendChild($this->ownerDocument->createElementInputRadio($name, $id, $value, $checked));
   }
-  function appendInputCheckbox($name, $id, $value, $checked) {
+  public function appendInputCheckbox($name, $id, $value, $checked) {
     return $this->appendChild($this->ownerDocument->createElementInputCheckbox($name, $id, $value, $checked));
   }
-  function appendInputFile($name, $id, $accept) {
+  public function appendInputFile($name, $id, $accept) {
     return $this->appendChild($this->ownerDocument->createElementInputFile($name, $id, $accept));
   }
-  function appendInputSubmit($value) {
+  public function appendInputSubmit($value) {
     return $this->appendChild($this->ownerDocument->createElementInputSubmit($value));
   }
-  function appendButton($value, $onclick = null) {
+  public function appendButton($value, $onclick = null) {
     return $this->appendChild($this->ownerDocument->createElementButton($value, $onclick));
   }
-  function appendTextArea($name, $columns, $rows, $id = null, $value = null) {
+  public function appendTextArea($name, $columns, $rows, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementTextArea($name, $columns, $rows, $id, $value));
   }
-  function appendElementSelect($name, $id = null, $options = array(), $default = null) {
+  public function appendElementSelect($name, $id = null, $options = array(), $default = null) {
     return $this->appendChild($this->ownerDocument->createElementSelect($name, $id, $options, $default));
   }
-  function appendElementOption($key, $desc, $selected = false) {
+  public function appendElementOption($key, $desc, $selected = false) {
     return $this->appendChild($this->ownerDocument->createElementOption($key, $desc, $selected));
   }
-  function appendLabel($for_id, $value) {
+  public function appendLabel($for_id, $value) {
     return $this->appendChild($this->ownerDocument->createElementLabel($for_id, $value));
   }
-  function appendText($text) {
+  public function appendText($text) {
     return $this->appendChild($this->ownerDocument->createTextNode($text));
   }
-  function appendComment($comment_data) {
+  public function appendComment($comment_data) {
     return $this->appendChild($this->ownerDocument->createComment($comment_data));
   }
-  function appendHTMLMarkup($htmldata) {
+  public function appendHTMLMarkup($htmldata) {
     $this->ownerDocument->appendHTMLMarkup($htmldata, $this);
   }
-  function appendXMLMarkup($xmldata) {
+  public function appendXMLMarkup($xmldata) {
     $this->ownerDocument->appendXMLMarkup($xmldata, $this);
   }
-  function appendJSElement($jsdata) {
+  public function appendJSElement($jsdata) {
     $this->appendChild($this->ownerDocument->createElementJS($jsdata));
   }
-  function appendCOMElement($module, $attributes) {
+  public function appendCOMElement($module, $attributes) {
     $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
   }
 }
@@ -665,183 +665,183 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   // ExtendedDocumentFragment PHP class
   // this extends the general PHP DOM Document Fragment class to simplify some usual constructs
   //
-  // function appendElement($name, [$value])
+  // public function appendElement($name, [$value])
   //   appends a DOMDocument::createElement() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendElementXML($name, $xmldata)
+  // public function appendElementXML($name, $xmldata)
   //   appends a DOMDocument::createElement() with the given name as a child of this fragment,
   //   with an ExtendedDocument::createXMLFragment() of the given XML data inside
   //     returns the new child
   //
-  // function appendLink($target, [$value])
+  // public function appendLink($target, [$value])
   //   appends an ExtendedDocument::createElementLink() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendImage($src, [$alt_text])
+  // public function appendImage($src, [$alt_text])
   //   appends an ExtendedDocument::createElementImage() as a child of this document (see there for params)
   //     returns the new child
   //
-  // function appendForm($action, $method, $name, [$id])
+  // public 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])
+  // public function appendFormDiv($action, $method, $name, [$id])
   //   appends an ExtendedDocument::createElementForm() as a child of this fragment (see there for params)
   //     returns an HTML <div> that is a child of the new child
   //
-  // function appendInputHidden($name, $value)
+  // public function appendInputHidden($name, $value)
   //   appends an ExtendedDocument::createElementInputHidden() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendInputText($name, $maxlength, $size, [$id], [$value])
+  // public function appendInputText($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputText() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendInputNumber($name, $maxlength, $size, [$id], [$value])
+  // public function appendInputNumber($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputNumber() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendInputPassword($name, $maxlength, $size, [$id], [$value])
+  // public function appendInputPassword($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputPassword() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendInputRadio($name, $id, $value, $checked)
+  // public function appendInputRadio($name, $id, $value, $checked)
   //   appends an ExtendedDocument::createElementInputRadio() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendInputCheckbox($name, $id, $value, $checked)
+  // public function appendInputCheckbox($name, $id, $value, $checked)
   //   appends an ExtendedDocument::createElementInputCheckbox() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendInputFile($name, $id, $accept)
+  // public 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)
+  // public function appendInputSubmit($value)
   //   appends an ExtendedDocument::createElementInputSubmit() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendButton($value, $onclick = null)
+  // public function appendButton($value, $onclick = null)
   //   appends an ExtendedDocument::createElementButton() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendTextArea($name, $columns, $rows, [$id], [$value])
+  // public function appendTextArea($name, $columns, $rows, [$id], [$value])
   //   appends an ExtendedDocument::createElementTextArea() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendElementSelect($name, [$id], [$options], [$default])
+  // public function appendElementSelect($name, [$id], [$options], [$default])
   //   appends an ExtendedDocument::createElementSelect() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendElementOption($key, $desc, [$selected])
+  // public function appendElementOption($key, $desc, [$selected])
   //   appends an ExtendedDocument::createElementOption() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendLabel($for_id, $value)
+  // public function appendLabel($for_id, $value)
   //   appends an ExtendedDocument::createElementLabel() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendText($text)
+  // public function appendText($text)
   //   appends a DOMDocument::createTextNode() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendComment($comment_data)
+  // public function appendComment($comment_data)
   //   appends a DOMDocument::createComment() as a child of this fragment (see there for params)
   //     returns the new child
   //
-  // function appendHTMLMarkup($htmldata)
+  // public function appendHTMLMarkup($htmldata)
   //   appends a representation of the HTML data as children of this fragment
   //     NO return value!
   //
-  // function appendXMLMarkup($xmldata)
+  // public function appendXMLMarkup($xmldata)
   //   appends a representation of the XML data as children of this fragment
   //     NO return value!
   //
-  // function appendJSElement($jsdata)
+  // public function appendJSElement($jsdata)
   //   appends an ExtendedDocument::createElementJS() as a child of this fragment (see there for params)
   //     NO return value!
   //
-  // function appendCOMElement($module, $attributes)
+  // public function appendCOMElement($module, $attributes)
   //   appends an ExtendedDocument::createCOMElement() as a child of this fragment (see there for params)
   //     returns the new child
 
-  function appendElement($name, $value = '') {
+  public function appendElement($name, $value = '') {
     return $this->appendChild($this->ownerDocument->createElement($name, $value));
   }
-  function appendElementXML($name, $xmldata) {
+  public function appendElementXML($name, $xmldata) {
     $aelem = $this->appendChild($this->ownerDocument->createElement($name));
     $aelem->appendXMLMarkup($xmldata);
     return $aelem;
   }
-  function appendLink($target, $value = '') {
+  public function appendLink($target, $value = '') {
     return $this->appendChild($this->ownerDocument->createElementLink($target, $value));
   }
-  function appendImage($src, $alt_text = '') {
+  public function appendImage($src, $alt_text = '') {
     return $this->appendChild($this->ownerDocument->createElementImage($src, $alt_text));
   }
-  function appendForm($action, $method, $name, $id = null) {
+  public function appendForm($action, $method, $name, $id = null) {
     return $this->appendChild($this->ownerDocument->createElementForm($action, $method, $name, $id));
   }
-  function appendFormDiv($action, $method, $name, $id = null) {
+  public 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) {
+  public function appendInputHidden($name, $value) {
     return $this->appendChild($this->ownerDocument->createElementInputHidden($name, $value));
   }
-  function appendInputText($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputText($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputText($name, $maxlength, $size, $id, $value));
   }
-  function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputNumber($name, $maxlength, $size, $id, $value));
   }
-  function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
+  public function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputPassword($name, $maxlength, $size, $id, $value));
   }
-  function appendInputRadio($name, $id, $value, $checked) {
+  public function appendInputRadio($name, $id, $value, $checked) {
     return $this->appendChild($this->ownerDocument->createElementInputRadio($name, $id, $value, $checked));
   }
-  function appendInputCheckbox($name, $id, $value, $checked) {
+  public function appendInputCheckbox($name, $id, $value, $checked) {
     return $this->appendChild($this->ownerDocument->createElementInputCheckbox($name, $id, $value, $checked));
   }
-  function appendInputFile($name, $id, $accept) {
+  public function appendInputFile($name, $id, $accept) {
     return $this->appendChild($this->ownerDocument->createElementInputFile($name, $id, $accept));
   }
-  function appendInputSubmit($value) {
+  public function appendInputSubmit($value) {
     return $this->appendChild($this->ownerDocument->createElementInputSubmit($value));
   }
-  function appendButton($value, $onclick = null) {
+  public function appendButton($value, $onclick = null) {
     return $this->appendChild($this->ownerDocument->createElementButton($value, $onclick));
   }
-  function appendTextArea($name, $columns, $rows, $id = null, $value = null) {
+  public function appendTextArea($name, $columns, $rows, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementTextArea($name, $columns, $rows, $id, $value));
   }
-  function appendElementSelect($name, $id = null, $options = array(), $default = null) {
+  public function appendElementSelect($name, $id = null, $options = array(), $default = null) {
     return $this->appendChild($this->ownerDocument->createElementSelect($name, $id, $options, $default));
   }
-  function appendElementOption($key, $desc, $selected = false) {
+  public function appendElementOption($key, $desc, $selected = false) {
     return $this->appendChild($this->ownerDocument->createElementOption($key, $desc, $selected));
   }
-  function appendLabel($for_id, $value) {
+  public function appendLabel($for_id, $value) {
     return $this->appendChild($this->ownerDocument->createElementLabel($for_id, $value));
   }
-  function appendText($text) {
+  public function appendText($text) {
     return $this->appendChild($this->ownerDocument->createTextNode($text));
   }
-  function appendComment($comment_data) {
+  public function appendComment($comment_data) {
     return $this->appendChild($this->ownerDocument->createComment($comment_data));
   }
-  function appendHTMLMarkup($htmldata) {
+  public function appendHTMLMarkup($htmldata) {
     $this->ownerDocument->appendHTMLMarkup($htmldata, $this);
   }
-  function appendXMLMarkup($xmldata) {
+  public function appendXMLMarkup($xmldata) {
     $this->ownerDocument->appendXMLMarkup($xmldata, $this);
   }
-  function appendJSElement($jsdata) {
+  public function appendJSElement($jsdata) {
     $this->appendChild($this->ownerDocument->createElementJS($jsdata));
   }
-  function appendCOMElement($module, $attributes) {
+  public function appendCOMElement($module, $attributes) {
     $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
   }
 }
-- 
2.43.0

From ea32f7e5a537d82c4c39e7446d00dc2ce458b526 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 24 Oct 2016 03:56:00 +0200
Subject: [PATCH 10/16] add email input and JS script tags pointing to files,
 return element from appendCOMElement (as doc always said)

---
 include/cbsm/util/document.php-class | 75 ++++++++++++++++++++++++++--
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/include/cbsm/util/document.php-class b/include/cbsm/util/document.php-class
index 475f2c4..32d4e3e 100755
--- a/include/cbsm/util/document.php-class
+++ b/include/cbsm/util/document.php-class
@@ -68,6 +68,10 @@ class ExtendedDocument extends DOMDocument {
   //   appends an ExtendedDocument::createElementInputNumber() as a child of this document (see there for params)
   //     returns the new child
   //
+  // public function appendInputEmail($name, $maxlength, $size, [$id], [$value])
+  //   appends an ExtendedDocument::createElementInputEmail() as a child of this document (see there for params)
+  //     returns the new child
+  //
   // public function appendInputPassword($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputPassword() as a child of this document (see there for params)
   //     returns the new child
@@ -128,6 +132,10 @@ class ExtendedDocument extends DOMDocument {
   //   appends an ExtendedDocument::createElementJS() as a child of this document (see there for params)
   //     NO return value!
   //
+  // public function appendJSFile($jsURL)
+  //   appends an ExtendedDocument::createElementJSFile() as a child of this document (see there for params)
+  //     returns the new child
+  //
   // public function appendCOMElement($module, $attributes)
   //   appends an ExtendedDocument::createCOMElement() as a child of this document (see there for params)
   //     returns the new child
@@ -153,6 +161,10 @@ class ExtendedDocument extends DOMDocument {
   //   returns an ExtendedElement that is an HTML <input> of type 'number' with the given name, maxlength, size,
   //   and optionally id and value
   //
+  // public function createElementInputEmail($name, $maxlength, $size, [$id], [$value])
+  //   returns an ExtendedElement that is an HTML <input> of type 'email' with the given name, maxlength, size,
+  //   and optionally id and value
+  //
   // public function createElementInputPassword($name, $maxlength, $size, [$id], [$value])
   //   returns an ExtendedElement that is an HTML <input> of type 'password' with the given name, maxlength, size,
   //   and optionally id and value
@@ -192,6 +204,9 @@ class ExtendedDocument extends DOMDocument {
   // public function createElementJS($jsdata)
   //   returns an ExtendedElement that is an HTML <script> of JavaScript type with the JS data inside
   //
+  // public function createElementJSFile($jsURL)
+  //   returns an ExtendedElement that is an HTML <script> of JavaScript type linking to the file given by the URL
+  //
   // public function createCOMElement($module, $attributes)
   //   returns an ExtendedElement that is in COM_NS namespace, with the given module as name and the
   //     given name=>value array as attributes
@@ -251,6 +266,9 @@ class ExtendedDocument extends DOMDocument {
   public function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->createElementInputNumber($name, $maxlength, $size, $id, $value));
   }
+  public function appendInputEmail($name, $maxlength, $size, $id = null, $value = null) {
+    return $this->appendChild($this->createElementInputEmail($name, $maxlength, $size, $id, $value));
+  }
   public function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->createElementInputPassword($name, $maxlength, $size, $id, $value));
   }
@@ -290,8 +308,11 @@ class ExtendedDocument extends DOMDocument {
   public function appendJSElement($jsdata) {
     $this->appendChild($this->createElementJS($jsdata));
   }
+  public function appendJSFile($jsdata) {
+    return $this->appendChild($this->createElementJSFile($jsdata));
+  }
   public function appendCOMElement($module, $attributes) {
-    $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
+    return $this->appendChild($this->createCOMElement($module, $attributes));
   }
 
   public function appendHTMLMarkup($htmldata, $parentNode = null) {
@@ -371,6 +392,17 @@ class ExtendedDocument extends DOMDocument {
     return $txfield;
   }
 
+  public function createElementInputEmail($name, $maxlength, $size, $id = null, $value = null) {
+    $txfield = $this->createElement('input');
+    $txfield->setAttribute('type', 'email');
+    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;
+  }
+
   public function createElementInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     $pwfield = $this->createElement('input');
     $pwfield->setAttribute('type', 'password');
@@ -460,11 +492,20 @@ class ExtendedDocument extends DOMDocument {
 
   public function createElementJS($jsdata) {
     $jselem = $this->createElement('script');
+    // Note: type can/should be left out for HTML5.
     $jselem->setAttribute('type', 'text/javascript');
     $jselem->appendChild($this->createCDATASection($jsdata));
     return $jselem;
   }
 
+  public function createElementJSFile($jsURL) {
+    $jselem = $this->createElement('script');
+    // Note: type can/should be left out for HTML5.
+    $jselem->setAttribute('type', 'text/javascript');
+    $jselem->setAttribute('src', $jsURL);
+    return $jselem;
+  }
+
   public function createCOMElement($module, $attributes) {
     $com_elem = $this->createElementNS(COM_NS, $module);
     if (is_array($attributes) && count($attributes)) {
@@ -517,6 +558,10 @@ class ExtendedElement extends DOMElement {
   //   appends an ExtendedDocument::createElementInputNumber() as a child of this element (see there for params)
   //     returns the new child
   //
+  // public function appendInputEmail($name, $maxlength, $size, [$id], [$value])
+  //   appends an ExtendedDocument::createElementInputEmail() as a child of this element (see there for params)
+  //     returns the new child
+  //
   // public function appendInputPassword($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputPassword() as a child of this element (see there for params)
   //     returns the new child
@@ -580,6 +625,10 @@ class ExtendedElement extends DOMElement {
   // public function appendCOMElement($module, $attributes)
   //   appends an ExtendedDocument::createCOMElement() as a child of this element (see there for params)
   //     returns the new child
+  //
+  // public function appendCOMElement($module, $attributes)
+  //   appends an ExtendedDocument::createCOMElement() as a child of this element (see there for params)
+  //     returns the new child
 
   public function appendElement($name, $value = '') {
     return $this->appendChild($this->ownerDocument->createElement($name, $value));
@@ -611,6 +660,9 @@ class ExtendedElement extends DOMElement {
   public function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputNumber($name, $maxlength, $size, $id, $value));
   }
+  public function appendInputEmail($name, $maxlength, $size, $id = null, $value = null) {
+    return $this->appendChild($this->ownerDocument->createElementInputEmail($name, $maxlength, $size, $id, $value));
+  }
   public function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputPassword($name, $maxlength, $size, $id, $value));
   }
@@ -656,8 +708,11 @@ class ExtendedElement extends DOMElement {
   public function appendJSElement($jsdata) {
     $this->appendChild($this->ownerDocument->createElementJS($jsdata));
   }
+  public function appendJSFile($jsdata) {
+    return $this->appendChild($this->ownerDocument->createElementJSFile($jsdata));
+  }
   public function appendCOMElement($module, $attributes) {
-    $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
+    return $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
   }
 }
 
@@ -702,6 +757,10 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   //   appends an ExtendedDocument::createElementInputNumber() as a child of this fragment (see there for params)
   //     returns the new child
   //
+  // public function appendInputEmail($name, $maxlength, $size, [$id], [$value])
+  //   appends an ExtendedDocument::createElementInputEmail() as a child of this fragment (see there for params)
+  //     returns the new child
+  //
   // public function appendInputPassword($name, $maxlength, $size, [$id], [$value])
   //   appends an ExtendedDocument::createElementInputPassword() as a child of this fragment (see there for params)
   //     returns the new child
@@ -765,6 +824,10 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   // public function appendCOMElement($module, $attributes)
   //   appends an ExtendedDocument::createCOMElement() as a child of this fragment (see there for params)
   //     returns the new child
+  //
+  // public function appendCOMElement($module, $attributes)
+  //   appends an ExtendedDocument::createCOMElement() as a child of this fragment (see there for params)
+  //     returns the new child
 
   public function appendElement($name, $value = '') {
     return $this->appendChild($this->ownerDocument->createElement($name, $value));
@@ -796,6 +859,9 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   public function appendInputNumber($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputNumber($name, $maxlength, $size, $id, $value));
   }
+  public function appendInputEmail($name, $maxlength, $size, $id = null, $value = null) {
+    return $this->appendChild($this->ownerDocument->createElementInputEmail($name, $maxlength, $size, $id, $value));
+  }
   public function appendInputPassword($name, $maxlength, $size, $id = null, $value = null) {
     return $this->appendChild($this->ownerDocument->createElementInputPassword($name, $maxlength, $size, $id, $value));
   }
@@ -841,8 +907,11 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   public function appendJSElement($jsdata) {
     $this->appendChild($this->ownerDocument->createElementJS($jsdata));
   }
+  public function appendJSFile($jsdata) {
+    return $this->appendChild($this->ownerDocument->createElementJSFile($jsdata));
+  }
   public function appendCOMElement($module, $attributes) {
-    $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
+    return $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
   }
 }
 ?>
-- 
2.43.0

From 6638efd5690cd46471a3e01c164e572956a34aa3 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 14 Nov 2016 18:30:43 +0100
Subject: [PATCH 11/16] add appendEntity() function to ExtendedDocument - note
 that it only works for *named* entities, not *numeric* ones though

---
 include/cbsm/util/document.php-class | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/include/cbsm/util/document.php-class b/include/cbsm/util/document.php-class
index 32d4e3e..41e817a 100755
--- a/include/cbsm/util/document.php-class
+++ b/include/cbsm/util/document.php-class
@@ -116,6 +116,10 @@ class ExtendedDocument extends DOMDocument {
   //   appends a DOMDocument::createTextNode() as a child of this document (see there for params)
   //     returns the new child
   //
+  // public function appendEntity($name)
+  //   appends a DOMDocument::createEntityReference() as a child of this document (see there for params)
+  //     returns the new child
+  //
   // public function appendComment($comment_data)
   //   appends a DOMDocument::createComment() as a child of this document (see there for params)
   //     returns the new child
@@ -302,6 +306,9 @@ class ExtendedDocument extends DOMDocument {
   public function appendText($text) {
     return $this->appendChild($this->createTextNode($text));
   }
+  public function appendEntity($name) {
+    return $this->appendChild($this->createEntityReference($name));
+  }
   public function appendComment($comment_data) {
     return $this->appendChild($this->createComment($comment_data));
   }
@@ -606,6 +613,10 @@ class ExtendedElement extends DOMElement {
   //   appends a DOMDocument::createTextNode() as a child of this element (see there for params)
   //     returns the new child
   //
+  // public function appendEntity($name)
+  //   appends a DOMDocument::createEntityReference() as a child of this element (see there for params)
+  //     returns the new child
+  //
   // public function appendComment($comment_data)
   //   appends a DOMDocument::createComment() as a child of this element (see there for params)
   //     returns the new child
@@ -696,6 +707,9 @@ class ExtendedElement extends DOMElement {
   public function appendText($text) {
     return $this->appendChild($this->ownerDocument->createTextNode($text));
   }
+  public function appendEntity($name) {
+    return $this->appendChild($this->ownerDocument->createEntityReference($name));
+  }
   public function appendComment($comment_data) {
     return $this->appendChild($this->ownerDocument->createComment($comment_data));
   }
@@ -805,6 +819,10 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   //   appends a DOMDocument::createTextNode() as a child of this fragment (see there for params)
   //     returns the new child
   //
+  // public function appendEntity($name)
+  //   appends a DOMDocument::createEntityReference() as a child of this fragment (see there for params)
+  //     returns the new child
+  //
   // public function appendComment($comment_data)
   //   appends a DOMDocument::createComment() as a child of this fragment (see there for params)
   //     returns the new child
@@ -895,6 +913,9 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   public function appendText($text) {
     return $this->appendChild($this->ownerDocument->createTextNode($text));
   }
+  public function appendEntity($name) {
+    return $this->appendChild($this->ownerDocument->createEntityReference($name));
+  }
   public function appendComment($comment_data) {
     return $this->appendChild($this->ownerDocument->createComment($comment_data));
   }
-- 
2.43.0

From 7b9ebce7d25e4eaa557e8a64f8b1ed15aad1a9bb Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Mon, 28 Nov 2016 02:47:39 +0100
Subject: [PATCH 12/16] move the files needed for the new php-utility-classes
 repo into new directories

---
 .../cbsm/util => classes}/document.php-class  |   0
 {include/classes => classes}/email.php-class  |   0
 .../classes => classes}/rrdstat.php-class     |   0
 .../classes => classes}/useragent.php-class   |   0
 examples/rrd/.gitignore                       |   2 +
 {testbed => examples}/rrd/index.php           |   0
 {testbed => examples}/rrd/rrd-config.inc.php  |  42 +-
 examples/rrd/rrd-config/hostname.inc.php      | 745 ++++++++++++++++++
 {testbed => examples}/rrd/rrd-stat.php        |   0
 {testbed => examples}/rrd/rrd-test.php        |   0
 {testbed => examples}/rrd/rrd-update.php      |   0
 examples/rrd/rrdstat.php-class                |   1 +
 examples/rrd/useragent.php-class              |   1 +
 testbed/rrd/.gitignore                        |  19 -
 testbed/rrd/rrdstat.php-class                 |   1 -
 testbed/rrd/useragent.php-class               |   1 -
 {testbed => tests}/ua_list.php                |   0
 {testbed => tests}/ua_list_raw.txt            |   0
 {testbed => tests}/ua_test.php                |   0
 19 files changed, 773 insertions(+), 39 deletions(-)
 rename {include/cbsm/util => classes}/document.php-class (100%)
 rename {include/classes => classes}/email.php-class (100%)
 rename {include/classes => classes}/rrdstat.php-class (100%)
 rename {include/classes => classes}/useragent.php-class (100%)
 create mode 100644 examples/rrd/.gitignore
 rename {testbed => examples}/rrd/index.php (100%)
 rename {testbed => examples}/rrd/rrd-config.inc.php (89%)
 create mode 100644 examples/rrd/rrd-config/hostname.inc.php
 rename {testbed => examples}/rrd/rrd-stat.php (100%)
 rename {testbed => examples}/rrd/rrd-test.php (100%)
 rename {testbed => examples}/rrd/rrd-update.php (100%)
 create mode 120000 examples/rrd/rrdstat.php-class
 create mode 120000 examples/rrd/useragent.php-class
 delete mode 100644 testbed/rrd/.gitignore
 delete mode 120000 testbed/rrd/rrdstat.php-class
 delete mode 120000 testbed/rrd/useragent.php-class
 rename {testbed => tests}/ua_list.php (100%)
 rename {testbed => tests}/ua_list_raw.txt (100%)
 rename {testbed => tests}/ua_test.php (100%)

diff --git a/include/cbsm/util/document.php-class b/classes/document.php-class
similarity index 100%
rename from include/cbsm/util/document.php-class
rename to classes/document.php-class
diff --git a/include/classes/email.php-class b/classes/email.php-class
similarity index 100%
rename from include/classes/email.php-class
rename to classes/email.php-class
diff --git a/include/classes/rrdstat.php-class b/classes/rrdstat.php-class
similarity index 100%
rename from include/classes/rrdstat.php-class
rename to classes/rrdstat.php-class
diff --git a/include/classes/useragent.php-class b/classes/useragent.php-class
similarity index 100%
rename from include/classes/useragent.php-class
rename to classes/useragent.php-class
diff --git a/examples/rrd/.gitignore b/examples/rrd/.gitignore
new file mode 100644
index 0000000..43a89a5
--- /dev/null
+++ b/examples/rrd/.gitignore
@@ -0,0 +1,2 @@
+*.rrd
+graphs
diff --git a/testbed/rrd/index.php b/examples/rrd/index.php
similarity index 100%
rename from testbed/rrd/index.php
rename to examples/rrd/index.php
diff --git a/testbed/rrd/rrd-config.inc.php b/examples/rrd/rrd-config.inc.php
similarity index 89%
rename from testbed/rrd/rrd-config.inc.php
rename to examples/rrd/rrd-config.inc.php
index 87e32cb..c58088b 100644
--- a/testbed/rrd/rrd-config.inc.php
+++ b/examples/rrd/rrd-config.inc.php
@@ -20,21 +20,24 @@ $rrd_info['overview']['page']['text_intro'] = 'Go to the <a href="?stat=index">i
 
 $rrd_info['cpu']['file'] = 'system.cpu.rrd';
 $rrd_info['cpu']['auto-update'] = true;
-$rrd_info['cpu']['fields'][] = array('name' => 'user', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
-$rrd_info['cpu']['fields'][] = array('name' => 'nice', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
-$rrd_info['cpu']['fields'][] = array('name' => 'system', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
-$rrd_info['cpu']['fields'][] = array('name' => 'idle', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
-$rrd_info['cpu']['fields'][] = array('name' => 'iowait', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
-$rrd_info['cpu']['fields'][] = array('name' => 'irq', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
-$rrd_info['cpu']['fields'][] = array('name' => 'softirq', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
-$rrd_info['cpu']['fields'][] = array('name' => 'total', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'user', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'nice', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'system', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'idle', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'iowait', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'irq', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'softirq', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'total', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
 $rrd_info['cpu']['update'] =
  'function {
-    $sdata = file("/proc/stat"); $udata = array();
+    $udata = array("user"=>null,"nice"=>null,"system"=>null,"idle"=>null,
+                   "iowait"=>null,"irq"=>null,"softirq"=>null, "total"=>null);
+    $sdata = file("/proc/stat");
     foreach ($sdata as $sline) {
       if (preg_match("/^\s*cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
         $udata = array("user"=>$regs[1],"nice"=>$regs[2],"system"=>$regs[3],"idle"=>$regs[4],
-                       "iowait"=>$regs[5],"irq"=>$regs[6],"softirq"=>$regs[7],"total"=>array_sum($regs));
+                       "iowait"=>$regs[5],"irq"=>$regs[6],"softirq"=>$regs[7],
+                       "total"=>$regs[1]+$regs[2]+$regs[3]+$regs[4]+$regs[5]+$regs[6]+$regs[7]);
       }
     }
     return $udata;
@@ -46,14 +49,14 @@ $rrd_info['cpu']['graph']['rows'][] = array('name'=>'iowait_tmp', 'dsname'=>'iow
 $rrd_info['cpu']['graph']['rows'][] = array('name'=>'system_tmp', 'dsname'=>'system', 'gType'=>'');
 $rrd_info['cpu']['graph']['rows'][] = array('name'=>'nice_tmp', 'dsname'=>'nice', 'gType'=>'');
 $rrd_info['cpu']['graph']['rows'][] = array('name'=>'user_tmp', 'dsname'=>'user', 'gType'=>'');
-$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'softirq', 'rpn_expr'=>'softirq_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#CCCCCC', 'color_bg'=>'#808080', 'legend'=>'softIRQ');
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'softirq', 'rpn_expr'=>'softirq_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#CCCCCC', 'color_bg'=>'#606060', 'legend'=>'softIRQ');
 $rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'irq', 'rpn_expr'=>'irq_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#808080', 'legend'=>'IRQ', 'stack'=>true);
 $rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'iowait', 'rpn_expr'=>'iowait_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FF00FF', 'legend'=>'I/O wait', 'stack'=>true);
 $rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'system', 'rpn_expr'=>'system_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FF0000', 'legend'=>'System', 'stack'=>true);
-$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'nice', 'rpn_expr'=>'nice_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FFFF00', 'color_bg'=>'#808080', 'legend'=>'Nice', 'stack'=>true);
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'nice', 'rpn_expr'=>'nice_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FFFF00', 'color_bg'=>'#606060', 'legend'=>'Nice', 'stack'=>true);
 $rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'user', 'rpn_expr'=>'user_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#0000FF', 'legend'=>'User', 'stack'=>true);
 $rrd_info['cpu']['graph']['units_length'] = 4;
-$rrd_info['cpu']['graph']['label_y'] = '% CPU-Auslastung';
+$rrd_info['cpu']['graph']['label_y'] = '% CPU Usage';
 $rrd_info['cpu']['graph']['min_y'] = 0;
 $rrd_info['cpu']['graph']['max_y'] = 100;
 $rrd_info['cpu']['graph']['fix_scale_y'] = true;
@@ -69,16 +72,19 @@ $rrd_info['mem']['fields'][] = array('name' => 'swap_total', 'type' => 'GAUGE',
 $rrd_info['mem']['fields'][] = array('name' => 'swap_used', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
 $rrd_info['mem']['update'] =
  'function {
-    $sdata = explode("\n", `/usr/bin/free -b -o`);
+    $sdata = explode("\n", `/usr/bin/free -wb`);
     $udata = array("total"=>null,"used"=>null,"buffers"=>null,"cached"=>null,
                    "swap_total"=>null,"swap_used"=>null);
     foreach ($sdata as $sline) {
-      if (preg_match("/Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
-        $udata["total"] = $regs[1]; $udata["used"] = $regs[2]-$regs[5]-$regs[6];
-        $udata["buffers"] = $regs[5]; $udata["cached"] = $regs[6];
+      if (preg_match("/Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
+        $udata["total"] = $regs[1];
+        $udata["used"] = $regs[2];
+        $udata["buffers"] = $regs[5];
+        $udata["cached"] = $regs[6];
       }
       elseif (preg_match("/Swap:\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
-        $udata["swap_total"] = $regs[1]; $udata["swap_used"] = $regs[2];
+        $udata["swap_total"] = $regs[1];
+        $udata["swap_used"] = $regs[2];
       }
     }
     return $udata;
diff --git a/examples/rrd/rrd-config/hostname.inc.php b/examples/rrd/rrd-config/hostname.inc.php
new file mode 100644
index 0000000..f2ddd88
--- /dev/null
+++ b/examples/rrd/rrd-config/hostname.inc.php
@@ -0,0 +1,745 @@
+<?php
+// RRD info for CPU info
+$rrd_info = array();
+$rrd_info['*']['graph']['path'] = 'graphs';
+// $rrd_info['*']['page']['graph_url'] = 'http://127.0.0.1/testbed/rrd/';
+$rrd_info['*']['graph']['units_length'] = 6;
+// $rrd_info['*']['graph']['force_recreate'] = true;
+
+$rrd_info['index']['page']['type'] = 'index';
+// $rrd_info['index']['page']['index_ids'] = 'hd,-hd.root';
+// $rrd_info['index']['page']['scan_config'] = false;
+$rrd_info['index']['page']['scan_files'] = true;
+$rrd_info['index']['hidden'] = true;
+
+$rrd_info['overview']['page']['type'] = 'overview';
+$rrd_info['overview']['page']['index_ids'] = 'cpu,cpu.frequency,load,temp,hd,mem|pct,eth0,connect,loopback,sensors.power|relpct,ping.gateway,rrdup';
+$rrd_info['overview']['page']['scan_config'] = false;
+$rrd_info['overview']['page']['text_intro'] = 'Go to the <a href="?stat=index">index page</a> for a full list of all available statistics. Also see <a href="?stat=cpu-overview">CPU</a> overview.';
+// $rrd_info['overview']['hidden'] = true;
+
+$rrd_info['cpu-overview']['page']['type'] = 'overview';
+$rrd_info['cpu-overview']['page']['title_page'] = 'CPU statistics - total + per cpu core';
+$rrd_info['cpu-overview']['page']['index_ids'] = 'cpu,cpu.frequency,cpu0,cpu1,cpu2,cpu3,cpu4,cpu5,cpu6,cpu7';
+$rrd_info['cpu-overview']['page']['scan_config'] = false;
+// $rrd_info['cpu-overview']['hidden'] = true;
+
+$rrd_info['cpu']['file'] = 'system.cpu.rrd';
+$rrd_info['cpu']['auto-update'] = true;
+$rrd_info['cpu']['fields'][] = array('name' => 'user', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'nice', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'system', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'idle', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'iowait', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'irq', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'softirq', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['fields'][] = array('name' => 'total', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['cpu']['update'] =
+ 'function {
+    $udata = array("user"=>null,"nice"=>null,"system"=>null,"idle"=>null,
+                   "iowait"=>null,"irq"=>null,"softirq"=>null, "total"=>null);
+    $sdata = file("/proc/stat");
+    foreach ($sdata as $sline) {
+      if (preg_match("/^\s*cpu\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
+        $udata = array("user"=>$regs[1],"nice"=>$regs[2],"system"=>$regs[3],"idle"=>$regs[4],
+                       "iowait"=>$regs[5],"irq"=>$regs[6],"softirq"=>$regs[7],
+                       "total"=>$regs[1]+$regs[2]+$regs[3]+$regs[4]+$regs[5]+$regs[6]+$regs[7]);
+      }
+    }
+    return $udata;
+  }';
+$rrd_info['cpu']['graph']['rows'][] = array('name'=>'total', 'gType'=>'');
+$rrd_info['cpu']['graph']['rows'][] = array('name'=>'softirq_tmp', 'dsname'=>'softirq', 'gType'=>'');
+$rrd_info['cpu']['graph']['rows'][] = array('name'=>'irq_tmp', 'dsname'=>'irq', 'gType'=>'');
+$rrd_info['cpu']['graph']['rows'][] = array('name'=>'iowait_tmp', 'dsname'=>'iowait', 'gType'=>'');
+$rrd_info['cpu']['graph']['rows'][] = array('name'=>'system_tmp', 'dsname'=>'system', 'gType'=>'');
+$rrd_info['cpu']['graph']['rows'][] = array('name'=>'nice_tmp', 'dsname'=>'nice', 'gType'=>'');
+$rrd_info['cpu']['graph']['rows'][] = array('name'=>'user_tmp', 'dsname'=>'user', 'gType'=>'');
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'softirq', 'rpn_expr'=>'softirq_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#CCCCCC', 'color_bg'=>'#606060', 'legend'=>'softIRQ');
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'irq', 'rpn_expr'=>'irq_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#808080', 'legend'=>'IRQ', 'stack'=>true);
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'iowait', 'rpn_expr'=>'iowait_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FF00FF', 'legend'=>'I/O wait', 'stack'=>true);
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'system', 'rpn_expr'=>'system_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FF0000', 'legend'=>'System', 'stack'=>true);
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'nice', 'rpn_expr'=>'nice_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FFFF00', 'color_bg'=>'#606060', 'legend'=>'Nice', 'stack'=>true);
+$rrd_info['cpu']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'user', 'rpn_expr'=>'user_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#0000FF', 'legend'=>'User', 'stack'=>true);
+$rrd_info['cpu']['graph']['units_length'] = 4;
+$rrd_info['cpu']['graph']['label_y'] = '% CPU Usage';
+$rrd_info['cpu']['graph']['min_y'] = 0;
+$rrd_info['cpu']['graph']['max_y'] = 100;
+$rrd_info['cpu']['graph']['fix_scale_y'] = true;
+// $rrd_info['cpu']['graph']['force_recreate'] = true;
+
+$rrd_info['cpu.frequency.proto']['hidden'] = true;
+$rrd_info['cpu.frequency.proto']['auto-update'] = false;
+$rrd_info['cpu.frequency.proto']['fields'][] = array('name' => 'cur_frequency', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu.frequency.proto']['fields'][] = array('name' => 'min_frequency', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu.frequency.proto']['fields'][] = array('name' => 'max_frequency', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu.frequency.proto']['graph']['rows'][] = array('name'=>'cur_frequency', 'gType'=>'LINE1', 'color'=>'#00CC00', 'legend'=>'Current');
+$rrd_info['cpu.frequency.proto']['graph']['rows'][] = array('name'=>'min_frequency', 'gType'=>'LINE1', 'color'=>'#CCCCCC', 'legend'=>'Min');
+$rrd_info['cpu.frequency.proto']['graph']['rows'][] = array('name'=>'max_frequency', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Max');
+$rrd_info['cpu.frequency.proto']['graph']['units_length'] = 5;
+//$rrd_info['cpu.frequency.proto']['graph']['units_exponent'] = 0;
+$rrd_info['cpu.frequency.proto']['graph']['scale'] = 1000;
+$rrd_info['cpu.frequency.proto']['graph']['label_y'] = 'Hz';
+$rrd_info['cpu.frequency.proto']['graph']['min_y'] = 0;
+// $rrd_info['cpu.frequency.proto']['graph']['force_recreate'] = true;
+
+for ($i = 0; $i < 8; $i++) {
+  $rrd_info['cpu'.$i] = $rrd_info['cpu'];
+  $rrd_info['cpu'.$i]['file'] = 'system.cpu'.$i.'.rrd';
+  $rrd_info['cpu'.$i]['update'] =
+   'function {
+      $udata = array("user"=>null,"nice"=>null,"system"=>null,"idle"=>null,
+                     "iowait"=>null,"irq"=>null,"softirq"=>null, "total"=>null);
+      $sdata = file("/proc/stat");
+      foreach ($sdata as $sline) {
+        if (preg_match("/^\s*cpu'.$i.'\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
+          $udata = array("user"=>$regs[1],"nice"=>$regs[2],"system"=>$regs[3],"idle"=>$regs[4],
+                         "iowait"=>$regs[5],"irq"=>$regs[6],"softirq"=>$regs[7],
+                         "total"=>$regs[1]+$regs[2]+$regs[3]+$regs[4]+$regs[5]+$regs[6]+$regs[7]);
+        }
+      }
+      return $udata;
+    }';
+
+  $rrd_info['cpu'.$i.'.frequency'] = $rrd_info['cpu.frequency.proto'];
+  $rrd_info['cpu'.$i.'.frequency']['hidden'] = false;
+  $rrd_info['cpu'.$i.'.frequency']['file'] = 'system.cpu'.$i.'.freq.rrd';
+  $rrd_info['cpu'.$i.'.frequency']['auto-update'] = true;
+  $rrd_info['cpu'.$i.'.frequency']['update'] =
+   'function {
+      $udata = array("cur_frequency"=>null,"min_frequency"=>null,"max_frequency"=>null);
+      sleep(1);
+      $sdata = trim(file_get_contents("/sys/devices/system/cpu/cpu'.$i.'/cpufreq/cpuinfo_cur_freq"));
+      if (is_numeric($sdata)) { $udata["cur_frequency"] = intval($sdata); }
+      $sdata = trim(file_get_contents("/sys/devices/system/cpu/cpu'.$i.'/cpufreq/cpuinfo_min_freq"));
+      if (is_numeric($sdata)) { $udata["min_frequency"] = intval($sdata); }
+      $sdata = trim(file_get_contents("/sys/devices/system/cpu/cpu'.$i.'/cpufreq/cpuinfo_max_freq"));
+      if (is_numeric($sdata)) { $udata["max_frequency"] = intval($sdata); }
+      return $udata;
+    }';
+}
+
+$rrd_info['cpu.frequency']['graph-only'] = true;
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu0', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu0.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#00CC00', 'legend'=>'CPU0');
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu1', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu1.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#008000', 'legend'=>'CPU1');
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu2', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu2.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#8080FF', 'legend'=>'CPU2');
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu3', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu3.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'CPU3');
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu4', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu4.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#FF8080', 'legend'=>'CPU4');
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu5', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu5.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#FFCCCC', 'legend'=>'CPU5');
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu6', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu6.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#CCCCCC', 'legend'=>'CPU6');
+$rrd_info['cpu.frequency']['graph']['rows'][] = array('name'=>'freq_cpu7', 'dsname'=>'cur_frequency', 'dsfile'=>'system.cpu7.freq.rrd',
+                                                      'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'CPU7');
+$rrd_info['cpu.frequency']['graph']['units_length'] = 5;
+//$rrd_info['cpu.frequency']['graph']['units_exponent'] = 0;
+$rrd_info['cpu.frequency']['graph']['scale'] = 1000;
+$rrd_info['cpu.frequency']['graph']['label_y'] = 'Hz';
+$rrd_info['cpu.frequency']['graph']['min_y'] = 0;
+// $rrd_info['cpu.frequency']['graph']['force_recreate'] = true;
+
+$rrd_info['cpu.coretemp']['file'] = 'cpu.coretemp.rrd';
+$rrd_info['cpu.coretemp']['auto-update'] = true;
+$rrd_info['cpu.coretemp']['fields'][] = array('name' => 'core0_temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu.coretemp']['fields'][] = array('name' => 'core1_temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu.coretemp']['fields'][] = array('name' => 'core2_temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu.coretemp']['fields'][] = array('name' => 'core3_temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['cpu.coretemp']['update'] =
+ 'function {
+    $udata = array("core0_temp"=>null,"core1_temp"=>null);
+    $sdata = explode("\n", `/usr/bin/sensors -A coretemp-isa-*`);
+    foreach ($sdata as $sline) {
+      if (preg_match("/Core 0:\s+([+-]?[\d\.]+).+?C/i", $sline, $regs)) {
+        $udata["core0_temp"] = $regs[1];
+      }
+      elseif (preg_match("/Core 1:\s+([+-]?[\d\.]+).+?C/i", $sline, $regs)) {
+        $udata["core1_temp"] = $regs[1];
+      }
+      elseif (preg_match("/Core 2:\s+([+-]?[\d\.]+).+?C/i", $sline, $regs)) {
+        $udata["core2_temp"] = $regs[1];
+      }
+      elseif (preg_match("/Core 3:\s+([+-]?[\d\.]+).+?C/i", $sline, $regs)) {
+        $udata["core3_temp"] = $regs[1];
+      }
+    }
+    return $udata;
+  }';
+$rrd_info['cpu.coretemp']['graph']['rows'][] = array('name'=>'core0_temp', 'gType'=>'LINE1', 'color'=>'#80CC80', 'legend'=>'Core 0 Temp');
+$rrd_info['cpu.coretemp']['graph']['rows'][] = array('name'=>'core1_temp', 'gType'=>'LINE1', 'color'=>'#8080CC', 'legend'=>'Core 1 Temp');
+$rrd_info['cpu.coretemp']['graph']['rows'][] = array('name'=>'core2_temp', 'gType'=>'LINE1', 'color'=>'#CC8080', 'legend'=>'Core 2 Temp');
+$rrd_info['cpu.coretemp']['graph']['rows'][] = array('name'=>'core3_temp', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Core 3 Temp');
+$rrd_info['cpu.coretemp']['graph']['units_length'] = 4;
+$rrd_info['cpu.coretemp']['graph']['label_y'] = 'Â°C';
+// $rrd_info['cpu.coretemp']['graph']['max_y'] = 13;
+// $rrd_info['cpu.coretemp']['graph']['min_y'] = -13;
+
+$rrd_info['mem']['file'] = 'system.mem.rrd';
+$rrd_info['mem']['auto-update'] = true;
+$rrd_info['mem']['fields'][] = array('name' => 'total', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['mem']['fields'][] = array('name' => 'used', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['mem']['fields'][] = array('name' => 'buffers', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['mem']['fields'][] = array('name' => 'cached', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['mem']['fields'][] = array('name' => 'swap_total', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['mem']['fields'][] = array('name' => 'swap_used', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['mem']['update'] =
+ 'function {
+    $sdata = explode("\n", `/usr/bin/free -wb`);
+    $udata = array("total"=>null,"used"=>null,"buffers"=>null,"cached"=>null,
+                   "swap_total"=>null,"swap_used"=>null);
+    foreach ($sdata as $sline) {
+      if (preg_match("/Mem:\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
+        $udata["total"] = $regs[1];
+        $udata["used"] = $regs[2];
+        $udata["buffers"] = $regs[5];
+        $udata["cached"] = $regs[6];
+      }
+      elseif (preg_match("/Swap:\s+(\d+)\s+(\d+)\s+(\d+)/", $sline, $regs)) {
+        $udata["swap_total"] = $regs[1];
+        $udata["swap_used"] = $regs[2];
+      }
+    }
+    return $udata;
+  }';
+$rrd_info['mem']['graph']['rows'][] = array('name'=>'total', 'gType'=>'LINE1', 'color'=>'#000000', 'legend'=>'Available');
+$rrd_info['mem']['graph']['rows'][] = array('name'=>'used', 'gType'=>'AREA', 'color'=>'#0000FF', 'legend'=>'Used');
+$rrd_info['mem']['graph']['rows'][] = array('name'=>'buffers', 'gType'=>'AREA', 'color'=>'#FFFF00', 'legend'=>'Buffers', 'stack'=>true);
+$rrd_info['mem']['graph']['rows'][] = array('name'=>'cached', 'gType'=>'AREA', 'color'=>'#008000', 'legend'=>'Cache', 'stack'=>true);
+$rrd_info['mem']['graph']['rows'][] = array('name'=>'swap_total', 'gType'=>'LINE1', 'color'=>'#CCCCCC', 'legend'=>'Swap avail.');
+$rrd_info['mem']['graph']['rows'][] = array('name'=>'swap_used', 'gType'=>'LINE2', 'color'=>'#00FFFF', 'legend'=>'Swap used');
+$rrd_info['mem']['graph']['units_binary'] = true;
+$rrd_info['mem']['graph']['units_exponent'] = 6;
+$rrd_info['mem']['graph']['units_length'] = 6;
+$rrd_info['mem']['graph']['label_y'] = 'Memory';
+$rrd_info['mem']['graph']['min_y'] = 0;
+// $rrd_info['mem']['graph']['max_y'] = 100;
+// $rrd_info['mem']['graph']['fix_scale_y'] = true;
+// $rrd_info['mem']['graph']['force_recreate'] = true;
+$rrd_info['mem']['graph.pct']['rows'][] = array('name'=>'total', 'gType'=>'');
+$rrd_info['mem']['graph.pct']['rows'][] = array('name'=>'swap_total', 'gType'=>'');
+$rrd_info['mem']['graph.pct']['rows'][] = array('name'=>'used_tmp', 'dsname'=>'used', 'gType'=>'');
+$rrd_info['mem']['graph.pct']['rows'][] = array('name'=>'buffers_tmp', 'dsname'=>'buffers', 'gType'=>'');
+$rrd_info['mem']['graph.pct']['rows'][] = array('name'=>'cached_tmp', 'dsname'=>'cached', 'gType'=>'');
+$rrd_info['mem']['graph.pct']['rows'][] = array('name'=>'swap_tmp', 'dsname'=>'swap_used', 'gType'=>'');
+$rrd_info['mem']['graph.pct']['rows'][] = array('dType'=>'CDEF', 'name'=>'used', 'rpn_expr'=>'used_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#0000FF', 'legend'=>'Used');
+$rrd_info['mem']['graph.pct']['rows'][] = array('dType'=>'CDEF', 'name'=>'buffers', 'rpn_expr'=>'buffers_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#FFFF00', 'legend'=>'Buffers', 'stack'=>true);
+$rrd_info['mem']['graph.pct']['rows'][] = array('dType'=>'CDEF', 'name'=>'cached', 'rpn_expr'=>'cached_tmp,total,/,100,*', 'gType'=>'AREA', 'color'=>'#008000', 'legend'=>'Cache', 'stack'=>true);
+$rrd_info['mem']['graph.pct']['rows'][] = array('dType'=>'CDEF', 'name'=>'swap_used', 'rpn_expr'=>'swap_tmp,swap_total,/,100,*', 'gType'=>'LINE2', 'color'=>'#00FFFF', 'legend'=>'Swap');
+$rrd_info['mem']['graph.pct']['units_exponent'] = 0;
+$rrd_info['mem']['graph.pct']['units_length'] = 4;
+$rrd_info['mem']['graph.pct']['label_y'] = '% Memory';
+$rrd_info['mem']['graph.pct']['min_y'] = 0;
+$rrd_info['mem']['graph.pct']['max_y'] = 100;
+$rrd_info['mem']['graph.pct']['fix_scale_y'] = true;
+// $rrd_info['mem']['graph.pct']['force_recreate'] = true;
+$rrd_info['mem']['page.pct']['graph_sub'] = 'pct';
+
+$rrd_info['load']['file'] = 'system.load.rrd';
+$rrd_info['load']['auto-update'] = true;
+$rrd_info['load']['fields'][] = array('name' => 'load1', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['load']['fields'][] = array('name' => 'load5', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['load']['fields'][] = array('name' => 'load15', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['load']['update'] = 'function { $sdata = explode(" ",file_get_contents("/proc/loadavg")); return array("load1"=>$sdata[0],"load5"=>$sdata[1],"load15"=>$sdata[2]); }';
+$rrd_info['load']['graph']['rows'][] = array('name'=>'load1', 'gType'=>'AREA', 'color'=>'#00CC00', 'legend'=>'1 Min.');
+$rrd_info['load']['graph']['rows'][] = array('name'=>'load5', 'gType'=>'LINE1', 'color'=>'#FF4000', 'legend'=>'5 Min.');
+$rrd_info['load']['graph']['rows'][] = array('name'=>'load15', 'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'15 Min.');
+$rrd_info['load']['graph']['units_length'] = 4;
+$rrd_info['load']['graph']['units_exponent'] = 0;
+$rrd_info['load']['graph']['label_y'] = 'Load average';
+$rrd_info['load']['graph']['min_y'] = 0;
+// $rrd_info['load']['graph']['force_recreate'] = true;
+$rrd_info['load']['page']['data_colorize'] = true;
+
+$rrd_info['hd']['graph-only'] = true;
+$rrd_info['hd']['graph']['rows'][] = array('name'=>'boot_used', 'dsname'=>'used', 'dsfile'=>'hd.boot.rrd', 'gType'=>'',);
+$rrd_info['hd']['graph']['rows'][] = array('name'=>'boot_total', 'dsname'=>'total', 'dsfile'=>'hd.boot.rrd', 'gType'=>'');
+$rrd_info['hd']['graph']['rows'][] = array('name'=>'root_used', 'dsname'=>'used', 'dsfile'=>'hd.root.rrd', 'gType'=>'',);
+$rrd_info['hd']['graph']['rows'][] = array('name'=>'root_total', 'dsname'=>'total', 'dsfile'=>'hd.root.rrd', 'gType'=>'');
+$rrd_info['hd']['graph']['rows'][] = array('name'=>'home_used', 'dsname'=>'used', 'dsfile'=>'hd.home.rrd', 'gType'=>'',);
+$rrd_info['hd']['graph']['rows'][] = array('name'=>'home_total', 'dsname'=>'total', 'dsfile'=>'hd.home.rrd', 'gType'=>'');
+$rrd_info['hd']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'boot', 'rpn_expr'=>'boot_used,boot_total,/,100,*',
+                                           'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Boot');
+$rrd_info['hd']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'root', 'rpn_expr'=>'root_used,root_total,/,100,*',
+                                           'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'Root');
+$rrd_info['hd']['graph']['rows'][] = array('dType'=>'CDEF', 'name'=>'home', 'rpn_expr'=>'home_used,home_total,/,100,*',
+                                           'gType'=>'LINE1', 'color'=>'#00E000', 'legend'=>'Home');
+// $rrd_info['hd.root']['graph']['units_length'] = 4;
+$rrd_info['hd']['graph']['label_y'] = '% Used';
+$rrd_info['hd']['graph']['units_exponent'] = 0;
+$rrd_info['hd']['graph']['units_length'] = 4;
+$rrd_info['hd']['graph']['min_y'] = 0;
+$rrd_info['hd']['graph']['max_y'] = 100;
+$rrd_info['hd']['graph']['fix_scale_y'] = true;
+// $rrd_info['hd']['graph']['force_recreate'] = true;
+$rrd_info['hd']['page']['show_update'] = false;
+
+// Every other HD config section copies from this definition
+$rrd_info['hd.root']['file'] = 'hd.root.rrd';
+$rrd_info['hd.root']['auto-update'] = true;
+$rrd_info['hd.root']['fields'][] = array('name' => 'used', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hd.root']['fields'][] = array('name' => 'total', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hd.new.root']['update'] =
+ 'function {
+    $sdata = explode("\n", `/bin/df -k -l`); $udata = array();
+    foreach ($sdata as $sline) {
+      if (preg_match("/(\d+)\s+(\d+)\s+\d+\s+\d+%\s+\/$/", $sline, $regs)) {
+        $udata = array("total"=>$regs[1], "used"=>$regs[2]);
+      }
+    }
+    return $udata;
+  }';
+$rrd_info['hd.root']['graph']['rows'][] = array('name'=>'used', 'gType'=>'AREA', 'color'=>'#00CC00', 'legend'=>'Used');
+$rrd_info['hd.root']['graph']['rows'][] = array('name'=>'total', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Available');
+// $rrd_info['hd.root']['graph']['units_length'] = 4;
+$rrd_info['hd.root']['graph']['label_y'] = 'Bytes';
+$rrd_info['hd.root']['graph']['units_binary'] = true;
+$rrd_info['hd.root']['graph']['scale'] = 1024;
+$rrd_info['hd.root']['graph']['min_y'] = 0;
+// $rrd_info['hd.root']['graph']['force_recreate'] = true;
+
+$rrd_info['hd.boot'] = $rrd_info['hd.root'];
+$rrd_info['hd.boot']['file'] = 'hd.boot.rrd';
+$rrd_info['hd.boot']['update'] =
+ 'function {
+    $sdata = explode("\n", `/bin/df -k -l`); $udata = array();
+    foreach ($sdata as $sline) {
+      if (preg_match("/(\d+)\s+(\d+)\s+\d+\s+\d+%\s+\/boot$/", $sline, $regs)) {
+        $udata = array("total"=>$regs[1], "used"=>$regs[2]);
+      }
+    }
+    return $udata;
+  }';
+// $rrd_info['hd.boot']['graph']['force_recreate'] = true;
+
+$rrd_info['hd.home'] = $rrd_info['hd.root'];
+$rrd_info['hd.home']['file'] = 'hd.home.rrd';
+$rrd_info['hd.home']['update'] =
+ 'function {
+    $sdata = explode("\n", `/bin/df -k -l`); $udata = array();
+    foreach ($sdata as $sline) {
+      if (preg_match("/(\d+)\s+(\d+)\s+\d+\s+\d+%\s+\/home$/", $sline, $regs)) {
+        $udata = array("total"=>$regs[1], "used"=>$regs[2]);
+      }
+    }
+    return $udata;
+  }';
+// $rrd_info['hd.home']['graph']['force_recreate'] = true;
+
+// BTRFS stats
+$rrd_info['hd.btrfs.root']['file'] = 'hd.btrfs.root.rrd';
+$rrd_info['hd.btrfs.root']['auto-update'] = true;
+$rrd_info['hd.btrfs.root']['fields'][] = array('name' => 'total', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hd.btrfs.root']['fields'][] = array('name' => 'used_bytes', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hd.btrfs.root']['fields'][] = array('name' => 'used_fs', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hd.btrfs.root']['update'] =
+ 'function {
+    $sdata = explode("\n", `btrfs fi show f00dbeef-f51d-b33f-f00d-beeff00df51d`);
+    $udata = array("total"=>null,"used_bytes"=>null,"used_fs"=>null);
+    $hdata = array("total"=>null,"used_bytes"=>null,"used_fs"=>null);
+    foreach ($sdata as $sline) {
+      if (preg_match("/\s+devid\s+1\ssize\s([\d\.]+(?:GiB|MiB|KiB|B))\sused\s([\d\.]+(?:GiB|MiB|KiB|B))\spath\s\//", $sline, $regs)) {
+        $hdata["total"] = $regs[1]; $hdata["used_fs"] = $regs[2]; }
+      if (preg_match("/\s+Total\sdevices\s1\sFS\sbytes\sused\s([\d\.]+(?:GiB|MiB|KiB|B))/", $sline, $regs)) { $hdata["used_bytes"] = $regs[1]; }
+    }
+    foreach ($hdata as $key=>$sizestring) {
+      if (preg_match("/^([\d\.]+)(GiB|MiB|KiB|B)$/", $sizestring, $regs)) {
+        if ($regs[2] == "GiB") { $udata[$key] = $regs[1] * 1024 * 1024 * 1024; }
+        elseif ($regs[2] == "MiB") { $udata[$key] = $regs[1] * 1024 * 1024; }
+        elseif ($regs[2] == "KiB") { $udata[$key] = $regs[1] * 1024; }
+        elseif ($regs[2] == "B") { $udata[$key] = $regs[1]; }
+      }
+    }
+    return $udata;
+  }';
+$rrd_info['hd.btrfs.root']['graph']['rows'][] = array('name'=>'used_fs', 'gType'=>'AREA', 'color'=>'#FF8080', 'legend'=>'Used/FS');
+$rrd_info['hd.btrfs.root']['graph']['rows'][] = array('name'=>'used_bytes', 'gType'=>'AREA', 'color'=>'#00CC00', 'legend'=>'Used/Bytes');
+$rrd_info['hd.btrfs.root']['graph']['rows'][] = array('name'=>'total', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Total');
+// $rrd_info['hd.btrfs.root']['graph']['units_length'] = 4;
+$rrd_info['hd.btrfs.root']['graph']['label_y'] = 'Bytes';
+$rrd_info['hd.btrfs.root']['graph']['units_binary'] = true;
+$rrd_info['hd.btrfs.root']['graph']['min_y'] = 0;
+// $rrd_info['hd.btrfs.root']['graph']['force_recreate'] = true;
+
+$rrd_info['hdd.smart.rotdisk']['file'] = 'hdd.smart.rotdisk.rrd';
+$rrd_info['hdd.smart.rotdisk']['auto-update'] = true;
+$rrd_info['hdd.smart.rotdisk']['fields'][] = array('name' => 'load_cycle', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hdd.smart.rotdisk']['fields'][] = array('name' => 'start_stop', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hdd.smart.rotdisk']['fields'][] = array('name' => 'power_cycle', 'type' => 'COUNTER', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hdd.smart.rotdisk']['fields'][] = array('name' => 'temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['hdd.smart.rotdisk']['update'] =
+ 'function {
+    $sdata = explode("\n", `smartctl -A /dev/disk/by-id/ata-WHATEVER-THE_DISK-ID`);
+    $udata = array("load_cycle"=>null,"start_stop"=>null,"power_cycle"=>null,"temp"=>null);
+    foreach ($sdata as $sline) {
+      if (preg_match("/Load_Cycle_Count\s.+-\s+([\d]+)/", $sline, $regs)) { $udata["load_cycle"] = $regs[1]; }
+      if (preg_match("/Start_Stop_Count\s.+-\s+([\d]+)/", $sline, $regs)) { $udata["start_stop"] = $regs[1]; }
+      if (preg_match("/Power_Cycle_Count\s.+-\s+([\d]+)/", $sline, $regs)) { $udata["power_cycle"] = $regs[1]; }
+      if (preg_match("/Temperature_Celsius\s.+-\s+([\d\.]+)/", $sline, $regs)) { $udata["temp"] = $regs[1]; }
+    }
+    return $udata;
+  }';
+$rrd_info['hdd.smart.rotdisk']['graph']['rows'][] = array('name'=>'load_cycle', 'gType'=>'LINE1', 'color'=>'#000000',
+                                                      'legend'=>'Load cycle');
+$rrd_info['hdd.smart.rotdisk']['graph']['rows'][] = array('name'=>'start_stop', 'gType'=>'LINE1', 'color'=>'#0000FF',
+                                                      'legend'=>'Start-Stop');
+$rrd_info['hdd.smart.rotdisk']['graph']['rows'][] = array('name'=>'power_cycle', 'gType'=>'LINE1', 'color'=>'#008000',
+                                                       'legend'=>'Power cycle');
+$rrd_info['hdd.smart.rotdisk']['graph']['rows'][] = array('name'=>'temp', 'gType'=>'LINE1', 'color'=>'#FF0000',
+                                                       'legend'=>'Temperature');
+$rrd_info['hdd.smart.rotdisk']['graph']['units_length'] = 4;
+$rrd_info['hdd.smart.rotdisk']['graph']['label_y'] = 'units';
+// $rrd_info['hdd.smart.rotdisk']['graph']['max_y'] = 13;
+// $rrd_info['hdd.smart.rotdisk']['graph']['min_y'] = -13;
+// $rrd_info['hdd.smart.rotdisk']['graph']['force_recreate'] = true;
+
+// SNMP interfaces
+$rrd_info['eth0']['file'] = 'net.eth0.rrd';
+$rrd_info['eth0']['auto-update'] = true;
+$rrd_info['eth0']['fields'][] = array('name'=>'incoming', 'type'=>'COUNTER',
+ 'heartbeat'=>600, 'min'=>'U', 'max'=>'U', 'update'=>'snmp-if:eth0:in', 'legend'=>'Incoming');
+$rrd_info['eth0']['fields'][] = array('name'=>'outgoing', 'type'=>'COUNTER',
+ 'heartbeat'=>600, 'min'=>'U', 'max'=>'U', 'update'=>'snmp-if:eth0:out', 'legend'=>'Outgoing');
+$rrd_info['eth0']['graph']['label_y'] = 'Bytes per second';
+// $rrd_info['eth0']['graph']['force_recreate'] = true;
+
+$rrd_info['connect']['file'] = 'net.connect.rrd';
+$rrd_info['connect']['auto-update'] = true;
+$rrd_info['connect']['fields'][] = array('name' => 'listen', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['connect']['fields'][] = array('name' => 'run_http', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['connect']['fields'][] = array('name' => 'run_other', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['connect']['fields'][] = array('name' => 'rest_http', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['connect']['fields'][] = array('name' => 'rest_other', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['connect']['fields'][] = array('name' => 'udp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['connect']['update'] =
+ 'function {
+    $sdata = explode("\n", `LANG=C /bin/netstat -n -a`);
+    $udata = array("listen"=>0,"run_http"=>0,"run_other"=>0,"rest_http"=>0,"rest_other"=>0,"udp"=>0);
+    foreach ($sdata as $sline) {
+      if (substr($sline, 0, 3) == "tcp") {
+        if (preg_match("/LISTEN\s*$/", $sline)) { $udata["listen"]++; }
+        elseif (preg_match("/:(80|443)\s+[\d\.:*]+\s+ESTABLISHED\s*/", $sline)) { $udata["run_http"]++; }
+        elseif (preg_match("/^tcp\s+\d+\s+\d+\s+[\d\.]+:(80|443)/", $sline)) { $udata["rest_http"]++; }
+        elseif (preg_match("/ESTABLISHED\s*$/", $sline)) { $udata["run_other"]++; }
+        else { $udata["rest_other"]++; }
+      }
+      elseif (substr($sline, 0, 3) == "udp") { $udata["udp"]++; }
+    }
+    return $udata;
+  }';
+$rrd_info['connect']['graph']['rows'][] = array('name'=>'listen', 'gType'=>'AREA', 'color'=>'#CCCCCC', 'color_bg'=>'#606060',
+  'legend'=>'LISTEN', 'legend_long'=>'LISTEN-Verbindungen');
+$rrd_info['connect']['graph']['rows'][] = array('name'=>'run_http', 'gType'=>'AREA', 'color'=>'#0000FF',
+  'legend'=>'HTTPconn', 'legend_long'=>'Aktive HTTP-Verbindungen', 'stack'=>true);
+$rrd_info['connect']['graph']['rows'][] = array('name'=>'rest_http', 'gType'=>'AREA', 'color'=>'#8080FF',
+  'legend'=>'HTTPwait', 'legend_long'=>'Wartende HTTP-Verbindungen', 'stack'=>true);
+$rrd_info['connect']['graph']['rows'][] = array('name'=>'run_other', 'gType'=>'AREA', 'color'=>'#FF0000',
+  'legend'=>'TCPconn', 'legend_long'=>'Aktive TCP-Verbindungen (auÃer HTTP)', 'stack'=>true);
+$rrd_info['connect']['graph']['rows'][] = array('name'=>'rest_other', 'gType'=>'AREA', 'color'=>'#FF8080',
+  'legend'=>'TCPwait', 'legend_long'=>'Wartende TCP-Verbindungen (auÃer HTTP)', 'stack'=>true);
+$rrd_info['connect']['graph']['rows'][] = array('name'=>'udp', 'gType'=>'AREA', 'color'=>'#00CC00',
+  'legend'=>'UDP', 'legend_long'=>'UDP-Verbindungen', 'stack'=>true);
+$rrd_info['connect']['graph']['units_length'] = 4;
+$rrd_info['connect']['graph']['label_y'] = 'Network Sockets';
+$rrd_info['connect']['graph']['min_y'] = 0;
+// $rrd_info['connect']['graph']['force_recreate'] = true;
+
+$rrd_info['process']['file'] = 'system.process.rrd';
+$rrd_info['process']['auto-update'] = true;
+$rrd_info['process']['fields'][] = array('name' => 'ps_httpd', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['process']['fields'][] = array('name' => 'ps_other', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['process']['fields'][] = array('name' => 'psnum', 'type' => 'DERIVE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['process']['update'] =
+ 'function {
+    $sdata = explode("\n", `LANG=C /bin/ps -e`);
+    $udata = array("ps_httpd"=>0,"ps_other"=>0);
+    foreach ($sdata as $sline) {
+      if (strpos($sline, "httpd-prefork")) { $udata["ps_httpd"]++; }
+      else { $udata["ps_other"]++; }
+    }
+    $udata["psnum"] = posix_getpid();
+    return $udata;
+  }';
+$rrd_info['process']['graph']['rows'][] = array('name'=>'ps_httpd', 'gType'=>'AREA', 'color'=>'#0000FF', 'legend'=>'HTTP');
+$rrd_info['process']['graph']['rows'][] = array('name'=>'ps_other', 'gType'=>'AREA', 'color'=>'#FF0000', 'legend'=>'other', 'stack'=>true);
+$rrd_info['process']['graph']['rows'][] = array('name'=>'psnum', 'scale'=>3.6, 'gType'=>'LINE1', 'color'=>'#00CC00', 'legend'=>'k ps/hour');
+$rrd_info['process']['graph']['label_y'] = 'Processes';
+$rrd_info['process']['graph']['min_y'] = 0;
+// $rrd_info['process']['graph']['force_recreate'] = true;
+$rrd_info['process']['graph.ps']['rows'][] = array('name'=>'ps_httpd', 'gType'=>'AREA', 'color'=>'#0000FF', 'legend'=>'HTTP');
+$rrd_info['process']['graph.ps']['rows'][] = array('name'=>'ps_other', 'gType'=>'AREA', 'color'=>'#FF0000', 'legend'=>'other', 'stack'=>true);
+$rrd_info['process']['graph.ps']['label_y'] = 'Processes';
+$rrd_info['process']['graph.ps']['min_y'] = 0;
+// $rrd_info['process']['graph.ps']['force_recreate'] = true;
+$rrd_info['process']['page.ps']['graph_sub'] = 'ps';
+$rrd_info['process']['graph.pi']['rows'][] = array('name'=>'psnum', 'scale'=>3600, 'gType'=>'LINE1', 'color'=>'#000000', 'legend'=>'started processes per hour');
+$rrd_info['process']['graph.pi']['label_y'] = '';
+$rrd_info['process']['graph.pi']['min_y'] = 0;
+// $rrd_info['process']['graph.pi']['force_recreate'] = true;
+$rrd_info['process']['page.pi']['graph_sub'] = 'pi';
+
+$rrd_info['temp']['graph-only'] = true;
+$rrd_info['temp']['graph']['rows'][] = array('name'=>'core0_temp', 'dsfile'=>'cpu.coretemp.rrd', 'gType'=>'LINE1',
+                                             'color'=>'#606060', 'legend'=>'C0', 'legend_long'=>'CPU Core 0 internal sensor');
+$rrd_info['temp']['graph']['rows'][] = array('name'=>'core1_temp', 'dsfile'=>'cpu.coretemp.rrd', 'gType'=>'LINE1',
+                                             'color'=>'#808080', 'legend'=>'C1', 'legend_long'=>'CPU Core 1 internal sensor');
+$rrd_info['temp']['graph']['rows'][] = array('name'=>'core2_temp', 'dsfile'=>'cpu.coretemp.rrd', 'gType'=>'LINE1',
+                                             'color'=>'#A0A0A0', 'legend'=>'C2', 'legend_long'=>'CPU Core 2 internal sensor');
+$rrd_info['temp']['graph']['rows'][] = array('name'=>'core3_temp', 'dsfile'=>'cpu.coretemp.rrd', 'gType'=>'LINE1',
+                                             'color'=>'#C0C0C0', 'legend'=>'C3', 'legend_long'=>'CPU Core 3 internal sensor');
+$rrd_info['temp']['graph']['rows'][] = array('name'=>'cpu_temp', 'dsfile'=>'sensors.temp.rrd', 'gType'=>'LINE1',
+                                             'color'=>'#000000', 'legend'=>'CPU', 'legend_long'=>'CPU sensor');
+$rrd_info['temp']['graph']['rows'][] = array('name'=>'mb_temp', 'dsfile'=>'sensors.temp.rrd', 'gType'=>'LINE1',
+                                             'color'=>'#008000', 'legend'=>'SYS', 'legend_long'=>'Mainboard/system sensor');
+$rrd_info['temp']['graph']['rows'][] = array('name'=>'rotdisk_temp', 'dsname'=>'temp', 'dsfile'=>'hdd.smart.rotdisk.rrd', 'gType'=>'LINE1',
+                                             'color'=>'#FFB000', 'legend'=>'WDblack', 'legend_long'=>'Harddisk');
+$rrd_info['temp']['graph']['label_y'] = 'Â°C';
+$rrd_info['temp']['graph']['units_exponent'] = 0;
+$rrd_info['temp']['graph']['units_length'] = 4;
+//$rrd_info['temp']['graph']['min_y'] = 0;
+//$rrd_info['temp']['graph']['max_y'] = 100;
+//$rrd_info['temp']['graph']['fix_scale_y'] = true;
+// $rrd_info['temp']['graph']['force_recreate'] = true;
+$rrd_info['temp']['page']['show_update'] = false;
+
+$rrd_info['ping.gateway']['file'] = 'net.ping.gateway.rrd';
+$rrd_info['ping.gateway']['auto-update'] = true;
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'single_min', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'single_avg', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'single_max', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'single_loss', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 100);
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'flood_min', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'flood_avg', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'flood_max', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 'U');
+$rrd_info['ping.gateway']['fields'][] = array('name' => 'flood_loss', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 0, 'max' => 100);
+$rrd_info['ping.gateway']['update'] =
+ 'function {
+    $pinghost = "10.0.0.1"; $pingnum = 20;
+    $sdata = array();
+    $sdata["single"] = explode("\n", `LANG=C /usr/bin/ping -q -c $pingnum -w 90 $pinghost 2>/dev/null`);
+    $sdata["flood"] = explode("\n", `LANG=C /usr/bin/ping -qf -c $pingnum -w 30 $pinghost 2>/dev/null`);
+    $udata = array("single_min"=>0,"single_avg"=>0,"single_max"=>0,"single_loss"=>100,
+                  "flood_min"=>0,"flood_avg"=>0,"flood_max"=>0,"flood_loss"=>100);
+    foreach (array("single","flood") as $mode) {
+      foreach ($sdata[$mode] as $sline) {
+        if (preg_match("/(\d+)% (?:packet )?loss/", $sline, $regs)) { $udata[$mode."_loss"] = $regs[1]; }
+        elseif (preg_match("/min\/avg\/max(?:\/mdev)? = ([\d\.]+)\/([\d\.]+)\/([\d\.]+)(?:\/[\d\.]+)? ms/", $sline, $regs)) {
+          $udata[$mode."_min"] = $regs[1]/1000; $udata[$mode."_avg"] = $regs[2]/1000; $udata[$mode."_max"] = $regs[3]/1000;
+        }
+      }
+    }
+    return $udata;
+  }';
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'flood_min', 'gType'=>'LINE1', 'color'=>'#80FF80', 'legend'=>'f:min/max', 'desc'=>'f:min');
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'flood_max', 'gType'=>'LINE1', 'color'=>'#80FF80', 'desc'=>'f:max');
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'single_min', 'gType'=>'LINE1', 'color'=>'#CCCCFF', 'legend'=>'s:min/max', 'desc'=>'s:min');
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'single_max', 'gType'=>'LINE1', 'color'=>'#CCCCFF', 'desc'=>'s:max');
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'flood_avg', 'gType'=>'LINE1', 'color'=>'#008000', 'legend'=>'f:avg');
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'single_avg', 'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'s:avg');
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'flood_loss', 'scale'=>0.001, 'gType'=>'LINE1', 'color'=>'#000000', 'legend'=>'f:mloss');
+$rrd_info['ping.gateway']['graph']['rows'][] = array('name'=>'single_loss', 'scale'=>0.001, 'gType'=>'LINE1', 'color'=>'#FF0000', 'legend'=>'s:mloss');
+$rrd_info['ping.gateway']['graph']['label_y'] = 'Seconds';
+$rrd_info['ping.gateway']['graph']['min_y'] = 0;
+// $rrd_info['ping.gateway']['graph']['force_recreate'] = true;
+$rrd_info['ping.gateway']['page']['text_intro'] = 'Alternate graphs: <a href="?stat=ping.gateway">totals</a>, <a href="?stat=ping.gateway&sub=avg">averages</a>.';
+$rrd_info['ping.gateway']['graph.avg']['rows'][] = array('name'=>'flood_avg', 'gType'=>'LINE1', 'color'=>'#008000',
+ 'legend'=>'f:avg', 'legend_long'=>'Flood ping: average time (of 20 parallel pings)');
+$rrd_info['ping.gateway']['graph.avg']['rows'][] = array('name'=>'single_avg', 'gType'=>'LINE1', 'color'=>'#0000FF',
+ 'legend'=>'s:avg', 'legend_long'=>'Single ping: average time (of 20 sequential pings, 1s gap)');
+$rrd_info['ping.gateway']['graph.avg']['rows'][] = array('name'=>'flood_loss', 'scale'=>0.001, 'gType'=>'LINE1', 'color'=>'#000000',
+ 'legend'=>'f:mloss', 'legend_long'=>'Flood ping: packet loss (percent of 20 parallel pings)');
+$rrd_info['ping.gateway']['graph.avg']['rows'][] = array('name'=>'single_loss', 'scale'=>0.001, 'gType'=>'LINE1', 'color'=>'#FF0000',
+ 'legend'=>'s:mloss', 'legend_long'=>'Single ping: packet loss (percent of 20 sequential pings, 1s gap)');
+$rrd_info['ping.gateway']['graph.avg']['label_y'] = 'Seconds';
+$rrd_info['ping.gateway']['graph.avg']['min_y'] = 0;
+$rrd_info['ping.gateway']['page.avg']['graph_sub'] = 'avg';
+
+// mainboard sensors
+$rrd_info['sensors.power']['file'] = 'sensors.power.rrd';
+$rrd_info['sensors.power']['auto-update'] = true;
+$rrd_info['sensors.power']['fields'][] = array('name' => 'vcore', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'p3x3v', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'p5v', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'p12v', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'avcc', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'vsb', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'vbat', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'memvcc', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'pchvcc', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['fields'][] = array('name' => 'vid', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.power']['update'] =
+ 'function {
+    $sdata = explode("\n", `/usr/bin/sensors -A mysensor-*`);
+    $udata = array("vcore"=>null,"p3x3v"=>null,"p5v"=>null,"p12v"=>null,
+                   "avcc"=>null,"vsb"=>null,"vbat"=>null,"memvcc"=>null,
+                   "pchvcc"=>null,"vid"=>null);
+    foreach ($sdata as $sline) {
+      if (preg_match("/^Vcore:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["vcore"] = $regs[1]; }
+      elseif (preg_match("/^\+3\.3V:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["p3x3v"] = $regs[1]; }
+      elseif (preg_match("/^\+5V:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["p5v"] = $regs[1]; }
+      elseif (preg_match("/^\+12V:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["p12v"] = $regs[1]; }
+      elseif (preg_match("/^AVCC:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["avcc"] = $regs[1]; }
+      elseif (preg_match("/^3VSB:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["vsb"] = $regs[1]; }
+      elseif (preg_match("/^Vbat:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["vbat"] = $regs[1]; }
+      elseif (preg_match("/^Memory Vcc:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["memvcc"] = $regs[1]; }
+      elseif (preg_match("/^PCH Vcc:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["pchvcc"] = $regs[1]; }
+      elseif (preg_match("/^cpu0_vid:\s+([+-]?[\d\.]+) V/", $sline, $regs)) { $udata["vid"] = $regs[1]; }
+    }
+    return $udata;
+  }';
+
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'vcore', 'gType'=>'LINE1', 'color'=>'#FF0000', 'legend'=>'VCore');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'p12v', 'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'+12V');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'p5v', 'gType'=>'LINE1', 'color'=>'#008000', 'legend'=>'+5V');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'p3x3v', 'gType'=>'LINE1', 'color'=>'#000000', 'legend'=>'+3.3V');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'avcc', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'AVCC');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'vsb', 'gType'=>'LINE1', 'color'=>'#8080FF', 'legend'=>'3VSB');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'vbat', 'gType'=>'LINE1', 'color'=>'#00CC00', 'legend'=>'VBat');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'memvcc', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Memory Vcc');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'pchvcc', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'PCH Vcc');
+$rrd_info['sensors.power']['graph']['rows'][] = array('name'=>'vid', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'CPU0-VID');
+$rrd_info['sensors.power']['graph']['units_length'] = 4;
+$rrd_info['sensors.power']['graph']['label_y'] = 'Volt';
+$rrd_info['sensors.power']['graph']['max_y'] = 13;
+$rrd_info['sensors.power']['graph']['min_y'] = 0;
+// $rrd_info['sensors.power']['graph']['force_recreate'] = true;
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'vcore_tmp', 'dsname'=>'vcore', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'p12v_tmp', 'dsname'=>'p12v', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'p5v_tmp', 'dsname'=>'p5v', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'p3x3v_tmp', 'dsname'=>'p3x3v', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'avcc_tmp', 'dsname'=>'vsb', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'vsb_tmp', 'dsname'=>'vsb', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'vbat_tmp', 'dsname'=>'vbat', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'memvcc_tmp', 'dsname'=>'memvcc', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'pchvcc_tmp', 'dsname'=>'pchvcc', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('name'=>'vid_tmp', 'dsname'=>'vid', 'gType'=>'');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'vcore',
+  'rpn_expr'=>'vcore_tmp,1,-', 'gType'=>'LINE1', 'color'=>'#FF0000', 'legend'=>'VCore');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'p3x3v',
+  'rpn_expr'=>'p3x3v_tmp,3.3,-', 'gType'=>'LINE1', 'color'=>'#000000', 'legend'=>'+3.3V');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'p5v',
+  'rpn_expr'=>'p5v_tmp,5,-', 'gType'=>'LINE1', 'color'=>'#008000', 'legend'=>'+5V');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'p12v',
+  'rpn_expr'=>'p12v_tmp,12,-', 'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'+12V');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'avcc',
+  'rpn_expr'=>'avcc_tmp,3.3,-', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'AVCC');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'vsb',
+  'rpn_expr'=>'vsb_tmp,3.3,-', 'gType'=>'LINE1', 'color'=>'#8080FF', 'legend'=>'3VSB');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'vbat',
+  'rpn_expr'=>'vbat_tmp,3.3,-', 'gType'=>'LINE1', 'color'=>'#00CC00', 'legend'=>'VBat');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'memvcc',
+  'rpn_expr'=>'memvcc_tmp,1.5,-', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Memory Vcc');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'pchvcc',
+  'rpn_expr'=>'pchvcc_tmp,1,-', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'PCH Vcc');
+$rrd_info['sensors.power']['graph.rel']['rows'][] = array('dType'=>'CDEF', 'name'=>'vid',
+  'rpn_expr'=>'vid_tmp,2,-', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'CPU0-VID');
+$rrd_info['sensors.power']['graph.rel']['units_length'] = 5;
+$rrd_info['sensors.power']['graph.rel']['units_exponent'] = 0;
+$rrd_info['sensors.power']['graph.rel']['label_y'] = 'Volts (diff)';
+$rrd_info['sensors.power']['graph.rel']['max_y'] = +0.3;
+$rrd_info['sensors.power']['graph.rel']['min_y'] = -0.7;
+// $rrd_info['sensors.power']['graph.rel']['force_recreate'] = true;
+$rrd_info['sensors.power']['page.rel']['graph_sub'] = 'rel';
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'vcore_tmp', 'dsname'=>'vcore', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'p12v_tmp', 'dsname'=>'p12v', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'p5v_tmp', 'dsname'=>'p5v', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'p3x3v_tmp', 'dsname'=>'p3x3v', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'avcc_tmp', 'dsname'=>'vsb', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'vsb_tmp', 'dsname'=>'vsb', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'vbat_tmp', 'dsname'=>'vbat', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'memvcc_tmp', 'dsname'=>'memvcc', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'pchvcc_tmp', 'dsname'=>'pchvcc', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('name'=>'vid_tmp', 'dsname'=>'vid', 'gType'=>'');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'vcore',
+  'rpn_expr'=>'vcore_tmp,1,-,1,/,100,*', 'gType'=>'LINE1', 'color'=>'#FF0000', 'legend'=>'VCore');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'p3x3v',
+  'rpn_expr'=>'p3x3v_tmp,3.3,-,3.3,/,100,*', 'gType'=>'LINE1', 'color'=>'#000000', 'legend'=>'+3.3V');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'p5v',
+  'rpn_expr'=>'p5v_tmp,5,-,5,/,100,*', 'gType'=>'LINE1', 'color'=>'#008000', 'legend'=>'+5V');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'p12v',
+  'rpn_expr'=>'p12v_tmp,12,-,12,/,100,*', 'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'+12V');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'avcc',
+  'rpn_expr'=>'avcc_tmp,3.3,-,3.3,/,100,*', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'AVCC');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'vsb',
+  'rpn_expr'=>'vsb_tmp,3.3,-,3.3,/,100,*', 'gType'=>'LINE1', 'color'=>'#8080FF', 'legend'=>'3VSB');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'vbat',
+  'rpn_expr'=>'vbat_tmp,3.3,-,3.3,/,100,*', 'gType'=>'LINE1', 'color'=>'#00CC00', 'legend'=>'VBat');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'memvcc',
+  'rpn_expr'=>'memvcc_tmp,1.5,-,1.5,/,100,*', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'Memory Vcc');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'pchvcc',
+  'rpn_expr'=>'pchvcc_tmp,1,-,1,/,100,*', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'PCH Vcc');
+$rrd_info['sensors.power']['graph.relpct']['rows'][] = array('dType'=>'CDEF', 'name'=>'vid',
+  'rpn_expr'=>'vid_tmp,2,-,2,/,100,*', 'gType'=>'LINE1', 'color'=>'#808080', 'legend'=>'CPU0-VID');
+$rrd_info['sensors.power']['graph.relpct']['units_length'] = 5;
+$rrd_info['sensors.power']['graph.relpct']['units_exponent'] = 0;
+$rrd_info['sensors.power']['graph.relpct']['label_y'] = 'diff%';
+$rrd_info['sensors.power']['graph.relpct']['max_y'] = +2;
+$rrd_info['sensors.power']['graph.relpct']['min_y'] = -6;
+// $rrd_info['sensors.power']['graph.relpct']['force_recreate'] = true;
+$rrd_info['sensors.power']['page.relpct']['graph_sub'] = 'relpct';
+
+$rrd_info['sensors.fan']['file'] = 'sensors.fan.rrd';
+$rrd_info['sensors.fan']['auto-update'] = true;
+$rrd_info['sensors.fan']['fields'][] = array('name' => 'cpu_fan', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.fan']['fields'][] = array('name' => 'chassis_fan', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.fan']['fields'][] = array('name' => 'power_fan', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.fan']['update'] =
+ 'function {
+    $sdata = explode("\n", str_replace(":\n", ": ", `/usr/bin/sensors -A mysensor-*`));
+    $udata = array("cpu_fan"=>null,"chassis_fan"=>null,"power_fan"=>null);
+    foreach ($sdata as $sline) {
+      if (preg_match("/^fan2:\s+([+-]?\d+) RPM/", $sline, $regs)) { $udata["cpu_fan"] = $regs[1]; }
+      elseif (preg_match("/^CHASSIS1 FAN Speed:\s+([+-]?\d+) RPM/", $sline, $regs)) { $udata["chassis_fan"] = $regs[1]; }
+      elseif (preg_match("/^POWER FAN Speed:\s+([+-]?\d+) RPM/", $sline, $regs)) { $udata["power_fan"] = $regs[1]; }
+    }
+    return $udata;
+  }';
+$rrd_info['sensors.fan']['graph']['rows'][] = array('name'=>'cpu_fan', 'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'CPU Fan');
+$rrd_info['sensors.fan']['graph']['rows'][] = array('name'=>'chassis_fan', 'gType'=>'LINE1', 'color'=>'#00CC00', 'legend'=>'GPU Fan');
+$rrd_info['sensors.fan']['graph']['label_y'] = 'Rotations/min';
+$rrd_info['sensors.fan']['graph']['max_y'] = 2000;
+$rrd_info['sensors.fan']['graph']['min_y'] = 500;
+// $rrd_info['sensors.fan']['graph']['force_recreate'] = true;
+
+$rrd_info['sensors.temp']['file'] = 'sensors.temp.rrd';
+$rrd_info['sensors.temp']['auto-update'] = true;
+$rrd_info['sensors.temp']['fields'][] = array('name' => 'cpu_temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.temp']['fields'][] = array('name' => 'mb_temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.temp']['fields'][] = array('name' => 'power_temp', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['sensors.temp']['update'] =
+ 'function {
+    $sdata = explode("\n", `/usr/bin/sensors -A mysensor-*`);
+    $udata = array("cpu_temp"=>null,"mb_temp"=>null,"power_temp"=>null);
+    foreach ($sdata as $sline) {
+      if (preg_match("/^CPUTIN:\s+([+-]?[\d\.]+).+?C/i", $sline, $regs)) { $udata["cpu_temp"] = $regs[1]; }
+      elseif (preg_match("/^SYSTIN:\s+([+-]?[\d\.]+).+?C/i", $sline, $regs)) { $udata["mb_temp"] = $regs[1]; }
+      elseif (preg_match("/^AUXTIN:\s+([+-]?[\d\.]+).+?C/i", $sline, $regs)) { $udata["power_temp"] = $regs[1]; }
+    }
+    return $udata;
+  }';
+$rrd_info['sensors.temp']['graph']['rows'][] = array('name'=>'cpu_temp', 'gType'=>'LINE1', 'color'=>'#0000FF', 'legend'=>'CPU Temp');
+$rrd_info['sensors.temp']['graph']['rows'][] = array('name'=>'mb_temp', 'gType'=>'LINE1', 'color'=>'#008000', 'legend'=>'MB Temp');
+$rrd_info['sensors.temp']['graph']['label_y'] = 'Â°C';
+$rrd_info['sensors.temp']['graph']['max_y'] = 55;
+$rrd_info['sensors.temp']['graph']['min_y'] = 30;
+// $rrd_info['sensors.temp']['graph']['force_recreate'] = true;
+
+/* !!! be sure to call this one _last_ of all auto-update rrd stats */
+$rrd_info['rrdup']['file'] = 'test.rrdup.rrd';
+// $rrd_info['rrdup']['auto-update'] = true;
+$rrd_info['rrdup']['fields'][] = array('name' => 'usertime', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['rrdup']['fields'][] = array('name' => 'systime', 'type' => 'GAUGE', 'heartbeat' => 600, 'min' => 'U', 'max' => 'U');
+$rrd_info['rrdup']['update'] = 'function { $sdata = posix_times(); return array("usertime"=>$sdata["cutime"],"systime"=>$sdata["cstime"]); }';
+$rrd_info['rrdup']['graph']['rows'][] = array('name'=>'systime', 'gType'=>'AREA', 'color'=>'#FF0000', 'legend'=>'System CPU time');
+$rrd_info['rrdup']['graph']['rows'][] = array('name'=>'usertime', 'gType'=>'AREA', 'color'=>'#0000FF', 'legend'=>'User CPU time', 'stack'=>true);
+$rrd_info['rrdup']['graph']['scale'] = 0.01;
+$rrd_info['rrdup']['graph']['units_length'] = 4;
+$rrd_info['rrdup']['graph']['units_exponent'] = 0;
+$rrd_info['rrdup']['graph']['label_y'] = 'RRD update (seconds)';
+$rrd_info['rrdup']['graph']['min_y'] = 0;
+// $rrd_info['rrdup']['graph']['force_recreate'] = true;
+
+?>
diff --git a/testbed/rrd/rrd-stat.php b/examples/rrd/rrd-stat.php
similarity index 100%
rename from testbed/rrd/rrd-stat.php
rename to examples/rrd/rrd-stat.php
diff --git a/testbed/rrd/rrd-test.php b/examples/rrd/rrd-test.php
similarity index 100%
rename from testbed/rrd/rrd-test.php
rename to examples/rrd/rrd-test.php
diff --git a/testbed/rrd/rrd-update.php b/examples/rrd/rrd-update.php
similarity index 100%
rename from testbed/rrd/rrd-update.php
rename to examples/rrd/rrd-update.php
diff --git a/examples/rrd/rrdstat.php-class b/examples/rrd/rrdstat.php-class
new file mode 120000
index 0000000..acd47e6
--- /dev/null
+++ b/examples/rrd/rrdstat.php-class
@@ -0,0 +1 @@
+../../classes/rrdstat.php-class
\ No newline at end of file
diff --git a/examples/rrd/useragent.php-class b/examples/rrd/useragent.php-class
new file mode 120000
index 0000000..62d7edf
--- /dev/null
+++ b/examples/rrd/useragent.php-class
@@ -0,0 +1 @@
+../../classes/useragent.php-class
\ No newline at end of file
diff --git a/testbed/rrd/.gitignore b/testbed/rrd/.gitignore
deleted file mode 100644
index 0c88445..0000000
--- a/testbed/rrd/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.rrd
-coap.merkur2.xml
-graphs
-rrd-backup
-router.atm-mcast.xml
-router.atm-mgmt.xml
-router.atm.xml
-router.if1.xml
-router.if2.xml
-router.if3.xml
-router.if4.xml
-router.wlan.xml
-weather.te838.json
-weather.te838.week.json
-weather.te838.sqlite
-weather.te838.xml
-weather.te838.extra.xml
-weather.wien.zamg.rrd.xml
-weather.wien-hw.zamg.rrd.xml
diff --git a/testbed/rrd/rrdstat.php-class b/testbed/rrd/rrdstat.php-class
deleted file mode 120000
index 9f52251..0000000
--- a/testbed/rrd/rrdstat.php-class
+++ /dev/null
@@ -1 +0,0 @@
-../../include/classes/rrdstat.php-class
\ No newline at end of file
diff --git a/testbed/rrd/useragent.php-class b/testbed/rrd/useragent.php-class
deleted file mode 120000
index a0d2f69..0000000
--- a/testbed/rrd/useragent.php-class
+++ /dev/null
@@ -1 +0,0 @@
-../../include/classes/useragent.php-class
\ No newline at end of file
diff --git a/testbed/ua_list.php b/tests/ua_list.php
similarity index 100%
rename from testbed/ua_list.php
rename to tests/ua_list.php
diff --git a/testbed/ua_list_raw.txt b/tests/ua_list_raw.txt
similarity index 100%
rename from testbed/ua_list_raw.txt
rename to tests/ua_list_raw.txt
diff --git a/testbed/ua_test.php b/tests/ua_test.php
similarity index 100%
rename from testbed/ua_test.php
rename to tests/ua_test.php
-- 
2.43.0

From 0bbc241e7d4e54f0ff7efbc1a4deb4225bc90ec8 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Tue, 29 Nov 2016 17:59:01 +0100
Subject: [PATCH 13/16] COM elements have no place in the common class

---
 classes/document.php-class | 43 ++++----------------------------------
 1 file changed, 4 insertions(+), 39 deletions(-)

diff --git a/classes/document.php-class b/classes/document.php-class
index 41e817a..d2e9aff 100755
--- a/classes/document.php-class
+++ b/classes/document.php-class
@@ -140,10 +140,6 @@ class ExtendedDocument extends DOMDocument {
   //   appends an ExtendedDocument::createElementJSFile() as a child of this document (see there for params)
   //     returns the new child
   //
-  // public function appendCOMElement($module, $attributes)
-  //   appends an ExtendedDocument::createCOMElement() as a child of this document (see there for params)
-  //     returns the new child
-  //
   // public function createElementLink($target, [$value])
   //   returns an ExtendedElement that is an HTML <a> with the given target (href) and (optional) value
   //
@@ -210,10 +206,6 @@ class ExtendedDocument extends DOMDocument {
   //
   // public function createElementJSFile($jsURL)
   //   returns an ExtendedElement that is an HTML <script> of JavaScript type linking to the file given by the URL
-  //
-  // public function createCOMElement($module, $attributes)
-  //   returns an ExtendedElement that is in COM_NS namespace, with the given module as name and the
-  //     given name=>value array as attributes
 
   function __construct($version = '1.0', $encoding = 'utf-8') {
     // make sure the default DOMDocument constructor runs
@@ -318,9 +310,6 @@ class ExtendedDocument extends DOMDocument {
   public function appendJSFile($jsdata) {
     return $this->appendChild($this->createElementJSFile($jsdata));
   }
-  public function appendCOMElement($module, $attributes) {
-    return $this->appendChild($this->createCOMElement($module, $attributes));
-  }
 
   public function appendHTMLMarkup($htmldata, $parentNode = null) {
     if (is_null($parentNode)) { $parentNode =& $this; }
@@ -512,16 +501,6 @@ class ExtendedDocument extends DOMDocument {
     $jselem->setAttribute('src', $jsURL);
     return $jselem;
   }
-
-  public function createCOMElement($module, $attributes) {
-    $com_elem = $this->createElementNS(COM_NS, $module);
-    if (is_array($attributes) && count($attributes)) {
-      foreach ($attributes as $name=>$value) {
-        $com_elem->setAttribute($name, $value);
-      }
-    }
-    return $com_elem;
-  }
 }
 
 class ExtendedElement extends DOMElement {
@@ -633,12 +612,8 @@ class ExtendedElement extends DOMElement {
   //   appends an ExtendedDocument::createElementJS() as a child of this element (see there for params)
   //     NO return value!
   //
-  // public function appendCOMElement($module, $attributes)
-  //   appends an ExtendedDocument::createCOMElement() as a child of this element (see there for params)
-  //     returns the new child
-  //
-  // public function appendCOMElement($module, $attributes)
-  //   appends an ExtendedDocument::createCOMElement() as a child of this element (see there for params)
+  // public function appendJSFile($jsURL)
+  //   appends an ExtendedDocument::createElementJSFile() as a child of this element (see there for params)
   //     returns the new child
 
   public function appendElement($name, $value = '') {
@@ -725,9 +700,6 @@ class ExtendedElement extends DOMElement {
   public function appendJSFile($jsdata) {
     return $this->appendChild($this->ownerDocument->createElementJSFile($jsdata));
   }
-  public function appendCOMElement($module, $attributes) {
-    return $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
-  }
 }
 
 class ExtendedDocumentFragment extends DOMDocumentFragment {
@@ -839,12 +811,8 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   //   appends an ExtendedDocument::createElementJS() as a child of this fragment (see there for params)
   //     NO return value!
   //
-  // public function appendCOMElement($module, $attributes)
-  //   appends an ExtendedDocument::createCOMElement() as a child of this fragment (see there for params)
-  //     returns the new child
-  //
-  // public function appendCOMElement($module, $attributes)
-  //   appends an ExtendedDocument::createCOMElement() as a child of this fragment (see there for params)
+  // public function appendJSFile($jsURL)
+  //   appends an ExtendedDocument::createElementJSFile() as a child of this fragment (see there for params)
   //     returns the new child
 
   public function appendElement($name, $value = '') {
@@ -931,8 +899,5 @@ class ExtendedDocumentFragment extends DOMDocumentFragment {
   public function appendJSFile($jsdata) {
     return $this->appendChild($this->ownerDocument->createElementJSFile($jsdata));
   }
-  public function appendCOMElement($module, $attributes) {
-    return $this->appendChild($this->ownerDocument->createCOMElement($module, $attributes));
-  }
 }
 ?>
-- 
2.43.0

From 39814159acbecf57f7f6ddf0170e4f6bf701a3fa Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Tue, 29 Nov 2016 17:59:55 +0100
Subject: [PATCH 14/16] re-add the CSS file and rework the UA tests not to rely
 on outdated non-public includes

---
 tests/test.css    | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/ua_list.php | 22 +++++++-------
 tests/ua_test.php | 26 ++++++++++-------
 3 files changed, 101 insertions(+), 20 deletions(-)
 create mode 100755 tests/test.css

diff --git a/tests/test.css b/tests/test.css
new file mode 100755
index 0000000..7a26387
--- /dev/null
+++ b/tests/test.css
@@ -0,0 +1,73 @@
+/* general styles */
+
+body {
+/*  font-family: Arial,Helvetica,sans-serif; */
+  color: black;
+  font-size: medium;
+  margin: 3px;
+  padding: 0px;
+  border: 0px;
+  background-color: white;
+}
+
+h1 {
+  font-size: xx-large;
+  font-weight: bold;
+  text-align: center;
+}
+
+a:link { color: #0000EE; }
+a:visited { color: #551A8B; }
+a:active { color: #FF0000; }
+
+img {
+  border: 0px;
+}
+
+table {
+  color: black;
+  margin: 0px;
+  padding: 0px;
+  border: 0px;
+}
+
+td, th {
+  font-family: Arial,Helvetica,sans-serif;
+  color: black;
+  margin: 0px;
+  padding: 2px;
+  border: 0px;
+}
+
+th {
+  font-weight: bold;
+}
+
+table.border {
+  border: 1px solid #c0c0c0;
+}
+
+table.border td,
+table.border th {
+  border: 1px solid #c0c0c0;
+}
+
+#ualist th { font-size: 0.75em; }
+#ualist td.comment {
+  font-size: 0.75em;
+  text-align: center;
+  font-weight: bold;
+}
+#ualist td.ua { font-size: 0.75em; }
+
+
+
+/* other general elements */
+
+div#valid {
+  display: none;
+}
+
+div#copyright {
+  display: none;
+}
diff --git a/tests/ua_list.php b/tests/ua_list.php
index 3b417af..795c7ab 100644
--- a/tests/ua_list.php
+++ b/tests/ua_list.php
@@ -1,23 +1,22 @@
 <?php
-$inc_class_util = true;
-$inc_class_ua = true;
-include('inchandler.inc');
+include('../classes/useragent.php-class');
 
 // read string from this file
 $uafile = 'ua_list_raw.txt';
 
-$mycss = "th { font-size: 0.75em; }\n";
-$mycss .= "td.comment { font-size: 0.75em; text-align: center; font-weight: bold; }\n";
-$mycss .= "td.ua { font-size: 0.75em; }\n";
-
-$wrapper->pgtop('User Agents', $mycss);
+print("<!DOCTYPE html>\n");
+print("<html>\n<head>\n");
+print("  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n");
+print("  <link rel=\"stylesheet\" type=\"text/css\" href=\"test.css\">\n");
+print("  <title>".'User Agents'."</title>\n");
+print("</head>\n<body>\n");
 
 print('<h1>User Agents</h1>'."\n");
 
 $ualist = is_readable($uafile)?file($uafile):array();
 
 if (count($ualist)) {
-  print('<table class="border">'."\n");
+  print('<table class="border" id="ualist">'."\n");
   print(' <tr>'."\n");
   print('  <th>User Agent string</th>'."\n");
   print('  <th>Brand</th>'."\n");
@@ -61,5 +60,8 @@ else {
   print('No User Agent strings found in file "'.$uafile.'".'."\n");
 }
 
-$wrapper->pgbottom();
+print("<div id=\"copyright\">\n");
+print("Page code under Mozilla Public License, code available at <a href=\"https://github.com/KaiRo-at/php-utility-classes\">GitHub</a>.\n");
+print("</div>\n");
+print("</body></html>\n");
 ?>
diff --git a/tests/ua_test.php b/tests/ua_test.php
index 97309b3..95234d9 100644
--- a/tests/ua_test.php
+++ b/tests/ua_test.php
@@ -1,22 +1,24 @@
 <?php
-$inc_class_util = true;
-$inc_class_ua = true;
-include("inchandler.inc");
-
-$wrapper->pgtop("KaiRo's Browser-Test");
+include('../classes/useragent.php-class');
 
 // set default time zone - right now, always the one the server is in!
 date_default_timezone_set('Europe/Vienna');
 
-$httpvars = $util->getHTTPvars();
-if (strlen($httpvars["ua"])) {
-  $ua = new userAgent($httpvars["ua"]);
+print("<!DOCTYPE html>\n");
+print("<html>\n<head>\n");
+print("  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">\n");
+print("  <link rel=\"stylesheet\" type=\"text/css\" href=\"test.css\">\n");
+print("  <title>".'User Agent Test'."</title>\n");
+print("</head>\n<body>\n");
+
+if (strlen($_REQUEST["ua"])) {
+  $ua = new userAgent($_REQUEST["ua"]);
 }
 else {
   $ua = new userAgent;
 }
 
-print("<h1>KaiRo's Browser-Test</h1>\n");
+print("<h1>User Agent Test</h1>\n");
 
 print("I read the following user agent string from ".(strlen($httpvars["ua"])?"your input":"your browser").":\n<br>");
 print("<b>".$ua->getUAString()."</b>\n");
@@ -44,5 +46,9 @@ print("<br><br>Test the following UA string (leave empty to read it from your br
 print("<form method=\"POST\" action=\"\"><p>\n");
 print("<input type=\"text\" name=\"ua\" value=\"".htmlentities($ua->getUAString())."\" size=\"80\" maxlength=\"150\">\n");
 print("<br><input type=\"submit\" value=\"Test\"></p></form>\n");
-$wrapper->pgbottom();
+
+print("<div id=\"copyright\">\n");
+print("Page code under Mozilla Public License, code available at <a href=\"https://github.com/KaiRo-at/php-utility-classes\">GitHub</a>.\n");
+print("</div>\n");
+print("</body></html>\n");
 ?>
-- 
2.43.0

From 0e9e43d346d32e6519522f360dce504a0c68c228 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Tue, 29 Nov 2016 18:14:19 +0100
Subject: [PATCH 15/16] add a LICENSE and a README to things are all nice at
 GitHub :)

---
 LICENSE   | 362 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md |  11 ++
 2 files changed, 373 insertions(+)
 create mode 100644 LICENSE
 create mode 100644 README.md

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..be2cc4d
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,362 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the terms of
+        a Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a
+     separate file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether
+     at the time of the initial grant or subsequently, any and all of the
+     rights conveyed by this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method,
+      process, and apparatus claims, in any patent Licensable by such
+      Contributor that would be infringed, but for the grant of the License,
+      by the making, using, selling, offering for sale, having made, import,
+      or transfer of either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or
+        as part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its
+        Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution
+     become effective for each Contribution on the date the Contributor first
+     distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under
+     this License. No additional rights or licenses will be implied from the
+     distribution or licensing of Covered Software under this License.
+     Notwithstanding Section 2.1(b) above, no patent license is granted by a
+     Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party's
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of
+        its Contributions.
+
+     This License does not grant any rights in the trademarks, service marks,
+     or logos of any Contributor (except as may be necessary to comply with
+     the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this
+     License (see Section 10.2) or under the terms of a Secondary License (if
+     permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its
+     Contributions are its original creation(s) or it has sufficient rights to
+     grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under
+     applicable copyright doctrines of fair use, fair dealing, or other
+     equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under
+     the terms of this License. You must inform recipients that the Source
+     Code Form of the Covered Software is governed by the terms of this
+     License, and how they can obtain a copy of this License. You may not
+     attempt to alter or restrict the recipients' rights in the Source Code
+     Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this
+        License, or sublicense it under different terms, provided that the
+        license for the Executable Form does not attempt to limit or alter the
+        recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for
+     the Covered Software. If the Larger Work is a combination of Covered
+     Software with a work governed by one or more Secondary Licenses, and the
+     Covered Software is not Incompatible With Secondary Licenses, this
+     License permits You to additionally distribute such Covered Software
+     under the terms of such Secondary License(s), so that the recipient of
+     the Larger Work may, at their option, further distribute the Covered
+     Software under the terms of either this License or such Secondary
+     License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices
+     (including copyright notices, patent notices, disclaimers of warranty, or
+     limitations of liability) contained within the Source Code Form of the
+     Covered Software, except that You may alter any license notices to the
+     extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on
+     behalf of any Contributor. You must make it absolutely clear that any
+     such warranty, support, indemnity, or liability obligation is offered by
+     You alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute,
+   judicial order, or regulation then You must: (a) comply with the terms of
+   this License to the maximum extent possible; and (b) describe the
+   limitations and the code they affect. Such description must be placed in a
+   text file included with all distributions of the Covered Software under
+   this License. Except to the extent prohibited by statute or regulation,
+   such description must be sufficiently detailed for a recipient of ordinary
+   skill to be able to understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing
+     basis, if such Contributor fails to notify You of the non-compliance by
+     some reasonable means prior to 60 days after You have come back into
+     compliance. Moreover, Your grants from a particular Contributor are
+     reinstated on an ongoing basis if such Contributor notifies You of the
+     non-compliance by some reasonable means, this is the first time You have
+     received notice of non-compliance with this License from such
+     Contributor, and You become compliant prior to 30 days after Your receipt
+     of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions,
+     counter-claims, and cross-claims) alleging that a Contributor Version
+     directly or indirectly infringes any patent, then the rights granted to
+     You by any and all Contributors for the Covered Software under Section
+     2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis,
+   without warranty of any kind, either expressed, implied, or statutory,
+   including, without limitation, warranties that the Covered Software is free
+   of defects, merchantable, fit for a particular purpose or non-infringing.
+   The entire risk as to the quality and performance of the Covered Software
+   is with You. Should any Covered Software prove defective in any respect,
+   You (not any Contributor) assume the cost of any necessary servicing,
+   repair, or correction. This disclaimer of warranty constitutes an essential
+   part of this License. No use of  any Covered Software is authorized under
+   this License except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from
+   such party's negligence to the extent applicable law prohibits such
+   limitation. Some jurisdictions do not allow the exclusion or limitation of
+   incidental or consequential damages, so this exclusion and limitation may
+   not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts
+   of a jurisdiction where the defendant maintains its principal place of
+   business and such litigation shall be governed by laws of that
+   jurisdiction, without reference to its conflict-of-law provisions. Nothing
+   in this Section shall prevent a party's ability to bring cross-claims or
+   counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject
+   matter hereof. If any provision of this License is held to be
+   unenforceable, such provision shall be reformed only to the extent
+   necessary to make it enforceable. Any law or regulation which provides that
+   the language of a contract shall be construed against the drafter shall not
+   be used to construe this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version
+      of the License under which You originally received the Covered Software,
+      or under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a
+      modified version of this License if you rename the license and remove
+      any references to the name of the license steward (except to note that
+      such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+      Licenses If You choose to distribute Source Code Form that is
+      Incompatible With Secondary Licenses under the terms of this version of
+      the License, the notice described in Exhibit B of this License must be
+      attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file,
+then You may include the notice in a location (such as a LICENSE file in a
+relevant directory) where a recipient would be likely to look for such a
+notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..330fdc0
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+# php-utility-classes
+This repository contains common utility classes for KaiRo's PHP projects, open for anyone else to use as well.
+
+Currently, the following classes are contained:
+
+* [document](classes/document.php-class): ExtendedDocument is an extension of DOMDocument (and its children) with methods making it easier to construct HTML5 documents completely in the DOM.
+* [email](classes/email.php-class): email is a convenience class to make it easy to create an email and send it via mail().
+* [rrdstat](classes/rrdstat.php-class): rrdstat wraps a lot of functionality of the round-robin database "rrdtool" to create statistics for e.g. system monitoring.
+* [useragent](classes/useragent.php-class): The userAgent class analyzes HTTP User-Agent headers and tries to gather information about the browser, engine, and versions.
+
+The code contains documentation about using the classes and their methods. Also, some examples and tests exist in the respective subdirectories.
-- 
2.43.0

From 880bcb60d557851e01051e9382decd36ec7665a1 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Tue, 29 Nov 2016 18:24:20 +0100
Subject: [PATCH 16/16] put clear MPL2 license headers on all files

diff --git a/classes/document.php-class b/classes/document.php-class
index d2e9aff..218ec3c 100755
--- a/classes/document.php-class
+++ b/classes/document.php-class
@@ -1,23 +1,7 @@
 <?php
-/* ***** BEGIN LICENSE BLOCK *****
- *
- * The contents of this file are subject to Austrian copyright reegulations
- * ("Urheberrecht"); you may not use this file except in compliance with
- * those laws.
- * This contents and any derived work, if it gets distributed in any way,
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
- * either express or implied.
- *
- * The Original Code is KaiRo's extended DOM document classes.
- *
- * The Initial Developer of the Original Code is
- * KaiRo - Robert Kaiser.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Robert Kaiser <kairo@kairo.at>
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 class ExtendedDocument extends DOMDocument {
   // ExtendedDocument PHP class
diff --git a/classes/email.php-class b/classes/email.php-class
index ff03a17..9853ba4 100644
--- a/classes/email.php-class
+++ b/classes/email.php-class
@@ -1,23 +1,7 @@
 <?php
-/* ***** BEGIN LICENSE BLOCK *****
- *
- * The contents of this file are subject to Austrian copyright reegulations
- * ("Urheberrecht"); you may not use this file except in compliance with
- * those laws.
- * This contents and any derived work, if it gets distributed in any way,
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
- * either express or implied.
- *
- * The Original Code is KaiRo's E-Mail module.
- *
- * The Initial Developer of the Original Code is
- * KaiRo - Robert Kaiser.
- * Portions created by the Initial Developer are Copyright (C) 2003-2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Robert Kaiser <kairo@kairo.at>
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 class email {
   // email PHP class
diff --git a/classes/rrdstat.php-class b/classes/rrdstat.php-class
index 1443ec6..68b6d23 100644
--- a/classes/rrdstat.php-class
+++ b/classes/rrdstat.php-class
@@ -1,23 +1,7 @@
 <?php
-/* ***** BEGIN LICENSE BLOCK *****
- *
- * The contents of this file are subject to Austrian copyright reegulations
- * ("Urheberrecht"); you may not use this file except in compliance with
- * those laws.
- * This contents and any derived work, if it gets distributed in any way,
- * is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
- * either express or implied.
- *
- * The Original Code is KaiRo's RRD statistics class.
- *
- * The Initial Developer of the Original Code is
- * KaiRo - Robert Kaiser.
- * Portions created by the Initial Developer are Copyright (C) 2005-2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Robert Kaiser <kairo@kairo.at>
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 class rrdstat {
   // rrdstat PHP class
diff --git a/classes/useragent.php-class b/classes/useragent.php-class
index 9026179..407c48d 100755
--- a/classes/useragent.php-class
+++ b/classes/useragent.php-class
@@ -1,39 +1,7 @@
 <?php
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is KaiRo's userAgent detection.
- *
- * The Initial Developer of the Original Code is
- * KaiRo - Robert Kaiser.
- * Portions created by the Initial Developer are Copyright (C) 2003-2007
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Robert Kaiser <kairo@kairo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 class userAgent {
   // userAgent PHP class
diff --git a/examples/rrd/rrd-config.inc.php b/examples/rrd/rrd-config.inc.php
index c58088b..3707d13 100644
--- a/examples/rrd/rrd-config.inc.php
+++ b/examples/rrd/rrd-config.inc.php
@@ -1,4 +1,8 @@
 <?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 // RRD info for CPU info
 $rrd_info = array();
 $rrd_info['*']['graph']['path'] = 'graphs';
diff --git a/examples/rrd/rrd-config/hostname.inc.php b/examples/rrd/rrd-config/hostname.inc.php
index f2ddd88..3cf8948 100644
--- a/examples/rrd/rrd-config/hostname.inc.php
+++ b/examples/rrd/rrd-config/hostname.inc.php
@@ -1,4 +1,8 @@
 <?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 // RRD info for CPU info
 $rrd_info = array();
 $rrd_info['*']['graph']['path'] = 'graphs';
diff --git a/examples/rrd/rrd-stat.php b/examples/rrd/rrd-stat.php
index ed93974..8712042 100644
--- a/examples/rrd/rrd-stat.php
+++ b/examples/rrd/rrd-stat.php
@@ -1,4 +1,8 @@
 <?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 date_default_timezone_set("Europe/Vienna");
 $myfile = $_SERVER['SCRIPT_FILENAME'];
 while (is_link($myfile)) { $myfile = readlink($myfile); }
diff --git a/examples/rrd/rrd-test.php b/examples/rrd/rrd-test.php
index 160e94f..7910b6c 100644
--- a/examples/rrd/rrd-test.php
+++ b/examples/rrd/rrd-test.php
@@ -1,4 +1,8 @@
 <?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 date_default_timezone_set("Europe/Vienna");
 $myfile = $_SERVER['SCRIPT_FILENAME'];
 while (is_link($myfile)) { $myfile = readlink($myfile); }
diff --git a/examples/rrd/rrd-update.php b/examples/rrd/rrd-update.php
index 1219319..3f03db1 100644
--- a/examples/rrd/rrd-update.php
+++ b/examples/rrd/rrd-update.php
@@ -1,4 +1,8 @@
 <?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 date_default_timezone_set("Europe/Vienna");
 $myfile = $_SERVER['SCRIPT_FILENAME'];
 while (is_link($myfile)) { $myfile = readlink($myfile); }
diff --git a/tests/test.css b/tests/test.css
index 7a26387..25983ab 100755
--- a/tests/test.css
+++ b/tests/test.css
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 /* general styles */
 
 body {
diff --git a/tests/ua_list.php b/tests/ua_list.php
index 795c7ab..3c9fa00 100644
--- a/tests/ua_list.php
+++ b/tests/ua_list.php
@@ -1,4 +1,8 @@
 <?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 include('../classes/useragent.php-class');
 
 // read string from this file
diff --git a/tests/ua_test.php b/tests/ua_test.php
index 95234d9..bf72e44 100644
--- a/tests/ua_test.php
+++ b/tests/ua_test.php
@@ -1,4 +1,8 @@
 <?php
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 include('../classes/useragent.php-class');
 
 // set default time zone - right now, always the one the server is in!
-- 
2.43.0