X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Foptions.php;h=de63a8f4a5798bcaa73cc93ee3088f069af86ec3;hb=fd28fa79b1ccbcc961472de73c39c66036baccdd;hp=56f81d2057a865220350d1ef7cede067240fa3ae;hpb=37a3ed171f56d139ba82af4a69912ed4e811d63c;p=squirrelmail.git
diff --git a/functions/options.php b/functions/options.php
index 56f81d20..de63a8f4 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -3,12 +3,13 @@
/**
* options.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Functions needed to display the options pages.
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
/**********************************************/
@@ -52,6 +53,7 @@ define('SMOPT_SAVE_NOOP', 'save_option_noop');
* Also, I'd like to ask that people leave this alone (mostly :) until
* I get it a little further along. That should only be a day or two or
* three. I will remove this message when it is ready for primetime usage.
+ * @package squirrelmail
*/
class SquirrelOption {
/* The basic stuff. */
@@ -62,6 +64,7 @@ class SquirrelOption {
var $size;
var $comment;
var $script;
+ var $post_script;
/* The name of the Save Function for this option. */
var $save_function;
@@ -72,7 +75,7 @@ class SquirrelOption {
var $possible_values;
function SquirrelOption
- ($name, $caption, $type, $refresh_level, $possible_values = '') {
+ ($name, $caption, $type, $refresh_level, $initial_value = '', $possible_values = '') {
/* Set the basic stuff. */
$this->name = $name;
$this->caption = $caption;
@@ -82,9 +85,12 @@ class SquirrelOption {
$this->size = SMOPT_SIZE_MEDIUM;
$this->comment = '';
$this->script = '';
+ $this->post_script = '';
/* Check for a current value. */
- if (isset($GLOBALS[$name])) {
+ if (!empty($initial_value)) {
+ $this->value = $initial_value;
+ } else if (isset($GLOBALS[$name])) {
$this->value = $GLOBALS[$name];
} else {
$this->value = '';
@@ -128,6 +134,11 @@ class SquirrelOption {
$this->script = $script;
}
+ /* Set the "post script" for this option. */
+ function setPostScript($post_script) {
+ $this->post_script = $post_script;
+ }
+
/* Set the save function for this option. */
function setSaveFunction($save_function) {
$this->save_function = $save_function;
@@ -171,6 +182,9 @@ class SquirrelOption {
. '';
}
+ /* Add the "post script" for this option. */
+ $result .= $this->post_script;
+
/* Now, return the created widget. */
return ($result);
}
@@ -209,7 +223,7 @@ class SquirrelOption {
/* If this value is the current value, select it. */
if ($real_value == $this->value) {
- $new_option .= ' selected';
+ $new_option .= ' selected=""';
}
/* Add the display value to our option string. */
@@ -304,22 +318,24 @@ class SquirrelOption {
function createWidget_Boolean() {
/* Do the whole current value thing. */
if ($this->value != SMPREF_NO) {
- $yes_chk = ' checked';
+ $yes_chk = ' checked=""';
$no_chk = '';
} else {
$yes_chk = '';
- $no_chk = ' checked';
+ $no_chk = ' checked=""';
}
/* Build the yes choice. */
- $yes_option = 'script> "
- . _("Yes");
+ $yes_option = 'name . '" value="' . SMPREF_YES . '"'
+ . $yes_chk . ' ' . $this->script . '> '
+ . '';
/* Build the no choice. */
- $no_option = 'script> "
- . _("No");
+ $no_option = 'name . '" value="' . SMPREF_NO . '"'
+ . $no_chk . ' ' . $this->script . '> '
+ . '';
/* Build and return the combined "boolean widget". */
$result = "$yes_option $no_option";
@@ -328,7 +344,7 @@ class SquirrelOption {
function createWidget_Hidden() {
$result = '';
+ . '" value="' . $this->value . '" ' . $this->script . '>';
return ($result);
}
@@ -395,7 +411,8 @@ function create_option_groups($optgrps, $optvals) {
$optset['name'],
$optset['caption'],
$optset['type'],
- $optset['refresh'],
+ (isset($optset['refresh']) ? $optset['refresh'] : SMOPT_REFRESH_NONE),
+ (isset($optset['initial_value']) ? $optset['initial_value'] : ''),
$optset['posvals']
);
} else {
@@ -404,7 +421,8 @@ function create_option_groups($optgrps, $optvals) {
$optset['name'],
$optset['caption'],
$optset['type'],
- $optset['refresh']
+ (isset($optset['refresh']) ? $optset['refresh'] : SMOPT_REFRESH_NONE),
+ (isset($optset['initial_value']) ? $optset['initial_value'] : '')
);
}
@@ -428,6 +446,11 @@ function create_option_groups($optgrps, $optvals) {
$next_option->setScript($optset['script']);
}
+ /* If provided, set the "post script" for this option. */
+ if (isset($optset['post_script'])) {
+ $next_option->setPostScript($optset['post_script']);
+ }
+
/* Add this option to the option array. */
$result[$grpkey]['options'][] = $next_option;
}
@@ -470,8 +493,7 @@ function print_option_groups($option_groups) {
function OptionSubmit( $name ) {
echo html_tag( 'tr',
- html_tag( 'td', ' ', 'left', '', 'colspan="2"' ) .
- html_tag( 'td', '', 'left', '', 'colspan="2"' )
+ html_tag( 'td', ' ', 'right', '', 'colspan="2"' )
) . "\n";
}