X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=6ef511f044ae210a4079363f56637a55e6574600;hb=335aac838df96dc73774aa319074deb2ace3a000;hp=7cdb01fbc9c0876e8b0de74e3307ba8f6753cb26;hpb=2fad95fae22862b6488bfed2ec007419bc608cbe;p=squirrelmail.git diff --git a/src/options.php b/src/options.php index 7cdb01fb..6ef511f0 100644 --- a/src/options.php +++ b/src/options.php @@ -3,39 +3,31 @@ /** * options.php * - * Copyright (c) 1999-2001 The Squirrelmail Development 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$ + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail + * @subpackage prefs */ -require_once('../src/validate.php'); -require_once('../functions/display_messages.php'); -require_once('../functions/imap.php'); -require_once('../functions/array.php'); -require_once('../functions/options.php'); +/** + * Include the SquirrelMail initialization file. + */ +require('../include/init.php'); -/* Set the base uri. */ -ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs); -$base_uri = $regs[1]; +/* SquirrelMail required files. */ -/* First and foremost, deal with language stuff. */ -if (isset($language)) { - setcookie('squirrelmail_language', $language, time()+2592000, $base_uri); - $squirrelmail_language = $language; -} else { - $language = getPref($data_dir, $username, 'language'); -} +//include(SM_PATH . 'functions/imap_general.php'); +require_once(SM_PATH . 'functions/options.php'); +require_once(SM_PATH . 'functions/forms.php'); /*********************************/ /*** Build the resultant page. ***/ /*********************************/ -displayPageHeader($color, 'None'); - define('SMOPT_MODE_DISPLAY', 'display'); define('SMOPT_MODE_SUBMIT', 'submit'); define('SMOPT_MODE_LINK', 'link'); @@ -43,6 +35,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'); @@ -57,7 +50,8 @@ function process_optionmode_submit($optpage, $optpage_data) { /* Remove Debug Mode Until Needed echo "name = '$option->name', " . "value = '$option->value', " - . "new_value = '$option->new_value'
\n"; + . "new_value = '$option->new_value'\n"; + echo "
"; */ if ($option->changed()) { $option->save(); @@ -74,9 +68,21 @@ function process_optionmode_link($optpage) { /* There will be something here, later. */ } + + +/* ---------------------------- main ---------------------------- */ + +/* get the globals that we may need */ +sqgetGlobalVar('optpage', $optpage); +sqgetGlobalVar('optmode', $optmode, SQ_FORM); +sqgetGlobalVar('optpage_data',$optpage_data, SQ_POST); +/* end of getting globals */ + /* Make sure we have an Option Page set. Default to main. */ -if (!isset($optpage)) { - $optpage = 'main'; +if ( !isset($optpage) || $optpage == '' ) { + $optpage = SMOPT_PAGE_MAIN; +} else { + $optpage = strip_tags( $optpage ); } /* Make sure we have an Option Mode set. Default to display. */ @@ -84,9 +90,9 @@ if (!isset($optmode)) { $optmode = SMOPT_MODE_DISPLAY; } -/*************************************************************/ -/*** First, set the load information for each option page. ***/ -/*************************************************************/ +/* + * First, set the load information for each option page. + */ /* Initialize load information variables. */ $optpage_name = ''; @@ -95,31 +101,43 @@ $optpage_loader = ''; /* Set the load information for each page. */ switch ($optpage) { - case SMOPT_PAGE_MAIN: break; + case SMOPT_PAGE_MAIN: + break; case SMOPT_PAGE_PERSONAL: - $optpage_name = _("Personal Information"); - $optpage_file = '../src/options_personal.php'; - $optpage_loader = 'load_optpage_data_personal'; + $optpage_name = _("Personal Information"); + $optpage_file = SM_PATH . 'include/options/personal.php'; + $optpage_loader = 'load_optpage_data_personal'; + $optpage_loadhook = 'optpage_loadhook_personal'; break; case SMOPT_PAGE_DISPLAY: $optpage_name = _("Display Preferences"); - $optpage_file = '../src/options_display.php'; + $optpage_file = SM_PATH . 'include/options/display.php'; $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 = '../src/options_highlight.php'; + $optpage_file = SM_PATH . 'include/options/highlight.php'; $optpage_loader = 'load_optpage_data_highlight'; + $optpage_loadhook = 'optpage_loadhook_highlight'; break; case SMOPT_PAGE_FOLDER: $optpage_name = _("Folder Preferences"); - $optpage_file = '../src/options_folder.php'; + $optpage_file = SM_PATH . 'include/options/folder.php'; $optpage_loader = 'load_optpage_data_folder'; + $optpage_loadhook = 'optpage_loadhook_folder'; break; case SMOPT_PAGE_ORDER: $optpage_name = _("Index Order"); - $optpage_file = '../src/options_order.php'; + $optpage_file = SM_PATH . 'include/options/order.php'; $optpage_loader = 'load_optpage_data_order'; + $optpage_loadhook = 'optpage_loadhook_order'; break; default: do_hook('optpage_set_loadinfo'); } @@ -128,21 +146,26 @@ switch ($optpage) { /*** Second, load the option information for this page. ***/ /**********************************************************/ -if ($optpage != SMOPT_PAGE_MAIN) { +if ( !@is_file( $optpage_file ) ) { + $optpage = SMOPT_PAGE_MAIN; +} elseif ($optpage != SMOPT_PAGE_MAIN ) { /* Include the file for this optionpage. */ + require_once($optpage_file); /* Assemble the data for this option page. */ $optpage_data = array(); $optpage_data = $optpage_loader(); - $optpage_data['options'] = - create_option_groups($optpage_data['grps'], $optpage_data['vals']); + do_hook($optpage_loadhook); + $optpage_data['options'] = create_option_groups($optpage_data['grps'], $optpage_data['vals']); } /***********************************************************/ /*** Next, process anything that needs to be processed. ***/ /***********************************************************/ +$optpage_save_error=array(); + if ( isset( $optpage_data ) ) { switch ($optmode) { case SMOPT_MODE_SUBMIT: @@ -153,30 +176,18 @@ if ( isset( $optpage_data ) ) { break; } } -/*** MOVE THIS DISPLAY CODE DOWN EVENTUALLY!!! ***/ $optpage_title = _("Options"); if (isset($optpage_name) && ($optpage_name != '')) { $optpage_title .= " - $optpage_name"; } -?> - -
- - -
-
- -
- -' . _("Successfully Saved Options") . ": $optpage_name
\n"; + if (!isset($frame_top)) { + $frame_top = '_top'; + } + + if (isset($optpage_save_error) && $optpage_save_error!=array()) { + $notice = _("Error(s) occurred while saving your options") . "
\n
    \n"; + foreach ($optpage_save_error as $error_message) { + $notice.= '
  • ' . $error_message . "
    • \n"; + } + $notice.= "
