return ($result);
}
-
-function createOptionGroups($optgrps, $optvals) {
- return create_option_groups($optgrps, $optvals);
-}
-
function create_option_groups($optgrps, $optvals) {
/* Build a simple array with which to start. */
$result = array();
return ($result);
}
-function printOptionGroups($option_groups) {
- print_option_groups($option_groups);
-}
-
function print_option_groups($option_groups) {
+ /* Print each option group. */
foreach ($option_groups as $next_optgrp) {
- echo '<TR><TD ALIGN="CENTER" VALIGN="MIDDLE" COLSPAN="2" NOWRAP><B>'
- . $next_optgrp['name'] . "</B></TD></TR>\n";
+ /* If it is not blank, print the name for this option group. */
+ if ($next_optgrp['name'] != '') {
+ echo '<TR><TD ALIGN=CENTER VALIGN=MIDDLE COLSPAN=2 NOWRAP><B>'
+ . $next_optgrp['name']
+ . "</B></TD></TR>\n";
+ }
+
+ /* Print each option in this option group. */
foreach ($next_optgrp['options'] as $option) {
if ($option->type != SMOPT_TYPE_HIDDEN) {
echo "<TR>\n";
echo $option->createHTMLWidget();
}
}
+
+ /* Print an empty row after this option group. */
echo "<TR><TD COLSPAN=\"2\"> </TD></TR>\n";
}
}
case SMOPT_PAGE_MAIN: break;
case SMOPT_PAGE_PERSONAL:
$optpage_name = _("Personal Information");
- $optpage_file = 'options_personal.php';
+ $optpage_file = '../src/options_personal.php';
$optpage_loader = 'load_optpage_data_personal';
break;
case SMOPT_PAGE_DISPLAY:
$optpage_name = _("Display Preferences");
- $optpage_file = 'options_display.php';
+ $optpage_file = '../src/options_display.php';
$optpage_loader = 'load_optpage_data_display';
break;
case SMOPT_PAGE_HIGHLIGHT:
$optpage_name = _("Message Highlighting");
- $optpage_file = 'options_highlight.php';
+ $optpage_file = '../src/options_highlight.php';
$optpage_loader = 'load_optpage_data_highlight';
break;
case SMOPT_PAGE_FOLDER:
$optpage_name = _("Folder Preferences");
- $optpage_file = 'options_folder.php';
+ $optpage_file = '../src/options_folder.php';
$optpage_loader = 'load_optpage_data_folder';
break;
case SMOPT_PAGE_ORDER:
$optpage_name = _("Index Order");
- $optpage_file = 'options_order.php';
+ $optpage_file = '../src/options_order.php';
$optpage_loader = 'load_optpage_data_order';
break;
- default: do_hook('set_optpage_loadinfo');
+ default: do_hook('optpage_set_loadinfo');
}
/**********************************************************/
/*************************************************************************/
} else {
echo '<FORM NAME="f" ACTION="options.php" METHOD="POST"><BR>' . "\n"
- . '<TABLE WIDTH="100%" CELLPADDING="2" CELLSPACING="0" BORDER="0">' . "\n"
+ . '<TABLE WIDTH="100%" CELLPADDING=2 CELLSPACING=0 BORDER=0>' . "\n"
. create_optpage_element($optpage)
. create_optmode_element(SMOPT_MODE_SUBMIT);
/* Output the option groups for this page. */
print_option_groups($optpage_data['options']);
- /*** FIXME: CURRENTLY, THIS NEXT SWITCH STATEMENT DOES NOT TAKE
- *** INTO ACCOUNT FOR PLUGINS. NEED TO FIX IT. ***/
-
/* Set the inside_hook_name and submit_name. */
switch ($optpage) {
case SMOPT_PAGE_PERSONAL:
break;
case SMOPT_PAGE_HIGHLIGHT:
$inside_hook_name = 'options_highlight_inside';
- $bottom_hook_name = 'options_display_bottom';
+ $bottom_hook_name = 'options_highlight_bottom';
$submit_name = 'submit_highlight';
break;
case SMOPT_PAGE_FOLDER:
$inside_hook_name = 'options_folder_inside';
- $bottom_hook_name = 'options_display_bottom';
+ $bottom_hook_name = 'options_folder_bottom';
$submit_name = 'submit_folder';
break;
case SMOPT_PAGE_ORDER: