X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=875bbfb8aa3c47565bb26f76c77a7ddde1dfa2b2;hb=9a3d9100f7c64175e2c10f0e6957803480f6b67a;hp=ab249e2bab576d13d305f07889d0c12859ed6088;hpb=30967a1e09679c395b31929cbdb1a0e88b13f01e;p=squirrelmail.git
diff --git a/src/options.php b/src/options.php
index ab249e2b..875bbfb8 100644
--- a/src/options.php
+++ b/src/options.php
@@ -3,7 +3,7 @@
/**
* options.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Displays the options page. Pulls from proper user preference files
@@ -40,6 +40,7 @@ define('SMOPT_MODE_LINK', 'link');
define('SMOPT_PAGE_MAIN', 'main');
define('SMOPT_PAGE_PERSONAL', 'personal');
define('SMOPT_PAGE_DISPLAY', 'display');
+define('SMOPT_PAGE_COMPOSE', 'compose');
define('SMOPT_PAGE_HIGHLIGHT', 'highlight');
define('SMOPT_PAGE_FOLDER', 'folder');
define('SMOPT_PAGE_ORDER', 'order');
@@ -55,7 +56,7 @@ function process_optionmode_submit($optpage, $optpage_data) {
echo "name = '$option->name', "
. "value = '$option->value', "
. "new_value = '$option->new_value'\n";
- echo "
";
+ echo "
";
*/
if ($option->changed()) {
$option->save();
@@ -142,7 +143,7 @@ if (!isset($optmode)) {
}
/*
- * First, set the load information for each option page.
+ * First, set the load information for each option page.
*/
/* Initialize load information variables. */
@@ -152,7 +153,7 @@ $optpage_loader = '';
/* Set the load information for each page. */
switch ($optpage) {
- case SMOPT_PAGE_MAIN:
+ case SMOPT_PAGE_MAIN:
break;
case SMOPT_PAGE_PERSONAL:
$optpage_name = _("Personal Information");
@@ -166,6 +167,12 @@ switch ($optpage) {
$optpage_loader = 'load_optpage_data_display';
$optpage_loadhook = 'optpage_loadhook_display';
break;
+ case SMOPT_PAGE_COMPOSE:
+ $optpage_name = _("Compose Preferences");
+ $optpage_file = SM_PATH . 'include/options/compose.php';
+ $optpage_loader = 'load_optpage_data_compose';
+ $optpage_loadhook = 'optpage_loadhook_compose';
+ break;
case SMOPT_PAGE_HIGHLIGHT:
$optpage_name = _("Message Highlighting");
$optpage_file = SM_PATH . 'include/options/highlight.php';
@@ -195,7 +202,7 @@ if ( !@is_file( $optpage_file ) ) {
$optpage = SMOPT_PAGE_MAIN;
} else if ($optpage != SMOPT_PAGE_MAIN ) {
/* Include the file for this optionpage. */
-
+
require_once($optpage_file);
/* Assemble the data for this option page. */
@@ -210,6 +217,8 @@ if ( !@is_file( $optpage_file ) ) {
/*** Next, process anything that needs to be processed. ***/
/***********************************************************/
+$optpage_save_error=array();
+
if ( isset( $optpage_data ) ) {
switch ($optmode) {
case SMOPT_MODE_SUBMIT:
@@ -240,10 +249,13 @@ if ($optmode == SMOPT_MODE_SUBMIT) {
case SMOPT_PAGE_DISPLAY:
$save_hook_name = 'options_display_save';
break;
+ case SMOPT_PAGE_COMPOSE:
+ $save_hook_name = 'options_compose_save';
+ break;
case SMOPT_PAGE_FOLDER:
$save_hook_name = 'options_folder_save';
break;
- default:
+ default:
$save_hook_name = 'options_save';
break;
}
@@ -272,7 +284,7 @@ displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data[
echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . "\n" .
html_tag( 'tr' ) . "\n" .
html_tag( 'td', '', 'center' ) .
- "$optpage_title
\n".
+ "$optpage_title
\n".
html_tag( 'table', '', '', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) . "\n" .
html_tag( 'tr' ) . "\n" .
html_tag( 'td', '', 'center', $color[4] ) . "\n";
@@ -289,15 +301,26 @@ if ($optpage == SMOPT_PAGE_MAIN) {
if (!isset($frame_top)) {
$frame_top = '_top';
}
- /* Display a message indicating a successful save. */
- echo '' . _("Successfully Saved Options") . ": $optpage_name
\n";
+
+ if (isset($optpage_save_error) && $optpage_save_error!=array()) {
+ echo "" . _("Error(s) occurred while saving your options") . "
\n";
+ echo "