\n" . _("Some of your preference changes were not applied.") . "\n"; + } else { + /* Display a message indicating a successful save. */ + $notice = _("Successfully Saved Options") . ": $optpage_name
\n"; + } /* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */ - if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) { - echo '' . _("Refresh Folder List") . '
'; + if ( !isset( $max_refresh ) ) { + } else if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) { + $notice .= '' . _("Refresh Folder List") . '
'; } else if ($max_refresh) { - echo '' . _("Refresh Page") . '
'; + $notice .= '' . _("Refresh Page") . '
'; } } + + if (!empty($notice)) { + $oTemplate->assign('note', $notice); + $oTemplate->display('note.tpl'); + } + /******************************************/ /* Build our array of Option Page Blocks. */ /******************************************/ @@ -256,7 +292,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 ); @@ -272,7 +308,15 @@ if ($optpage == SMOPT_PAGE_MAIN) { $optpage_blocks[] = array( 'name' => _("Index Order"), 'url' => 'options_order.php', - 'desc' => _("The order of the message index can be rearanged and changed to contain the headers in any order you want."), + 'desc' => _("The order of the message index can be rearranged and changed to contain the headers in any order you want."), + 'js' => false + ); + + /* Build a section for Compose Options. */ + $optpage_blocks[] = array( + 'name' => _("Compose Preferences"), + 'url' => 'options.php?optpage=' . SMOPT_PAGE_COMPOSE, + 'desc' => _("Control the behaviour and layout of writing new mail messages, replying to and forwarding messages."), 'js' => false ); @@ -285,7 +329,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { $js_optpage_blocks = array(); $reg_optpage_blocks = array(); foreach ($optpage_blocks as $cur_optpage) { - if (!$cur_optpage['js']) { + if (!isset($cur_optpage['js']) || !$cur_optpage['js']) { $reg_optpage_blocks[] = $cur_optpage; } else if ($javascript_on == SMPREF_JS_ON) { $js_optpage_blocks[] = $cur_optpage; @@ -296,25 +340,11 @@ if ($optpage == SMOPT_PAGE_MAIN) { /********************************************/ /* Now, print out each option page section. */ /********************************************/ - $first_optpage = false; - echo "" . - '
' . - ""; - foreach ($optpage_blocks as $next_optpage) { - if ($first_optpage == false) { - $first_optpage = $next_optpage; - } else { - print_optionpages_row($first_optpage, $next_optpage); - $first_optpage = false; - } - } - - if ($first_optpage != false) { - print_optionpages_row($first_optpage); - } - - echo "
\n"; + $oTemplate->assign('page_title', $optpage_title); + $oTemplate->assign('options', $optpage_blocks); + $oTemplate->display('option_groups.tpl'); + do_hook('options_link_and_description'); @@ -322,14 +352,6 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* If we are not looking at the main option page, display the page here. */ /*************************************************************************/ } else { - echo '

