X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fforms.php;h=4f5b1bf4709001392f32bcffab07b822e81e7ada;hb=8cd88a0d5e953dd0427f34076b32f788563934cc;hp=f3efadde088efac316225c31747fd8ebf4a97936;hpb=fad34a61e472b4199dc993410b6e62013075ec9c;p=squirrelmail.git
diff --git a/functions/forms.php b/functions/forms.php
index f3efadde..4f5b1bf4 100644
--- a/functions/forms.php
+++ b/functions/forms.php
@@ -1,147 +1,286 @@
passwall.com. Tags can be used for Section 508
+ * or WAI compliance.
*
- * Copyright (c) 2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * * input tag functions accept extra html attributes that can be submitted
+ * in $aAttribs array.
*
- * Functions to build HTML forms in a safe and consistent manner.
- * All name, value attributes are htmlentitied.
+ * * default css class attributes are added.
*
+ * @link http://www.section508.gov/ Section 508
+ * @link http://www.w3.org/WAI/ Web Accessibility Initiative (WAI)
+ * @link http://www.w3.org/TR/html4/ W3.org HTML 4.01 form specs
+ * @copyright © 2004-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
* @subpackage forms
+ * @since 1.4.3 and 1.5.1
*/
/**
* Helper function to create form fields, not to be called directly,
* only by other functions below.
+ *
+ * Function used different syntax before 1.5.1
+ * @param string $sType type of input field. Possible values (html 4.01
+ * specs.): text, password, checkbox, radio, submit, reset, file,
+ * hidden, image, button.
+ * @param array $aAttribs (since 1.5.1) extra attributes. Array key is
+ * attribute name, array value is attribute value. Array keys must use
+ * lowercase.
+ * @return string html formated input field
+ * @deprecated use other functions that provide simple wrappers to this function
*/
-function addInputField($type, $name = null, $value = null, $attributes = '') {
- return '\n";
+function addInputField($sType, $aAttribs=array()) {
+ $sAttribs = '';
+ // define unique identifier
+ if (! isset($aAttribs['id']) && isset($aAttribs['name']) && ! is_null($aAttribs['name'])) {
+ /**
+ * if 'id' is not set, set it to 'name' and replace brackets
+ * with underscores. 'name' might contain field name with squire
+ * brackets (array). Brackets are not allowed in id (validator.w3.org
+ * fails to validate document). According to html 4.01 manual cdata
+ * type description, 'name' attribute uses same type, but validator.w3.org
+ * does not barf on brackets in 'name' attributes.
+ */
+ $aAttribs['id'] = strtr($aAttribs['name'],'[]','__');
+ }
+
+ global $oTemplate;
+
+ $oTemplate->assign('type', $sType);
+//FIXME: all the values in the $aAttribs list used to go thru htmlspecialchars()... I would propose that most everything that is assigned to the template should go thru that *in the template class* on its way between here and the actual template file. Otherwise we have to do something like: foreach ($aAttribs as $key => $value) $aAttribs[$key] = htmlspecialchars($value);
+ $oTemplate->assign('aAttribs', $aAttribs);
+
+ return $oTemplate->fetch('input.tpl');
+
}
/**
* Password input field
+ * @param string $sName field name
+ * @param string $sValue initial password value
+ * @param array $aAttribs (since 1.5.1) extra attributes
+ * @return string html formated password field
*/
-function addPwField($name , $value = null) {
- return addInputField('password', $name , $value);
+function addPwField($sName, $sValue = null, $aAttribs=array()) {
+ $aAttribs['name'] = $sName;
+ $aAttribs['value'] = (! is_null($sValue) ? $sValue : '');
+ // add default css
+ if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmpwfield';
+ return addInputField('password',$aAttribs);
}
-
/**
* Form checkbox
+ * @param string $sName field name
+ * @param boolean $bChecked controls if field is checked
+ * @param string $sValue
+ * @param array $aAttribs (since 1.5.1) extra attributes
+ * @return string html formated checkbox field
*/
-function addCheckBox($name, $checked = false, $value='') {
- return addInputField('checkbox', $name, $value,
- ($checked ? ' checked="checked"' : ''));
+function addCheckBox($sName, $bChecked = false, $sValue = null, $aAttribs=array()) {
+ $aAttribs['name'] = $sName;
+ if ($bChecked) $aAttribs['checked'] = 'checked';
+ if (! is_null($sValue)) $aAttribs['value'] = $sValue;
+ // add default css
+ if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmcheckbox';
+ return addInputField('checkbox',$aAttribs);
}
/**
* Form radio box
+ * @param string $sName field name
+ * @param boolean $bChecked controls if field is selected
+ * @param string $sValue
+ * @param array $aAttribs (since 1.5.1) extra attributes.
+ * @return string html formated radio box
*/
-function addRadioBox($name, $checked = false, $value='') {
- return addInputField('radio', $name, $value,
- ($checked ? ' checked="checked"' : ''));
+function addRadioBox($sName, $bChecked = false, $sValue = null, $aAttribs=array()) {
+ $aAttribs['name'] = $sName;
+ if ($bChecked) $aAttribs['checked'] = 'checked';
+ if (! is_null($sValue)) $aAttribs['value'] = $sValue;
+ if (! isset($aAttribs['id'])) $aAttribs['id'] = $sName . $sValue;
+ // add default css
+ if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmradiobox';
+ return addInputField('radio', $aAttribs);
}
/**
* A hidden form field.
+ * @param string $sName field name
+ * @param string $sValue field value
+ * @param array $aAttribs (since 1.5.1) extra attributes
+ * @return html formated hidden form field
*/
-function addHidden($name, $value) {
- return addInputField('hidden', $name, $value);
+function addHidden($sName, $sValue, $aAttribs=array()) {
+ $aAttribs['name'] = $sName;
+ $aAttribs['value'] = $sValue;
+ // add default css
+ if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmhiddenfield';
+ return addInputField('hidden', $aAttribs);
}
/**
* An input textbox.
+ * @param string $sName field name
+ * @param string $sValue initial field value
+ * @param integer $iSize field size (number of characters)
+ * @param integer $iMaxlength maximum number of characters the user may enter
+ * @param array $aAttribs (since 1.5.1) extra attributes - should be given
+ * in the form array('attribute_name' => 'attribute_value', ...)
+ * @return string html formated text input field
*/
-function addInput($name, $value = '', $size = 0, $maxlength = 0) {
-
- $attr = '';
- if ($size) {
- $attr.= ' size="'.(int)$size.'"';
- }
- if ($maxlength) {
- $attr.= ' maxlength="'.(int)$maxlength .'"';
- }
-
- return addInputField('text', $name, $value, $attr);
+function addInput($sName, $sValue = '', $iSize = 0, $iMaxlength = 0, $aAttribs=array()) {
+ $aAttribs['name'] = $sName;
+ $aAttribs['value'] = $sValue;
+ if ($iSize) $aAttribs['size'] = (int)$iSize;
+ if ($iMaxlength) $aAttribs['maxlength'] = (int)$iMaxlength;
+ // add default css
+ if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmtextfield';
+ return addInputField('text', $aAttribs);
}
-
/**
* Function to create a selectlist from an array.
- * Usage:
- * name: html name attribute
- * values: array ( key => value ) -> , although if $bUsekeys is FALSE, then
+ * @param mixed $default the key that will be selected
+ * @param boolean $bUsekeys use the keys of the array as option value or not
+ * @param array $aAttribs (since 1.5.1) extra attributes
+ * @return string html formated selection box
+ * @todo add attributes argument for option tags and default css
*/
-function addSelect($name, $values, $default = null, $usekeys = false)
-{
+function addSelect($sName, $aValues, $default = null, $bUsekeys = false, $aAttribs = array()) {
// only one element
- if(count($values) == 1) {
- $k = key($values); $v = array_pop($values);
- return addHidden($name, ($usekeys ? $k:$v)).
+ if(count($aValues) == 1) {
+ $k = key($aValues); $v = array_pop($aValues);
+ return addHidden($sName, ($bUsekeys ? $k:$v), $aAttribs).
htmlspecialchars($v) . "\n";
}
- $ret = '\n";
+ global $oTemplate;
+
+//FIXME: all the values in the $aAttribs list and $sName and both the keys and values in $aValues used to go thru htmlspecialchars()... I would propose that most everything that is assigned to the template should go thru that *in the template class* on its way between here and the actual template file. Otherwise we have to do something like: foreach ($aAttribs as $key => $value) $aAttribs[$key] = htmlspecialchars($value); $sName = htmlspecialchars($sName); $aNewValues = array(); foreach ($aValues as $key => $value) $aNewValues[htmlspecialchars($key)] = htmlspecialchars($value); $aValues = $aNewValues; And probably this too because it has to be matched to a value that has already been sanitized: $default = htmlspecialchars($default);
+ $oTemplate->assign('aAttribs', $aAttribs);
+ $oTemplate->assign('aValues', $aValues);
+ $oTemplate->assign('bUsekeys', $bUsekeys);
+ $oTemplate->assign('default', $default);
+ $oTemplate->assign('name', $sName);
- return $ret;
+ return $oTemplate->fetch('select.tpl');
}
/**
* Form submission button
* Note the switched value/name parameters!
+ * @param string $sValue button name
+ * @param string $sName submitted key name
+ * @param array $aAttribs (since 1.5.1) extra attributes
+ * @return string html formated submit input field
*/
-function addSubmit($value, $name = null) {
- return addInputField('submit', $name, $value);
+function addSubmit($sValue, $sName = null, $aAttribs=array()) {
+ $aAttribs['value'] = $sValue;
+ if (! is_null($sName)) $aAttribs['name'] = $sName;
+ // add default css
+ if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmsubmitfield';
+ return addInputField('submit', $aAttribs);
}
/**
- * Form reset button, $value = caption
+ * Form reset button
+ * @param string $sValue button name
+ * @param array $aAttribs (since 1.5.1) extra attributes
+ * @return string html formated reset input field
*/
-function addReset($value) {
- return addInputField('reset', null, $value);
+function addReset($sValue, $aAttribs=array()) {
+ $aAttribs['value'] = $sValue;
+ // add default css
+ if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmresetfield';
+ return addInputField('reset', $aAttribs);
}
/**
* Textarea form element.
+ *
+ * @param string $sName field name
+ * @param string $sText initial field value (OPTIONAL; default empty)
+ * @param integer $iCols field width (number of chars) (OPTIONAL; default 40)
+ * @param integer $iRows field height (number of character rows) (OPTIONAL; default 10)
+ * @param array $aAttribs (since 1.5.1) extra attributes (OPTIONAL; default empty)
+ *
+ * @return string html formated text area field
+ *
*/
-function addTextArea($name, $text = '', $cols = 40, $rows = 10, $attr = '') {
- return '\n";
+function addTextArea($sName, $sText = '', $iCols = 40, $iRows = 10, $aAttribs = array()) {
+
+ // no longer accept string arguments for attribs; print
+ // backtrace to help people fix their code
+ if (!is_array($aAttribs)) {
+ echo '$aAttribs argument to addTextArea() must be an array
'; + debug_print_backtrace(); + echo '