New structured forms and action events

Replaces a number of *FORM_INJECTION events with a more flexible way of
modifying forms. Forms are created with a Doku_Form class (inc/form.php)
that can be manipulated by plugins prior to output. Plugins register a
HTML_{$name}FORM_OUTPUT event which can modify the form object prior to
output. Available forms are:
  LOGIN DRAFT CONFLICT REGISTER UPDATEPROFILE EDIT RESENDPWD
Documentation for the Doku_Form class is in inc/form.php.

darcs-hash:20070730215007-6942e-a0cf08197f939e224a2b28c40aec5431b118ea94.gz

1 files changed, 831 insertions, 0 deletions

diff --git a/inc/form.php b/inc/form.php
new file mode 100644
index 000000000..fe5fc1152
--- /dev/null
+++ b/inc/form.php
@@ -0,0 +1,831 @@
+<?php
+/**
+ * DokuWiki XHTML Form
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Tom N Harris <tnharris@whoopdedo.org>
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+if(!defined('NL')) define('NL',"\n");
+require_once(DOKU_INC.'inc/html.php');
+
+/**
+ * Class for creating simple HTML forms.
+ *
+ * The forms is built from a list of pseudo-tags (arrays with expected keys).
+ * Every pseudo-tag must have the key '_elem' set to the name of the element.
+ * When printed, the form class calls functions named 'form_$type' for each
+ * element it contains.
+ *
+ * Standard practice is for non-attribute keys in a pseudo-element to start 
+ * with '_'. Other keys are HTML attributes that will be included in the element
+ * tag. That way, the element output functions can pass the pseudo-element 
+ * directly to buildAttributes.
+ *
+ * See the form_make* functions later in this file.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+class Doku_Form {
+
+  // Usually either DOKU_SCRIPT or wl($ID)
+  var $action = '';
+
+  // Most likely no need to change this
+  var $method = 'post';
+
+  // Form id attribute
+  var $id = '';
+
+  // Draw a border around form fields.
+  // Adds <fieldset></fieldset> around the elements
+  var $_infieldset = false;
+
+  // Hidden form fields.
+  var $_hidden = array();
+
+  // Array of pseudo-tags
+  var $_content = array();
+
+  /**
+   * Constructor
+   *
+   * @param   string  $id     ID attribute of the form.
+   * @param   string  $action (optional) submit URL, defaults to DOKU_SCRIPT
+   * @param   string  $method (optional) 'POST' or 'GET', default is post
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function Doku_Form($id, $action=false, $method=false) {
+    $this->id = $id;
+    $this->action = ($action) ? $action : script();
+    if ($method) $this->method = $method;
+  }
+
+  /**
+   * startFieldset
+   *
+   * Add <fieldset></fieldset> tags around fields.
+   * Usually results in a border drawn around the form.
+   *
+   * @param   string  $legend Label that will be printed with the border.
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function startFieldset($legend) {
+    if ($this->_infieldset) {
+      $this->addElement(array('_elem'=>'closefieldset'));
+    }
+    $this->addElement(array('_elem'=>'openfieldset', '_legend'=>$legend));
+    $this->_infieldset = true;
+  }
+
+  /**
+   * endFieldset
+   *
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function endFieldset() {
+    if ($this->_infieldset) {
+      $this->addElement(array('_elem'=>'closefieldset'));
+    }
+    $this->_infieldset = false;
+  }
+
+  /**
+   * addHidden
+   *
+   * Adds a name/value pair as a hidden field.
+   * The value of the field (but not the name) will be passed to
+   * formText() before printing.
+   *
+   * @param   string  $name   Field name.
+   * @param   string  $value  Field value. If null, remove a previously added field.                              
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function addHidden($name, $value) {
+    if (is_null($value))
+      unset($this->_hidden[$name]);
+    else
+      $this->_hidden[$name] = $value;
+  }
+
+  /**
+   * addElement
+   *
+   * Appends a content element to the form.
+   * The element can be either a pseudo-tag or string.
+   * If string, it is printed without escaping special chars.   * 
+   *
+   * @param   string  $elem   Pseudo-tag or string to add to the form.
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function addElement($elem) {
+    $this->_content[] = $elem;
+  }
+
+  /**
+   * insertElement
+   *
+   * Inserts a content element at a position.
+   *
+   * @param   string  $pos    0-based index where the element will be inserted.
+   * @param   string  $elem   Pseudo-tag or string to add to the form.
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function insertElement($pos, $elem) {
+    array_splice($this->_content, $pos, 0, array($elem));
+  }
+
+  /**
+   * replaceElement
+   *
+   * Replace with NULL to remove an element.
+   *
+   * @param   int     $pos    0-based index the element will be placed at.
+   * @param   string  $elem   Pseudo-tag or string to add to the form.
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function replaceElement($pos, $elem) {
+    $rep = array();
+    if (!is_null($elem)) $rep[] = $elem;
+    array_splice($this->_content, $pos, 1, $rep);
+  }
+
+  /**
+   * findElementByType
+   *
+   * Gets the position of the first of a type of element.
+   *
+   * @param   string  $type   Element type to look for.
+   * @return  array   pseudo-element if found, false otherwise
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function findElementByType($type) {
+    foreach ($this->_content as $pos=>$elem) {
+      if (is_array($elem) && $elem['_elem'] == $type)
+        return $pos;
+    }
+    return false;
+  }
+
+  /**
+   * findElementById
+   *
+   * Gets the position of the element with an ID attribute.
+   *
+   * @param   string  $id     ID of the element to find.
+   * @return  array   pseudo-element if found, false otherwise
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function findElementById($id) {
+    foreach ($this->_content as $pos=>$elem) {
+      if (is_array($elem) && isset($elem['id']) && $elem['id'] == $id)
+        return $pos;
+    }
+    return false;
+  }
+
+  /**
+   * findElementByAttribute
+   *
+   * Gets the position of the first element with a matching attribute value.
+   *
+   * @param   string  $name   Attribute name.
+   * @param   string  $value  Attribute value.
+   * @return  array   pseudo-element if found, false otherwise
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function findElementByAttribute($name, $value) {
+    foreach ($this->_content as $pos=>$elem) {
+      if (is_array($elem) && isset($elem[$name]) && $elem[$name] == $value)
+        return $pos;
+    }
+    return false;
+  }
+
+  /**
+   * getElementAt
+   *
+   * Returns a reference to the element at a position.
+   * A position out-of-bounds will return either the 
+   * first (underflow) or last (overflow) element.
+   *
+   * @param   int     $pos    0-based index
+   * @return  arrayreference  pseudo-element
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function &getElementAt($pos) {
+    if ($pos < 0) $pos = count($this->_content) + $pos;
+    if ($pos < 0) $pos = 0;
+    if ($pos >= count($this->_content)) $pos = count($this->_content) - 1;
+    return $this->_content[$pos];
+  }
+
+  /**
+   * printForm
+   *
+   * Output the form.
+   * Each element in the form will be passed to a function named
+   * 'form_$type'. The function should return the HTML to be printed.
+   *
+   * @author  Tom N Harris <tnharris@whoopdedo.org>
+   */
+  function printForm() {
+    global $lang;
+    print '<form action="'.$this->action.'" method="'.$this->method.'" accept-charset="'.$lang['encoding'].'"';
+    if (!empty($this->id)) print ' id="'.$this->id.'"';
+    print '>'.NL;
+    if (!empty($this->_hidden)) {
+      print '<div class="no">';
+      foreach ($this->_hidden as $name=>$value) 
+        print form_hidden(array('name'=>$name, 'value'=>$value));
+      print '</div>'.NL;
+    }
+    foreach ($this->_content as $element) {
+      if (is_array($element)) {
+        $elem_type = $element['_elem'];
+        if (function_exists('form_'.$elem_type)) {
+          print call_user_func('form_'.$elem_type, $element).NL;
+        }
+      } else {
+        print $element;
+      }
+    }
+    if ($this->_infieldset) print form_closefieldset().NL;
+    print '</form>'.NL;
+  }
+
+}
+
+/**
+ * form_makeTag
+ *
+ * Create a form element for a non-specific empty tag.
+ *
+ * @param   string  $tag    Tag name.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeTag($tag, $attrs=array()) {
+  $elem = array('_elem'=>'tag', '_tag'=>$tag);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeOpenTag
+ *
+ * Create a form element for a non-specific opening tag.
+ * Remember to put a matching close tag after this as well.
+ *
+ * @param   string  $tag    Tag name.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeOpenTag($tag, $attrs=array()) {
+  $elem = array('_elem'=>'opentag', '_tag'=>$tag);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeCloseTag
+ *
+ * Create a form element for a non-specific closing tag.
+ * Careless use of this will result in invalid XHTML.
+ *
+ * @param   string  $tag    Tag name.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeCloseTag($tag) {
+  return array('_elem'=>'closetag', '_tag'=>$tag);
+}
+
+/**
+ * form_makeWikiText
+ *
+ * Create a form element for a textarea containing wiki text.
+ * Only one wikitext element is allowed on a page. It will have
+ * a name of 'wikitext' and id 'wiki__text'. The text will
+ * be passed to formText() before printing.
+ *
+ * @param   string  $text   Text to fill the field with.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeWikiText($text, $attrs=array()) {
+  $elem = array('_elem'=>'wikitext', '_text'=>$text);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeButton
+ *
+ * Create a form element for an action button.
+ * A title will automatically be generated using the value and
+ * accesskey attributes, unless you provide one.
+ *
+ * @param   string  $type   Type attribute. 'submit' or 'cancel'
+ * @param   string  $act    Wiki action of the button, will be used as the do= parameter
+ * @param   string  $value  (optional) Displayed label. Uses $act if not provided.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeButton($type, $act, $value='', $attrs=array()) {
+  if ($value == '') $value = $act;
+  //$name = (!empty($act)) ? 'do[$act]' : null;
+  $elem = array('_elem'=>'button', 'type'=>$type, '_action'=>$act, 'value'=>$value);
+  if (!empty($attrs['accesskey']) && empty($attrs['title'])) {
+    $attrs['title'] = $value . ' [ALT+'.strtoupper($attrs['accesskey']).']';
+  }
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeField
+ *
+ * Create a form element for a labelled input element.
+ * The label text will be printed before the input.
+ *
+ * @param   string  $type   Type attribute of input.
+ * @param   string  $name   Name attribute of the input.
+ * @param   string  $value  (optional) Default value.
+ * @param   string  $class  Class attribute of the label. If this is 'block',
+ *                          then a line break will be added after the field.
+ * @param   string  $label  Label that will be printed before the input.
+ * @param   string  $id     ID attribute of the input. If set, the label will
+ *                          reference it with a 'for' attribute.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeField($type, $name, $value='', $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  $elem = array('_elem'=>'field', '_text'=>$label, '_class'=>$class,
+                'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeFieldRight
+ *
+ * Create a form element for a labelled input element.
+ * The label text will be printed after the input.
+ *
+ * @see     form_makeField
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeFieldRight($type, $name, $value='', $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  $elem = array('_elem'=>'fieldright', '_text'=>$label, '_class'=>$class,
+                'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeTextField
+ *
+ * Create a form element for a text input element with label.
+ *
+ * @see     form_makeField
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeTextField($name, $value='', $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  $elem = array('_elem'=>'textfield', '_text'=>$label, '_class'=>$class,
+                'id'=>$id, 'name'=>$name, 'value'=>$value);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makePasswordField
+ *
+ * Create a form element for a password input element with label.
+ * Password elements have no default value, for obvious reasons.
+ *
+ * @see     form_makeField
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makePasswordField($name, $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  $elem = array('_elem'=>'passwordfield', '_text'=>$label, '_class'=>$class,
+                'id'=>$id, 'name'=>$name);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeCheckboxField
+ *
+ * Create a form element for a checkbox input element with label.
+ *
+ * @see     form_makeFieldRight
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeCheckboxField($name, $value='1', $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  if (is_null($value) || $value=='') $value='0';
+  $elem = array('_elem'=>'checkboxfield', '_text'=>$label, '_class'=>$class,
+                'id'=>$id, 'name'=>$name, 'value'=>$value);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeRadioField
+ *
+ * Create a form element for a radio button input element with label.
+ *
+ * @see     form_makeFieldRight
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeRadioField($name, $value='1', $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  if (is_null($value) || $value=='') $value='0';
+  $elem = array('_elem'=>'radiofield', '_text'=>$label, '_class'=>$class,
+                'id'=>$id, 'name'=>$name, 'value'=>$value);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeMenuField
+ *
+ * Create a form element for a drop-down menu with label.
+ * The list of values can be strings, arrays of (value,text),
+ * or an associative array with the values as keys and labels as values.
+ * An item is selected by supplying its value or integer index.
+ * If the list of values is an associative array, the selected item must be 
+ * a string.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeMenuField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  $options = array();
+  reset($values);
+  // FIXME: php doesn't know the difference between a string and an integer
+  if (is_string(key($values))) {
+    foreach ($values as $val=>$text) {
+      $options[] = array($val,$text, (!is_null($selected) && $val==$selected));
+    }
+  } else {
+    if (is_integer($selected)) $selected = $values[$selected];
+    foreach ($values as $val) {
+      if (is_array($val))
+        @list($val,$text) = $val;
+      else
+        $text = null;
+      $options[] = array($val,$text,$val===$selected);
+    }
+  }
+  $elem = array('_elem'=>'menufield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
+                'id'=>$id, 'name'=>$name);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeListboxField
+ *
+ * Create a form element for a list box with label.
+ * The list of values can be strings, arrays of (value,text),
+ * or an associative array with the values as keys and labels as values.
+ * Items are selected by supplying its value or an array of values.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeListboxField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
+  if (is_null($label)) $label = $name;
+  $options = array();
+  reset($values);
+  if (is_null($selected) || $selected == '')
+    $selected = array();
+  elseif (!is_array($selected))
+    $selected = array($selected);
+  // FIXME: php doesn't know the difference between a string and an integer
+  if (is_string(key($values))) {
+    foreach ($values as $val=>$text) {
+      $options[] = array($val,$text,in_array($val,$selected));
+    }
+  } else {
+    foreach ($values as $val) {
+      if (is_array($val))
+        @list($val,$text) = $val;
+      else
+        $text = null;
+      $options[] = array($val,$text,in_array($val,$selected));
+    }
+  }
+  $elem = array('_elem'=>'listboxfield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
+                'id'=>$id, 'name'=>$name);
+  return array_merge($elem, $attrs);
+}
+
+/**
+ * form_tag
+ *
+ * Print the HTML for a generic empty tag.
+ * Requires '_tag' key with name of the tag.
+ * Attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_tag($attrs) {
+  return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'/>';
+}
+
+/**
+ * form_opentag
+ *
+ * Print the HTML for a generic opening tag.
+ * Requires '_tag' key with name of the tag.
+ * Attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_opentag($attrs) {
+  return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'>';
+}
+
+/**
+ * form_closetag
+ *
+ * Print the HTML for a generic closing tag.
+ * Requires '_tag' key with name of the tag.
+ * There are no attributes.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_closetag($attrs) {
+  return '</'.$attrs['_tag'].'>';
+}
+
+/**
+ * form_openfieldset
+ *
+ * Print the HTML for an opening fieldset tag.
+ * Uses the '_legend' key.
+ * Attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_openfieldset($attrs) {
+  $s = '<fieldset '.buildAttributes($attrs,true).'>';
+  if (!is_null($attrs['_legend'])) $s .= '<legend>'.$attrs['_legend'].'</legend>';
+  return $s;
+}
+
+/**
+ * form_closefieldset
+ *
+ * Print the HTML for a closing fieldset tag.
+ * There are no attributes.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_closefieldset() {
+  return '</fieldset>';
+}
+
+/**
+ * form_hidden
+ *
+ * Print the HTML for a hidden input element.
+ * Uses only 'name' and 'value' attributes.
+ * Value is passed to formText()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_hidden($attrs) {
+  return '<input type="hidden" name="'.$attrs['name'].'" value="'.formText($attrs['value']).'" />';
+}
+
+/**
+ * form_wikitext
+ *
+ * Print the HTML for the wiki textarea.
+ * Requires '_text' with default text of the field.
+ * Text will be passed to formText(), attributes to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_wikitext($attrs) {
+  return '<textarea name="wikitext" id="wiki__text" cols="80" rows="10" class="edit" '
+         .buildAttributes($attrs,true).'>'.NL
+         .formText($attrs['_text'])
+         .'</textarea>';
+}
+
+/**
+ * form_button
+ *
+ * Print the HTML for a form button.
+ * If '_action' is set, the button name will be "do[_action]".
+ * Other attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_button($attrs) {
+  $p = (!empty($attrs['_action'])) ? 'name="do['.$attrs['_action'].']" ' : '';
+  return '<input class="button" '.$p.buildAttributes($attrs,true).'/>';
+}
+
+/**
+ * form_field
+ *
+ * Print the HTML for a form input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_field($attrs) {
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><span>'.$attrs['_text'].'</span>';
+  $s .= '<input '.buildAttributes($attrs,true).'/></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}
+
+/**
+ * form_fieldright
+ *
+ * Print the HTML for a form input field. (right-aligned)
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display after the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_fieldright($attrs) {
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><input '.buildAttributes($attrs,true).'/>';
+  $s .= '<span>'.$attrs['_text'].'</span></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}
+
+/**
+ * form_textfield
+ *
+ * Print the HTML for a text input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_textfield($attrs) {
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><span>'.$attrs['_text'].'</span>';
+  $s .= '<input type="text" class="edit" '.buildAttributes($attrs,true).'/></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}
+
+/**
+ * form_passwordfield
+ *
+ * Print the HTML for a password input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_passwordfield($attrs) {
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><span>'.$attrs['_text'].'</span>';
+  $s .= '<input type="password" class="edit" '.buildAttributes($attrs,true).'/></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}
+
+/**
+ * form_checkboxfield
+ *
+ * Print the HTML for a checkbox input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display after the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_checkboxfield($attrs) {
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><input type="checkbox" '.buildAttributes($attrs,true).'/>';
+  $s .= '<span>'.$attrs['_text'].'</span></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}
+
+/**
+ * form_radiofield
+ *
+ * Print the HTML for a radio button input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display after the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_radiofield($attrs) {
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><input type="radio" '.buildAttributes($attrs,true).'/>';
+  $s .= '<span>'.$attrs['_text'].'</span></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}
+
+/**
+ * form_menufield
+ *
+ * Print the HTML for a drop-down menu.
+ *   _options : Array of (value,text,selected) for the menu.
+ *              Text can be omitted. Text and value are passed to formText()
+ *              Only one item can be selected.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the menu. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_menufield($attrs) {
+  $attrs['size'] = '1';
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><span>'.$attrs['_text'].'</span>';
+  $s .= '<select '.buildAttributes($attrs,true).'>'.NL;
+  if (!empty($attrs['_options'])) {
+    $selected = false;
+    for($n=0;$n<count($attrs['_options']);$n++){
+      @list($value,$text,$select) = $attrs['_options'][$n];
+      $p = '';
+      if (!is_null($text))
+        $p .= ' value="'.formText($value).'"';
+      else
+        $text = $value;
+      if (!empty($select) && !$selected) {
+        $p .= ' selected="selected"';
+        $selected = true;
+      }
+      $s .= '<option'.$p.'>'.formText($text).'</option>';
+    }
+  } else {
+    $s .= '<option></option>';
+  }
+  $s .= NL.'</select></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}
+
+/**
+ * form_listboxfield
+ *
+ * Print the HTML for a list box.
+ *   _options : Array of (value,text,selected) for the list.
+ *              Text can be omitted. Text and value are passed to formText()
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the menu. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_listboxfield($attrs) {
+  $s = '<label class="'.$attrs['_class'].'"';
+  if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+  $s .= '><span>'.$attrs['_text'].'</span>';
+  $s = '<select '.buildAttributes($attrs,true).'>'.NL;
+  if (!empty($attrs['_options'])) {
+    foreach ($attrs['_options'] as $opt) {
+      @list($value,$text,$select) = $opt;
+      $p = '';
+      if (!is_null($text))
+        $p .= ' value="'.formText($value).'"';
+      else
+        $text = $value;
+      if (!empty($select)) $p .= ' selected="selected"';
+      $s .= '<option'.$p.'>'.formText($text).'</option>';
+    }
+  } else {
+    $s .= '<option></option>';
+  }
+  $s .= NL.'</select></label>';
+  if (preg_match('/(^| )block($| )/', $attrs['_class']))
+    $s .= '<br />';
+  return $s;
+}