X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=c6dd5c7d31c8b2c1010702723637f6acc9d9b9da;hb=1d461a185142e93a21845550100bdcd09ff080b1;hp=c010f106e6e729e7b7e68aaa22a87dd2e4d3c3f5;hpb=80e86e941526449e2b21bc532abb870072e5e083;p=squirrelmail.git diff --git a/src/options.php b/src/options.php index c010f106..c6dd5c7d 100644 --- a/src/options.php +++ b/src/options.php @@ -3,7 +3,7 @@ /** * options.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team + * Copyright (c) 1999-2003 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 @@ -12,24 +12,17 @@ * $Id$ */ -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'); -require_once('../functions/strings.php'); - -/* Set the base uri. */ -ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs); -$base_uri = $regs[1]; - -/* 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'); -} +/* Path for SquirrelMail required files. */ +define('SM_PATH','../'); + +/* SquirrelMail required files. */ +require_once(SM_PATH . 'include/validate.php'); +require_once(SM_PATH . 'functions/global.php'); +require_once(SM_PATH . 'functions/display_messages.php'); +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'); /*********************************/ /*** Build the resultant page. ***/ @@ -58,7 +51,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(); @@ -75,9 +69,68 @@ function process_optionmode_link($optpage) { /* There will be something here, later. */ } + +/** + * This function prints out an option page row. + */ +function print_optionpages_row($leftopt, $rightopt = false) { + global $color; + + if ($rightopt) { + $rightopt_name = html_tag( 'td', '' . $rightopt['name'] . '', 'left', $color[9], 'valign="top" width="49%"' ); + $rightopt_desc = html_tag( 'td', $rightopt['desc'], 'left', $color[0], 'valign="top" width="49%"' ); + } else { + $rightopt_name = html_tag( 'td', ' ', 'left', $color[4], 'valign="top" width="49%"' ); + $rightopt_desc = html_tag( 'td', ' ', 'left', $color[4], 'valign="top" width="49%"' ); + } + + echo + html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', "\n" . + html_tag( 'table', "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', + '' . $leftopt['name'] . '' , + 'left', $color[9], 'valign="top" width="49%"' ) . + html_tag( 'td', + ' ' , + 'left', $color[4], 'valign="top" width="2%"' ) . "\n" . + $rightopt_name + ) . "\n" . + html_tag( 'tr', "\n" . + html_tag( 'td', + $leftopt['desc'] , + 'left', $color[0], 'valign="top" width="49%"' ) . + html_tag( 'td', + ' ' , + 'left', $color[4], 'valign="top" width="2%"' ) . "\n" . + $rightopt_desc + ) , + '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) , + 'left', '', 'valign="top"' ) + ) , + '', $color[4], 'width="100%" cellpadding="0" cellspacing="5" border="0"' ); +} + +/* ---------------------------- main ---------------------------- */ + +/* get the globals that we may need */ +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); +sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); + +sqgetGlobalVar('optpage', $optpage); +sqgetGlobalVar('optmode', $optmode, SQ_POST); +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. */ @@ -85,9 +138,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 = ''; @@ -96,34 +149,35 @@ $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_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_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; @@ -134,8 +188,11 @@ switch ($optpage) { /*** Second, load the option information for this page. ***/ /**********************************************************/ -if ($optpage != SMOPT_PAGE_MAIN) { +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. */ @@ -167,23 +224,20 @@ if (isset($optpage_name) && ($optpage_name != '')) { $optpage_title .= " - $optpage_name"; } -?> - -
- -
-
- -
- -$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"; /*******************************************************************/ /* DO OLD SAVING OF SUBMITTED OPTIONS. THIS WILL BE REMOVED LATER. */ /*******************************************************************/ /* If in submit mode, select a save hook name and run it. */ -if ($optmode == SMOPT_MODE_SUBMIT) { +if ($optmode == SMOPT_MODE_SUBMIT) { /* Select a save hook name. */ switch ($optpage) { case SMOPT_PAGE_PERSONAL: @@ -228,14 +282,18 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* First, display the results of a submission, if needed. */ /**********************************************************/ if ($optmode == SMOPT_MODE_SUBMIT) { + if (!isset($frame_top)) { + $frame_top = '_top'; + } /* Display a message indicating a successful save. */ - echo '' . _("Successfully Saved Options") . ": $optpage_name
\n"; + echo '' . _("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) { + echo '' . _("Refresh Folder List") . '
'; } else if ($max_refresh) { - echo '' . _("Refresh Page") . '
'; + echo '' . _("Refresh Page") . '
'; } } /******************************************/ @@ -304,9 +362,12 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* Now, print out each option page section. */ /********************************************/ $first_optpage = false; - echo "" . - '
' . - "
"; + echo html_tag( 'table', '', '', $color[4], 'width="100%" cellpadding="0" cellspacing="5" border="0"' ) . "\n" . + html_tag( 'tr' ) . "\n" . + html_tag( 'td', '', 'left', '', 'valign="top"' ) . + html_tag( 'table', '', '', $color[4], 'width="100%" cellpadding="3" cellspacing="0" border="0"' ) . "\n" . + html_tag( 'tr' ) . "\n" . + html_tag( 'td', '', 'left' ); foreach ($optpage_blocks as $next_optpage) { if ($first_optpage == false) { $first_optpage = $next_optpage; @@ -320,7 +381,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { print_optionpages_row($first_optpage); } - echo "
\n"; + echo "
\n"; do_hook('options_link_and_description'); @@ -329,10 +390,12 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* If we are not looking at the main option page, display the page here. */ /*************************************************************************/ } else { - echo '

' . "\n" + echo '
' . "\n" . create_optpage_element($optpage) . create_optmode_element(SMOPT_MODE_SUBMIT) - . '' . "\n"; + . html_tag( 'table', '', '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n" + . html_tag( 'tr' ) . "\n" + . html_tag( 'td', '', 'left' ) . "\n"; /* Output the option groups for this page. */ print_option_groups($optpage_data['options']); @@ -377,7 +440,7 @@ if ($optpage == SMOPT_PAGE_MAIN) { /* Spit out a submit button. */ OptionSubmit($submit_name); - echo '
'; + echo ''; /* If it is not empty, trigger the bottom hook. */ if ($bottom_hook_name != '') { @@ -385,76 +448,10 @@ if ($optpage == SMOPT_PAGE_MAIN) { } } -?> - - - - - - - - -" . - '' . - '' . - '' . - "'. - ""; - if ($rightopt) { - echo "'; - } else { - echo ""; - } - - echo '' . "\n" . - '' . - "' . - ""; - if ($rightopt) { - echo "'; - } else { - echo ""; - } - - echo '' . "\n" . - '
" . - '' . $leftopt['name'] . ''. - ' " . - '' . $rightopt['name'] . '' . - ' 
" . - $leftopt['desc'] . - ' " . - $rightopt['desc'] . - ' 
' . - '' . - "\n"; - } +echo '' . + ''. + ''. + '' . + ''; ?>