X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Foptions.php;h=abf23cc97abee2256a5bb4a7d87acca801893f67;hb=95dcee50e4d7ffe1d0b686377042ff3b735bc81c;hp=b89cf21f036f68ea57328904cf4d582875c36ac3;hpb=bd9bbfefba8fa274260a37c965f7510bb6670599;p=squirrelmail.git
diff --git a/src/options.php b/src/options.php
index b89cf21f..abf23cc9 100644
--- a/src/options.php
+++ b/src/options.php
@@ -12,23 +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');
-
-/* 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/display_messages.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/array.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. ***/
@@ -57,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();
@@ -74,9 +69,77 @@ 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 */
+if (isset($_GET['optpage'])) {
+ $optpage = $_GET['optpage'];
+}
+elseif (isset($_POST['optpage'])) {
+ $optpage = $_POST['optpage'];
+}
+if (isset($_POST['optmode'])) {
+ $optmode = $_POST['optmode'];
+}
+if (isset($_POST['optpage_data'])) {
+ $optpage_data = $_POST['optpage_data'];
+}
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
+$onetimepad = $_SESSION['onetimepad'];
+$delimiter = $_SESSION['delimiter'];
+
+/* 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 +147,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,34 +158,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;
@@ -133,8 +197,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. */
@@ -166,23 +233,20 @@ if (isset($optpage_name) && ($optpage_name != '')) {
$optpage_title .= " - $optpage_name";
}
-?>
-
-
-
- -
|