' . "\n" - . '' . "\n" - . create_optpage_element($optpage) - . create_optmode_element(SMOPT_MODE_SUBMIT); - - /* Output the option groups for this page. */ - print_option_groups($optpage_data['options']); - /* Set the inside_hook_name and submit_name. */ switch ($optpage) { case SMOPT_PAGE_PERSONAL: @@ -342,6 +364,11 @@ if ($optpage == SMOPT_PAGE_MAIN) { $bottom_hook_name = 'options_display_bottom'; $submit_name = 'submit_display'; break; + case SMOPT_PAGE_COMPOSE: + $inside_hook_name = 'options_compose_inside'; + $bottom_hook_name = 'options_compose_bottom'; + $submit_name = 'submit_compose'; + break; case SMOPT_PAGE_HIGHLIGHT: $inside_hook_name = 'options_highlight_inside'; $bottom_hook_name = 'options_highlight_bottom'; @@ -363,91 +390,57 @@ if ($optpage == SMOPT_PAGE_MAIN) { $submit_name = 'submit'; } + // Begin output form + echo addForm('options.php', 'post', 'f') + . create_optpage_element($optpage) + . create_optmode_element(SMOPT_MODE_SUBMIT); + + // Wrap the template in a table to keep from breaking the hooks below + echo "
\n" . + " \n" . + " \n" . + " \n"; + /* 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. */ OptionSubmit($submit_name); - echo '
\n"; + + // This is the only variable that is needed by *just* the template. + $oTemplate->assign('options', $optpage_data['options']); + + /** + * The variables below should not be needed by the template since all plugin + * hooks are called here, not in the template. If we find otherwise, these + * variables can be passed to the template. Commenting out for not. + */ +/* + $oTemplate->assign('max_refresh', isset($max_refresh) ? $max_refresh : NULL); + $oTemplate->assign('page_title', $optpage_title); + $oTemplate->assign('optpage',$optpage); + $oTemplate->assign('optpage_name',$optpage_name); + $oTemplate->assign('optmode',$optmode); + $oTemplate->assign('optpage_data',$optpage_data); +*/ + /** + * END comment block + */ + + $oTemplate->display('options.tpl'); + + echo "
'; + echo "
\n" . + "\n"; /* If it is not empty, trigger the bottom hook. */ if ($bottom_hook_name != '') { - do_hook($bottom_hook_name); + do_hook($bottom_hook_name); } + } -?> -
- - - - - - -" . - '' . - '' . - '' . - "'. - ""; - if ($rightopt) { - echo "'; - } else { - echo ""; - } - - echo '' . - '' . - "' . - ""; - if ($rightopt) { - echo "'; - } else { - echo ""; - } - - echo '' . - '
" . - '' . $leftopt['name'] . ''. - ' " . - '' . $rightopt['name'] . '' . - ' 
" . - $leftopt['desc'] . - ' " . - $rightopt['desc'] . - ' 
' . - '' . - "\n"; - } - -?> +$oTemplate->display('footer.tpl'); +?> \ No newline at end of file