X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fforms.php;h=8ec83d4d0701c7926d56d6d0cce572335b057c52;hp=4f5b1bf4709001392f32bcffab07b822e81e7ada;hb=42b7c9d4800d9a64222dc95caf91abacb3d7ae4a;hpb=4b5049de2fa934c45599d6e4c74bf2bbee10d34d

diff --git a/functions/forms.php b/functions/forms.php
index 4f5b1bf4..8ec83d4d 100644
--- a/functions/forms.php
+++ b/functions/forms.php
@@ -159,15 +159,22 @@ function addInput($sName, $sValue = '', $iSize = 0, $iMaxlength = 0, $aAttribs=a
 
 /**
  * Function to create a selectlist from an array.
- * @param string $sName field name
- * @param array $aValues field values array(key => value)  ->  <option value="key">value</option>, although if $bUsekeys is FALSE, then  <option value="value">value</option>
- * @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
+ * @param string  $sName     Field name
+ * @param array   $aValues   Field values array(key => value) results in:
+ *                           <option value="key">value</option>, 
+ *                           although if $bUsekeys is FALSE, then it changes to:
+ *                           <option value="value">value</option>
+ * @param mixed   $default   The key(s) that will be selected (it is OK to pass 
+ *                           in an array here in the case of multiple select lists)
+ * @param boolean $bUsekeys  Use the keys of the array as option value or not
+ * @param array   $aAttribs  (since 1.5.1) Extra attributes
+ * @param boolean $bMultiple When TRUE, a multiple select list will be shown
+ *                           (OPTIONAL; default is FALSE (single select list))
+ *
  * @return string html formated selection box
  * @todo add attributes argument for option tags and default css
  */
-function addSelect($sName, $aValues, $default = null, $bUsekeys = false, $aAttribs = array()) {
+function addSelect($sName, $aValues, $default = null, $bUsekeys = false, $aAttribs = array(), $bMultiple = FALSE) {
     // only one element
     if(count($aValues) == 1) {
         $k = key($aValues); $v = array_pop($aValues);
@@ -175,18 +182,52 @@ function addSelect($sName, $aValues, $default = null, $bUsekeys = false, $aAttri
             htmlspecialchars($v) . "\n";
     }
 
+
+    // make sure $default is an array, since multiple select lists
+    // need the chance to have more than one default... 
+    //
+    if (!is_array($default))
+       $default = array($default);
+
+
     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); 
+//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);  (oops, watch out for when $default is an array! (multiple select lists))
     $oTemplate->assign('aAttribs', $aAttribs);
     $oTemplate->assign('aValues', $aValues);
     $oTemplate->assign('bUsekeys', $bUsekeys);
     $oTemplate->assign('default', $default);
     $oTemplate->assign('name', $sName);
+    $oTemplate->assign('multiple', $bMultiple);
 
     return $oTemplate->fetch('select.tpl');
 }
 
+/**
+ * Normal button
+ *
+ * Note the switched value/name parameters!
+ * Note also that regular buttons are not very useful unless
+ * used with onclick handlers, thus are only really appropriate
+ * if you use them after having checked if JavaScript is turned
+ * on by doing this:  if (checkForJavascript()) ...
+ *
+ * @param string $sValue button name
+ * @param string $sName key name
+ * @param array $aAttribs extra attributes
+ *
+ * @return string html formated submit input field
+ *
+ * @since 1.5.2
+ */
+function addButton($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('button', $aAttribs);
+}
+
 /**
  * Form submission button
  * Note the switched value/name parameters!
@@ -202,6 +243,7 @@ function addSubmit($sValue, $sName = null, $aAttribs=array()) {
     if (! isset($aAttribs['class'])) $aAttribs['class'] = 'sqmsubmitfield';
     return addInputField('submit', $aAttribs);
 }
+
 /**
  * Form reset button
  * @param string $sValue button name
@@ -231,6 +273,7 @@ function addTextArea($sName, $sText = '', $iCols = 40, $iRows = 10, $aAttribs =
 
     // no longer accept string arguments for attribs; print 
     // backtrace to help people fix their code
+    //FIXME: throw error instead?
     if (!is_array($aAttribs)) {
         echo '$aAttribs argument to addTextArea() must be an array<br /><pre>';
         debug_print_backtrace();
@@ -238,7 +281,7 @@ function addTextArea($sName, $sText = '', $iCols = 40, $iRows = 10, $aAttribs =
         exit;
     }
 
-    // FIXME: should the template do this instead????
+    // add default css
     else if (!isset($aAttribs['class'])) $aAttribs['class'] = 'sqmtextarea';
 
     global $oTemplate;