X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Foptions.php;h=a25c7c98978ea16956d5bbeb0e73730721f32255;hp=44c2279e13f922d6c060ddae3894d6b7c26842c5;hb=91e0dccca7b2452d8b450791cae3aa4125e8889e;hpb=82d304a0501324b276cabab1870755d5352bd21c diff --git a/src/options.php b/src/options.php index 44c2279e..a25c7c98 100644 --- a/src/options.php +++ b/src/options.php @@ -9,11 +9,14 @@ * 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(); @@ -138,7 +142,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. */ @@ -148,7 +152,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"); @@ -191,7 +195,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. */ @@ -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: @@ -239,7 +245,7 @@ if ($optmode == SMOPT_MODE_SUBMIT) { case SMOPT_PAGE_FOLDER: $save_hook_name = 'options_folder_save'; break; - default: + default: $save_hook_name = 'options_save'; break; } @@ -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,15 +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 "\n"; + echo '' . _("Some of your preference changes are not applied.") . "
\n"; + } else { + /* Display a message indicating a successful save. */ + echo '' . _("Successfully Saved Options") . ": $optpage_name
\n"; + } /* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */ if ( !isset( $max_refresh ) ) { } else if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) { - echo '' . _("Refresh Folder List") . '
'; + echo '' . _("Refresh Folder List") . '
'; } else if ($max_refresh) { - echo '' . _("Refresh Page") . '
'; + echo '' . _("Refresh Page") . '
'; } } /******************************************/ @@ -321,7 +338,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { $optpage_blocks[] = array( 'name' =>_("Message Highlighting"), 'url' => 'options_highlight.php', - 'desc' =>_("Based upon given criteria, incoming messages can have different background colors in the message list. This helps to easily distinguish who the messages are from, especially for mailing lists."), + 'desc' =>_("Based upon given criteria, incoming messages can have different background colors in the message list. This helps to easily distinguish who the messages are from, especially for mailing lists."), 'js' => false ); @@ -390,7 +407,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* If we are not looking at the main option page, display the page here. */ /*************************************************************************/ } else { - echo '

' . "\n" + echo addForm('options.php', 'POST', 'f') . create_optpage_element($optpage) . create_optmode_element(SMOPT_MODE_SUBMIT) . html_tag( 'table', '', '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n" @@ -435,7 +452,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* If it is not empty, trigger the inside hook. */ if ($inside_hook_name != '') { - do_hook($inside_hook_name); + do_hook($inside_hook_name); } /* Spit out a submit button. */ @@ -444,14 +461,12 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* If it is not empty, trigger the bottom hook. */ if ($bottom_hook_name != '') { - do_hook($bottom_hook_name); + do_hook($bottom_hook_name); } } - -echo '' . - ''. - ''. - '' . - ''; - ?> + + + + + \ No newline at end of file