X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Foptions.php;h=7fadcbc6165a23f05cbd16d95928765fa1820ed1;hb=361d6e1bb008cfb3320a9d6c2d49511f884108e2;hp=7617b2bc41adb79c93b891ab9434def182232b8b;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git
diff --git a/functions/options.php b/functions/options.php
index 7617b2bc..7fadcbc6 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. */
@@ -60,8 +62,10 @@ class SquirrelOption {
var $type;
var $refresh_level;
var $size;
+ var $trailing_text;
var $comment;
var $script;
+ var $post_script;
/* The name of the Save Function for this option. */
var $save_function;
@@ -72,7 +76,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;
@@ -80,20 +84,22 @@ class SquirrelOption {
$this->refresh_level = $refresh_level;
$this->possible_values = $possible_values;
$this->size = SMOPT_SIZE_MEDIUM;
+ $this->trailing_text = '';
$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 = '';
}
/* Check for a new value. */
- if (isset($_POST["new_$name"])) {
- $this->new_value = $_POST["new_$name"];
- } else {
+ if ( !sqgetGlobalVar("new_$name", $this->new_value, SQ_POST ) ) {
$this->new_value = '';
}
@@ -120,6 +126,11 @@ class SquirrelOption {
$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;
@@ -130,6 +141,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;
@@ -173,9 +189,9 @@ class SquirrelOption {
. '';
}
- /* Add the script for this option. */
- $result .= $this->script;
-
+ /* Add the "post script" for this option. */
+ $result .= $this->post_script;
+
/* Now, return the created widget. */
return ($result);
}
@@ -199,33 +215,36 @@ class SquirrelOption {
$width = 25;
}
- $result = "name\" value=\"$this->value\" size=\"$width\">";
+ $result = "name\" value=\"" .
+ htmlspecialchars($this->value) .
+ "\" size=\"$width\" $this->script />$this->trailing_text\n";
return ($result);
}
function createWidget_StrList() {
/* Begin the select tag. */
- $result = "$this->trailing_text\n";
return ($result);
}
@@ -233,7 +252,7 @@ class SquirrelOption {
$selected = array(strtolower($this->value));
/* Begin the select tag. */
- $result = "name\">";
+ $result = "name\" $this->script>\n";
/* Add each possible value to the select list. */
foreach ($this->possible_values as $real_value => $disp_value) {
@@ -242,21 +261,21 @@ class SquirrelOption {
$new_option = sqimap_mailbox_option_list(0, $selected, 0, $disp_value);
} else {
/* Start the next new option string. */
- $new_option = "";
+ $new_option .= '>' . htmlspecialchars($disp_value) . "\n";
}
/* And add the new option string to our select tag. */
$result .= $new_option;
}
/* Close the select tag and return our happy result. */
- $result .= '';
+ $result .= "\n";
return ($result);
}
@@ -271,37 +290,63 @@ class SquirrelOption {
default: $rows = 5; $cols = 50;
}
$result = "";
+ . "cols=\"$cols\" $this->script>"
+ . htmlspecialchars($this->value) . "\n";
return ($result);
}
function createWidget_Integer() {
- return ($this->createWidget_String());
+
+ global $javascript_on;
+
+ // 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=\'\'; '
+ . 'for (i=0;i=\'0\' '
+ . '&& origVal.charAt(i)<=\'9\') newVal += origVal.charAt(i); } '
+ . 'this.value=newVal;" />', $this->createWidget_String());
+ else
+ return $this->createWidget_String();
}
function createWidget_Float() {
- return ($this->createWidget_String());
+
+ global $javascript_on;
+
+ // add onChange javascript handler to a regular string widget
+ // which will strip out all non-numeric (period also OK) chars
+ if ($javascript_on)
+ return preg_replace('/\/>/', ' onChange="origVal=this.value; newVal=\'\'; '
+ . 'for (i=0;i=\'0\' '
+ . '&& origVal.charAt(i)<=\'9\') || origVal.charAt(i)==\'.\') '
+ . '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=""';
$no_chk = '';
} else {
$yes_chk = '';
- $no_chk = ' checked';
+ $no_chk = ' checked=""';
}
/* Build the yes choice. */
- $yes_option = ' "
- . _("Yes");
+ $yes_option = 'name . '" value="' . SMPREF_YES . '"'
+ . $yes_chk . ' ' . $this->script . ' /> '
+ . '';
/* Build the no choice. */
- $no_option = ' "
- . _("No");
+ $no_option = 'name . '" value="' . SMPREF_NO . '"'
+ . $no_chk . ' ' . $this->script . ' /> '
+ . '';
/* Build and return the combined "boolean widget". */
$result = "$yes_option $no_option";
@@ -310,7 +355,8 @@ class SquirrelOption {
function createWidget_Hidden() {
$result = '';
+ . '" value="' . htmlspecialchars($this->value)
+ . '" ' . $this->script . ' />';
return ($result);
}
@@ -330,12 +376,11 @@ class SquirrelOption {
}
function save_option($option) {
- if ( !check_php_version(4,1) ) {
- global $_SESSION;
+ if ( !sqgetGlobalVar('username', $username, SQ_SESSION ) ) {
+ /* Can't save the pref if we don't have the username */
+ return;
}
global $data_dir;
- $username = $_SESSION['username'];
-
setPref($data_dir, $username, $option->name, $option->new_value);
}
@@ -354,7 +399,7 @@ function create_optmode_element($optmode) {
function create_hidden_element($name, $value) {
$result = '';
+ . 'value="' . htmlspecialchars($value) . '" />';
return ($result);
}
@@ -378,7 +423,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 {
@@ -387,7 +433,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'] : '')
);
}
@@ -396,6 +443,11 @@ function create_option_groups($optgrps, $optvals) {
$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']);
@@ -411,6 +463,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;
}
@@ -453,9 +510,9 @@ 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";
}
+// vim: et ts=4
?>