/**
* options.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 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
*/
-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');
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+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');
+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');
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');
/* Remove Debug Mode Until Needed
echo "name = '$option->name', "
. "value = '$option->value', "
- . "new_value = '$option->new_value'<BR>\n";
+ . "new_value = '$option->new_value'\n";
+ echo "<br />";
*/
if ($option->changed()) {
$option->save();
function print_optionpages_row($leftopt, $rightopt = false) {
global $color;
- echo "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=0 CELLSPACING=5 BORDER=0>" .
- '<TR><TD VALIGN="TOP">' .
- '<TABLE WIDTH="100%" CELLPADDING="3" CELLSPACING="0" BORDER="0">' .
- '<TR>' .
- "<TD VALIGN=TOP BGCOLOR=\"$color[9]\" WIDTH=\"49%\">" .
- '<A HREF="' . $leftopt['url'] . '">' . $leftopt['name'] . '</A>'.
- '</TD>'.
- "<TD VALIGN=TOP BGCOLOR=\"$color[4]\" WIDTH=\"2%\"> </TD>";
if ($rightopt) {
- echo "<TD VALIGN=top BGCOLOR=\"$color[9]\" WIDTH=\"49%\">" .
- '<A HREF="' . $rightopt['url'] . '">' . $rightopt['name'] . '</A>' .
- '</TD>';
+ $rightopt_name = html_tag( 'td', '<a href="' . $rightopt['url'] . '">' . $rightopt['name'] . '</a>', 'left', $color[9], 'valign="top" width="49%"' );
+ $rightopt_desc = html_tag( 'td', $rightopt['desc'], 'left', $color[0], 'valign="top" width="49%"' );
} else {
- echo "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"49%\"> </TD>";
+ $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 '</TR>' .
- '<TR>' .
- "<TD VALIGN=top BGCOLOR=\"$color[0]\" WIDTH=\"49%\">" .
- $leftopt['desc'] .
- '</TD>' .
- "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"2%\"> </TD>";
- if ($rightopt) {
- echo "<TD VALIGN=top BGCOLOR=\"$color[0]\" WIDTH=\"49%\">" .
- $rightopt['desc'] .
- '</TD>';
- } else {
- echo "<TD VALIGN=top BGCOLOR=\"$color[4]\" WIDTH=\"49%\"> </TD>";
- }
-
- echo '</TR>' .
- '</TABLE>' .
- '</TD></TR>' .
- "</TABLE>\n";
+ echo
+ html_tag( 'table', "\n" .
+ html_tag( 'tr', "\n" .
+ html_tag( 'td', "\n" .
+ html_tag( 'table', "\n" .
+ html_tag( 'tr', "\n" .
+ html_tag( 'td',
+ '<a href="' . $leftopt['url'] . '">' . $leftopt['name'] . '</a>' ,
+ '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_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. */
}
/*
- * First, set the load information for each option page.
+ * First, set the load information for each option page.
*/
/* Initialize load information variables. */
/* 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_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;
/*** 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. */
/*** Next, process anything that needs to be processed. ***/
/***********************************************************/
+$optpage_save_error=array();
+
if ( isset( $optpage_data ) ) {
switch ($optmode) {
case SMOPT_MODE_SUBMIT:
break;
}
}
-/*** MOVE THIS DISPLAY CODE DOWN EVENTUALLY!!! ***/
$optpage_title = _("Options");
if (isset($optpage_name) && ($optpage_name != '')) {
$optpage_title .= " - $optpage_name";
}
-echo '<BR>' .
- "<TABLE BGCOLOR=\"$color[0]\" WIDTH=\"95%\" ALIGN=\"CENTER\" CELLPADDING=\"2\" CELLSPACING=\"0\" BORDER=\"0\">\n".
- '<TR><TD ALIGN="CENTER">'.
- "<B>$optpage_title</B><BR>\n".
- '<TABLE WIDTH="100%" BORDER="0" CELLPADDING="5" CELLSPACING="0">'.
- "<TR><TD BGCOLOR=\"$color[4]\" ALIGN=\"CENTER\">\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:
case SMOPT_PAGE_FOLDER:
$save_hook_name = 'options_folder_save';
break;
- default:
+ default:
$save_hook_name = 'options_save';
break;
}
/* Finally, display whatever page we are supposed to show now. */
/***************************************************************/
+displayPageHeader($color, 'None', (isset($optpage_data['xtra']) ? $optpage_data['xtra'] : ''));
+
+echo html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . "\n" .
+ html_tag( 'tr' ) . "\n" .
+ html_tag( 'td', '', 'center' ) .
+ "<b>$optpage_title</b><br />\n".
+ html_tag( 'table', '', '', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) . "\n" .
+ html_tag( 'tr' ) . "\n" .
+ html_tag( 'td', '', 'center', $color[4] ) . "\n";
+
/*
* The main option page has a different layout then the rest of the option
* pages. Therefore, we create it here first, then the others below.
if (!isset($frame_top)) {
$frame_top = '_top';
}
- /* Display a message indicating a successful save. */
- echo '<B>' . _("Successfully Saved Options") . ": $optpage_name</B><BR>\n";
+
+ if (isset($optpage_save_error) && $optpage_save_error!=array()) {
+ echo "<font color=\"$color[2]\"><b>" . _("Error(s) happened while saving your options") . "</b></font><br />\n";
+ echo "<ul>\n";
+ foreach ($optpage_save_error as $error_message) {
+ echo '<li><small>' . $error_message . "</small></li>\n";
+ }
+ echo "</ul>\n";
+ echo '<b>' . _("Some of your preference changes are not applied.") . "</b><br />\n";
+ } else {
+ /* Display a message indicating a successful save. */
+ echo '<b>' . _("Successfully Saved Options") . ": $optpage_name</b><br />\n";
+ }
/* If $max_refresh != SMOPT_REFRESH_NONE, provide a refresh link. */
if ( !isset( $max_refresh ) ) {
} else if ($max_refresh == SMOPT_REFRESH_FOLDERLIST) {
- echo '<A HREF="../src/left_main.php" TARGET="left">' . _("Refresh Folder List") . '</A><BR>';
+ echo '<a href="../src/left_main.php" target="left">' . _("Refresh Folder List") . '</a><br />';
} else if ($max_refresh) {
- echo '<A HREF="../src/webmail.php?right_frame=options.php" TARGET="' . $frame_top . '">' . _("Refresh Page") . '</A><BR>';
+ echo '<a href="../src/webmail.php?right_frame=options.php" target="' . $frame_top . '">' . _("Refresh Page") . '</a><br />';
}
}
/******************************************/
$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
);
'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
+ );
/* Build a section for plugins wanting to register an optionpage. */
do_hook('optpage_register_block');
$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;
/* Now, print out each option page section. */
/********************************************/
$first_optpage = false;
- echo "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=0 CELLSPACING=\"5\" BORDER=\"0\">" .
- '<TR><TD VALIGN="TOP">' .
- "<TABLE BGCOLOR=\"$color[4]\" WIDTH=\"100%\" CELLPADDING=\"3\" CELLSPACING=\"0\" BORDER=\"0\"><TR><TD>";
+ 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;
print_optionpages_row($first_optpage);
}
- echo "</TD></TR></TABLE></TD></TR></TABLE>\n";
+ echo "</td></tr></table></td></tr></table>\n";
do_hook('options_link_and_description');
/* If we are not looking at the main option page, display the page here. */
/*************************************************************************/
} else {
- echo '<FORM NAME="f" ACTION="options.php" METHOD="POST"><BR>' . "\n"
+ echo addForm('options.php', 'post', 'f')
. create_optpage_element($optpage)
. create_optmode_element(SMOPT_MODE_SUBMIT)
- . '<TABLE WIDTH="100%" CELLPADDING=2 CELLSPACING=0 BORDER=0>' . "\n";
+ . html_tag( 'table', '', '', '', 'width="100%" cellpadding="2" cellspacing="0" border="0"' ) . "\n";
/* Output the option groups for this page. */
print_option_groups($optpage_data['options']);
/* 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 '</TABLE></FORM>';
+ echo '</table></form>';
/* If it is not empty, trigger the bottom hook. */
if ($bottom_hook_name != '') {
- do_hook($bottom_hook_name);
+ do_hook($bottom_hook_name);
}
}
-
-echo '</TD></TR>' .
- '</TABLE>'.
- '</TD></TR>'.
- '</TABLE>' .
- '</BODY></HTML>';
-
?>
+</td></tr>
+</table>
+</td></tr>
+</table>
+</body></html>
projects / squirrelmail.git / blobdiff