Happy New Year

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index 66cefb4ca775ac54e60e70174543cda0189b416a..0d320b21030de7769925de18718df578f9761c7e 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -6,7 +6,7 @@
  * Displays the options page. Pulls from proper user preference files
  * and config.php. Displays preferences as selected and other options.
  *
- * @copyright © 1999-2009 The SquirrelMail Project Team
+ * @copyright 1999-2020 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -105,7 +105,7 @@ function process_optionmode_link($optpage) {
 sqgetGlobalVar('optpage',     $optpage);
 sqgetGlobalVar('optmode',     $optmode,         SQ_FORM);
 sqgetGlobalVar('optpage_data',$optpage_data,    SQ_POST);
-sqgetGlobalVar('smtoken',     $submitted_token, SQ_POST, '');
+sqgetGlobalVar('smtoken',     $submitted_token, SQ_FORM, '');
 /* end of getting globals */
 
 /* Make sure we have an Option Page set. Default to main. */
@@ -203,7 +203,7 @@ if ( !@is_file( $optpage_file ) ) {
 // security check before saving anything...
 //FIXME: what about SMOPT_MODE_LINK??
 if ($optmode == SMOPT_MODE_SUBMIT) {
-   sm_validate_security_token($submitted_token, 3600, TRUE);
+   sm_validate_security_token($submitted_token, -1, TRUE);
 }
 
 $optpage_save_error=array();
@@ -466,7 +466,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
             $submit_name = 'submit_order';
             break;
         default:
-            $bottom_hook_name = '';
+            $bottom_hook_name = 'options_generic_bottom';
             $submit_name = 'submit';
     }