X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=1bf50510e3f1128e7f7d54a1e94b1afef7e52a8e;hb=76e034f5084c4b72e243c249a030773bd03e586a;hp=44eb86df029974d503d09ecdcc88e58723ef0605;hpb=cbe5423b30fd1c50b7dd9546778cbebf48804953;p=squirrelmail.git
diff --git a/src/options.php b/src/options.php
index 44eb86df..1bf50510 100644
--- a/src/options.php
+++ b/src/options.php
@@ -3,39 +3,32 @@
/**
* options.php
*
- * Copyright (c) 1999-2001 The SquirrelMail Development 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
* and config.php. Displays preferences as selected and other options.
*
* $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');
+/** Path for SquirrelMail required files. */
+define('SM_PATH','../');
-/* 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');
-}
+/* 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. ***/
/*********************************/
-displayPageHeader($color, _("None"));
-
define('SMOPT_MODE_DISPLAY', 'display');
define('SMOPT_MODE_SUBMIT', 'submit');
define('SMOPT_MODE_LINK', 'link');
@@ -54,9 +47,12 @@ function process_optionmode_submit($optpage, $optpage_data) {
/* Save each option in each option group. */
foreach ($optpage_data['options'] as $option_grp) {
foreach ($option_grp['options'] as $option) {
+ /* 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();
$max_refresh = max($max_refresh, $option->refresh_level);
@@ -72,9 +68,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_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. */
@@ -82,9 +137,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 = '';
@@ -93,46 +148,56 @@ $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 = '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 = '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 = '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 = '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 = '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('set_optpage_loadinfo');
+ default: do_hook('optpage_set_loadinfo');
}
/**********************************************************/
/*** 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. */
$optpage_data = array();
$optpage_data = $optpage_loader();
+ do_hook($optpage_loadhook);
$optpage_data['options'] =
create_option_groups($optpage_data['grps'], $optpage_data['vals']);
}
@@ -141,39 +206,28 @@ if ($optpage != SMOPT_PAGE_MAIN) {
/*** Next, process anything that needs to be processed. ***/
/***********************************************************/
-switch ($optmode) {
- case SMOPT_MODE_SUBMIT:
- $max_refresh = process_optionmode_submit($optpage, $optpage_data);
- break;
- case SMOPT_MODE_LINK:
- $max_refresh = process_optionmode_link($optpage, $optpage_data);
- break;
+if ( isset( $optpage_data ) ) {
+ switch ($optmode) {
+ case SMOPT_MODE_SUBMIT:
+ $max_refresh = process_optionmode_submit($optpage, $optpage_data);
+ break;
+ case SMOPT_MODE_LINK:
+ $max_refresh = process_optionmode_link($optpage, $optpage_data);
+ break;
+ }
}
-/*** MOVE THIS DISPLAY CODE DOWN EVENTUALLY!!! ***/
-
$optpage_title = _("Options");
if (isset($optpage_name) && ($optpage_name != '')) {
$optpage_title .= " - $optpage_name";
}
-?>
-
-
-
- -
|