X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Foptions.php;h=85598f107123c76774dbf2d57ec776bed42b529f;hb=22476f18b2ff4ae81fd4a52e9f335691e31b7750;hp=e1de4e73880e08eae49b8a5d153fd80c897e152f;hpb=e697b6cc39af08f80d3ee3743c9d4088791af634;p=squirrelmail.git
diff --git a/functions/options.php b/functions/options.php
index e1de4e73..85598f10 100644
--- a/functions/options.php
+++ b/functions/options.php
@@ -1,15 +1,15 @@
new_value = $GLOBALS["new_$name"];
- } else {
+ if ( !sqgetGlobalVar("new_$name", $this->new_value, SQ_POST ) ) {
$this->new_value = '';
}
/* Set the default save function. */
- if ((type != SMOPT_TYPE_HIDDEN) && ($type != SMOPT_TYPE_COMMENT)) {
+ if (($type != SMOPT_TYPE_HIDDEN) && ($type != SMOPT_TYPE_COMMENT)) {
$this->save_function = SMOPT_SAVE_DEFAULT;
} else {
$this->save_function = SMOPT_SAVE_NOOP;
@@ -162,10 +162,13 @@ class SquirrelOption {
case SMOPT_TYPE_COMMENT:
$result = $this->createWidget_Comment();
break;
+ case SMOPT_TYPE_FLDRLIST:
+ $result = $this->createWidget_FolderList();
+ break;
default:
- $result = ''
+ $result = ''
. sprintf(_("Option Type '%s' Not Found"), $this->type)
- . '';
+ . '';
}
/* Add the script for this option. */
@@ -177,44 +180,85 @@ class SquirrelOption {
function createWidget_String() {
switch ($this->size) {
- case SMOPT_SIZE_TINY: $width = 5; break;
- case SMOPT_SIZE_SMALL: $width = 12; break;
- case SMOPT_SIZE_LARGE: $width = 38; break;
- case SMOPT_SIZE_HUGE: $width = 50; break;
+ case SMOPT_SIZE_TINY:
+ $width = 5;
+ break;
+ case SMOPT_SIZE_SMALL:
+ $width = 12;
+ break;
+ case SMOPT_SIZE_LARGE:
+ $width = 38;
+ break;
+ case SMOPT_SIZE_HUGE:
+ $width = 50;
+ break;
case SMOPT_SIZE_NORMAL:
- default: $width = 25;
+ default:
+ $width = 25;
}
- $result = "name\" VALUE=\"$this->value\" SIZE=\"$width\">";
+ $result = "name\" value=\"$this->value\" size=\"$width\">";
return ($result);
}
function createWidget_StrList() {
/* Begin the select tag. */
- $result = "';
return ($result);
}
+ function createWidget_FolderList() {
+ $selected = array(strtolower($this->value));
+
+ /* Begin the select tag. */
+ $result = "name\">";
+
+ /* Add each possible value to the select list. */
+ foreach ($this->possible_values as $real_value => $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 = "";
+ }
+ /* And add the new option string to our select tag. */
+ $result .= $new_option;
+ }
+ /* Close the select tag and return our happy result. */
+ $result .= '';
+ return ($result);
+ }
+
+
function createWidget_TextArea() {
switch ($this->size) {
case SMOPT_SIZE_TINY: $rows = 3; $cols = 10; break;
@@ -224,37 +268,41 @@ class SquirrelOption {
case SMOPT_SIZE_NORMAL:
default: $rows = 5; $cols = 50;
}
- $result = "";
+ $result = "";
return ($result);
}
function createWidget_Integer() {
- return ($this->createWidget_String());
+
+ return $this->createWidget_String();
+
}
function createWidget_Float() {
- return ($this->createWidget_String());
+
+ 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_option = ' "
. _("Yes");
/* Build the no choice. */
- $no_option = ' "
+ $no_option = ' "
. _("No");
/* Build and return the combined "boolean widget". */
@@ -263,8 +311,8 @@ class SquirrelOption {
}
function createWidget_Hidden() {
- $result = '';
+ $result = '';
return ($result);
}
@@ -279,16 +327,17 @@ class SquirrelOption {
}
function changed() {
- return ($this->value !== $this->new_value);
+ return ($this->value != $this->new_value);
}
}
function save_option($option) {
- global $data_dir, $username;
+ if ( !sqgetGlobalVar('username', $username, SQ_SESSION ) ) {
+ /* Can't save the pref if we don't have the username */
+ return;
+ }
+ global $data_dir;
setPref($data_dir, $username, $option->name, $option->new_value);
-
- /* I do not know if this next line does any good. */
- $GLOBALS[$name] = $option->new_value;
}
function save_option_noop($option) {
@@ -304,17 +353,12 @@ function create_optmode_element($optmode) {
}
function create_hidden_element($name, $value) {
- $result = '';
+ $result = '';
return ($result);
}
-
-function createOptionGroups($optgrps, $optvals) {
- return create_option_groups($optgrps, $optvals);
-}
-
function create_option_groups($optgrps, $optvals) {
/* Build a simple array with which to start. */
$result = array();
@@ -377,32 +421,42 @@ function create_option_groups($optgrps, $optvals) {
return ($result);
}
-function printOptionGroups($option_groups) {
- print_option_groups($option_groups);
-}
-
function print_option_groups($option_groups) {
+ /* Print each option group. */
foreach ($option_groups as $next_optgrp) {
- echo '
'
- . $next_optgrp['name'] . " |
\n";
+ /* If it is not blank, print the name for this option group. */
+ if ($next_optgrp['name'] != '') {
+ echo html_tag( 'tr', "\n".
+ html_tag( 'td',
+ '' . $next_optgrp['name'] . '' ,
+ 'center' ,'', 'valign="middle" colspan="2" nowrap' )
+ ) ."\n";
+ }
+
+ /* Print each option in this option group. */
foreach ($next_optgrp['options'] as $option) {
if ($option->type != SMOPT_TYPE_HIDDEN) {
- echo "\n";
- echo ' '
- . $option->caption . ": | \n";
- echo ' ' . $option->createHTMLWidget() . " | \n";
- echo "
\n";
+ echo html_tag( 'tr', "\n".
+ html_tag( 'td', $option->caption . ':', 'right' ,'', 'valign="middle"' ) .
+ html_tag( 'td', $option->createHTMLWidget(), 'left' )
+ ) ."\n";
} else {
echo $option->createHTMLWidget();
}
}
- echo " |
\n";
+
+ /* Print an empty row after this option group. */
+ echo html_tag( 'tr',
+ html_tag( 'td', ' ', 'left', '', 'colspan="2"' )
+ ) . "\n";
}
}
function OptionSubmit( $name ) {
- echo ' | ' .
- ' |
';
+ echo html_tag( 'tr',
+ html_tag( 'td', ' ', 'left', '', 'colspan="2"' ) .
+ html_tag( 'td', '', 'left', '', 'colspan="2"' )
+ ) . "\n";
}
?>