var $type;
var $refresh_level;
var $size;
+ var $trailing_text;
var $comment;
var $script;
var $post_script;
var $value;
var $new_value;
var $possible_values;
+ var $htmlencoded=false;
function SquirrelOption
- ($name, $caption, $type, $refresh_level, $initial_value = '', $possible_values = '') {
+ ($name, $caption, $type, $refresh_level, $initial_value = '', $possible_values = '', $htmlencoded = false) {
/* Set the basic stuff. */
$this->name = $name;
$this->caption = $caption;
$this->type = $type;
$this->refresh_level = $refresh_level;
$this->possible_values = $possible_values;
+ $this->htmlencoded = $htmlencoded;
$this->size = SMOPT_SIZE_MEDIUM;
+ $this->trailing_text = '';
$this->comment = '';
$this->script = '';
$this->post_script = '';
}
/* Check for a new value. */
- if ( !sqgetGlobalVar("new_$name", $this->new_value, SQ_POST ) ) {
+ if ( !sqgetGlobalVar("new_$name", $this->new_value, SQ_POST ) ) {
$this->new_value = '';
}
$this->size = $size;
}
+ /* Set the trailing_text for this option. */
+ function setTrailingText($trailing_text) {
+ $this->trailing_text = $trailing_text;
+ }
+
/* Set the comment for this option. */
function setComment($comment) {
$this->comment = $comment;
}
function createHTMLWidget() {
- global $javascript_on;
+ global $color;
+
+ // Use new value if available
+ if (!empty($this->new_value)) {
+ $tempValue = $this->value;
+ $this->value = $this->new_value;
+ }
/* Get the widget for this option type. */
switch ($this->type) {
/* Add the "post script" for this option. */
$result .= $this->post_script;
-
+
+ // put correct value back if need be
+ if (!empty($this->new_value)) {
+ $this->value = $tempValue;
+ }
+
/* Now, return the created widget. */
return ($result);
}
$width = 25;
}
- $result = "<input name=\"new_$this->name\" value=\"$this->value\" size=\"$width\" $this->script>";
+ $result = "<input type=\"text\" name=\"new_$this->name\" value=\"" .
+ htmlspecialchars($this->value) .
+ "\" size=\"$width\" $this->script />$this->trailing_text\n";
return ($result);
}
function createWidget_StrList() {
/* Begin the select tag. */
- $result = "<select name=\"new_$this->name\" $this->script>";
+ $result = "<select name=\"new_$this->name\" $this->script>\n";
/* Add each possible value to the select list. */
foreach ($this->possible_values as $real_value => $disp_value) {
/* Start the next new option string. */
- $new_option = "<option value=\"$real_value\"";
+ $new_option = '<option value="' .
+ ($this->htmlencoded ? $real_value : htmlspecialchars($real_value)) . '"';
/* If this value is the current value, select it. */
if ($real_value == $this->value) {
- $new_option .= ' selected=""';
+ $new_option .= ' selected="selected"';
}
/* Add the display value to our option string. */
- $new_option .= ">$disp_value</option>";
+ $new_option .= '>' . ($this->htmlencoded ? $disp_value : htmlspecialchars($disp_value)) . "</option>\n";
/* And add the new option string to our select tag. */
$result .= $new_option;
}
/* Close the select tag and return our happy result. */
- $result .= '</select>';
+ $result .= "</select>$this->trailing_text\n";
return ($result);
}
$selected = array(strtolower($this->value));
/* Begin the select tag. */
- $result = "<select name=\"new_$this->name\" $this->script>";
+ $result = "<select name=\"new_$this->name\" $this->script>\n";
/* Add each possible value to the select list. */
foreach ($this->possible_values as $real_value => $disp_value) {
- if ( is_array($disp_value) ) {
+ if ( is_array($disp_value) ) {
/* For folder list, we passed in the array of boxes.. */
$new_option = sqimap_mailbox_option_list(0, $selected, 0, $disp_value);
} else {
/* Start the next new option string. */
- $new_option = "<option value=\"$real_value\"";
-
+ $new_option = '<option value="' . htmlspecialchars($real_value) . '"';
+
/* If this value is the current value, select it. */
if ($real_value == $this->value) {
- $new_option .= ' selected';
+ $new_option .= ' selected="selected"';
}
-
+
/* Add the display value to our option string. */
- $new_option .= ">$disp_value</option>";
+ $new_option .= '>' . htmlspecialchars($disp_value) . "</option>\n";
}
/* And add the new option string to our select tag. */
$result .= $new_option;
- }
+ }
/* Close the select tag and return our happy result. */
- $result .= '</select>';
+ $result .= "</select>\n";
return ($result);
}
default: $rows = 5; $cols = 50;
}
$result = "<textarea name=\"new_$this->name\" rows=\"$rows\" "
- . "cols=\"$cols\" $this->script>$this->value</textarea>";
+ . "cols=\"$cols\" $this->script>"
+ . htmlspecialchars($this->value) . "</textarea>\n";
return ($result);
}
// add onChange javascript handler to a regular string widget
// which will strip out all non-numeric chars
if ($javascript_on)
- return preg_replace('/>/', ' onChange="origVal=this.value; newVal=\'\'; '
+ return preg_replace('/\/>/', ' onChange="origVal=this.value; newVal=\'\'; '
. 'for (i=0;i<origVal.length;i++) { if (origVal.charAt(i)>=\'0\' '
. '&& origVal.charAt(i)<=\'9\') newVal += origVal.charAt(i); } '
- . 'this.value=newVal;">', $this->createWidget_String());
+ . 'this.value=newVal;" />', $this->createWidget_String());
else
return $this->createWidget_String();
}
function createWidget_Float() {
-
+
global $javascript_on;
// add onChange javascript handler to a regular string widget
- // which will strip out all non-numeric (period also OK) chars
+ // which will strip out all non-numeric (period also OK) chars
if ($javascript_on)
- return preg_replace('/>/', ' onChange="origVal=this.value; newVal=\'\'; '
+ return preg_replace('/\/>/', ' onChange="origVal=this.value; newVal=\'\'; '
. 'for (i=0;i<origVal.length;i++) { if ((origVal.charAt(i)>=\'0\' '
. '&& origVal.charAt(i)<=\'9\') || origVal.charAt(i)==\'.\') '
- . 'newVal += origVal.charAt(i); } this.value=newVal;">'
+ . 'newVal += origVal.charAt(i); } this.value=newVal;" />'
, $this->createWidget_String());
else
return $this->createWidget_String();
function createWidget_Boolean() {
/* Do the whole current value thing. */
if ($this->value != SMPREF_NO) {
- $yes_chk = ' checked=""';
+ $yes_chk = ' checked="checked"';
$no_chk = '';
} else {
$yes_chk = '';
- $no_chk = ' checked=""';
+ $no_chk = ' checked="checked"';
}
/* Build the yes choice. */
$yes_option = '<input type="radio" id="new_' . $this->name . '_yes" '
. 'name="new_' . $this->name . '" value="' . SMPREF_YES . '"'
- . $yes_chk . ' ' . $this->script . '> '
+ . $yes_chk . ' ' . $this->script . ' /> '
. '<label for="new_'.$this->name.'_yes">' . _("Yes") . '</label>';
/* Build the no choice. */
$no_option = '<input type="radio" id="new_' . $this->name . '_no" '
. 'name="new_' . $this->name . '" value="' . SMPREF_NO . '"'
- . $no_chk . ' ' . $this->script . '> '
+ . $no_chk . ' ' . $this->script . ' /> '
. '<label for="new_'.$this->name.'_no">' . _("No") . '</label>';
/* Build and return the combined "boolean widget". */
function createWidget_Hidden() {
$result = '<input type="hidden" name="new_' . $this->name
- . '" value="' . $this->value . '" ' . $this->script . '>';
+ . '" value="' . htmlspecialchars($this->value)
+ . '" ' . $this->script . ' />';
return ($result);
}
function create_hidden_element($name, $value) {
$result = '<input type="hidden" '
. 'name="' . $name . '" '
- . 'value="' . $value . '">';
+ . 'value="' . htmlspecialchars($value) . '" />';
return ($result);
}
/* Create a new SquirrelOption for each set of option values. */
foreach ($optvals as $grpkey => $grpopts) {
foreach ($grpopts as $optset) {
- if (isset($optset['posvals'])) {
- /* Create a new option with all values given. */
- $next_option = new SquirrelOption(
- $optset['name'],
- $optset['caption'],
- $optset['type'],
- (isset($optset['refresh']) ? $optset['refresh'] : SMOPT_REFRESH_NONE),
- (isset($optset['initial_value']) ? $optset['initial_value'] : ''),
- $optset['posvals']
- );
- } else {
- /* Create a new option with all but possible values given. */
- $next_option = new SquirrelOption(
- $optset['name'],
- $optset['caption'],
- $optset['type'],
- (isset($optset['refresh']) ? $optset['refresh'] : SMOPT_REFRESH_NONE),
- (isset($optset['initial_value']) ? $optset['initial_value'] : '')
- );
- }
+ /* Create a new option with all values given. */
+ $next_option = new SquirrelOption(
+ $optset['name'],
+ $optset['caption'],
+ $optset['type'],
+ (isset($optset['refresh']) ? $optset['refresh'] : SMOPT_REFRESH_NONE),
+ (isset($optset['initial_value']) ? $optset['initial_value'] : ''),
+ (isset($optset['posvals']) ? $optset['posvals'] : ''),
+ (isset($optset['htmlencoded']) ? $optset['htmlencoded'] : false)
+ );
/* If provided, set the size for this option. */
if (isset($optset['size'])) {
$next_option->setSize($optset['size']);
}
+ /* If provided, set the trailing_text for this option. */
+ if (isset($optset['trailing_text'])) {
+ $next_option->setTrailingText($optset['trailing_text']);
+ }
+
/* If provided, set the comment for this option. */
if (isset($optset['comment'])) {
$next_option->setComment($optset['comment']);
function OptionSubmit( $name ) {
echo html_tag( 'tr',
- html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '"> ', 'right', '', 'colspan="2"' )
+ html_tag( 'td', '<input type="submit" value="' . _("Submit") . '" name="' . $name . '" /> ', 'right', '', 'colspan="2"' )
) . "\n";
}
-?>
+// vim: et ts=4
+?>
\ No newline at end of file