X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=24b45cfedde8b1d8aba64364ace9b74f09187720;hb=33991968233a93217be237585a2265d1700883b8;hp=9d9c45a162a9e7650a15bae66eab975586d8febc;hpb=1d80c108a1d741b7dcb562ea1cf6d2214322b192;p=squirrelmail.git
diff --git a/src/options.php b/src/options.php
index 9d9c45a1..24b45cfe 100644
--- a/src/options.php
+++ b/src/options.php
@@ -3,17 +3,20 @@
/**
* 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.
*
* Displays the options page. Pulls from proper user preference files
* and config.php. Displays preferences as selected and other options.
*
- * $Id$
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -24,6 +27,7 @@ require_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/options.php');
require_once(SM_PATH . 'functions/strings.php');
require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/forms.php');
/*********************************/
/*** Build the resultant page. ***/
@@ -51,7 +55,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();
@@ -206,6 +210,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:
@@ -268,7 +274,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";
@@ -285,18 +291,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) happened while saving your options") . "
\n";
+ echo "