/* Define the optpage load function for the display options page. */
function load_optpage_data_display() {
global $theme, $language, $languages, $js_autodetect_results,
- $compose_new_win, $default_use_mdn, $squirrelmail_language, $allow_thread_sort;
+ $compose_new_win, $default_use_mdn, $squirrelmail_language, $allow_thread_sort,
+ $optmode;
/* Build a simple array into which we will build options. */
$optgrps = array();
}
closedir($handle);
- if ( count( $css_values > 1 ) ) {
+ if ( count( $css_values ) > 1 ) {
$optvals[SMOPT_GRP_GENERAL][] = array(
'name' => 'custom_css',
SMPREF_JS_OFF => _("Never"))
);
- $js_autodetect_script =
- "<SCRIPT LANGUAGE=\"JavaScript\" TYPE=\"text/javascript\"><!--\n".
- "document.forms[0].new_js_autodetect_results.value = '" . SMPREF_JS_ON . "';\n".
- "// --></SCRIPT>\n";
- $js_autodetect_results = SMPREF_JS_OFF;
+
+ if ($optmode != 'submit')
+ $onLoadScript = 'document.forms[0].new_js_autodetect_results.value = \'' . SMPREF_JS_ON . '\'';
+ else
+ $onLoadScript = '';
+
$optvals[SMOPT_GRP_GENERAL][] = array(
'name' => 'js_autodetect_results',
'caption' => '',
'type' => SMOPT_TYPE_HIDDEN,
'refresh' => SMOPT_REFRESH_NONE,
- 'post_script' => $js_autodetect_script,
+ //'post_script' => $js_autodetect_script,
'save' => 'save_option_javascript_autodetect'
);
'refresh' => SMOPT_REFRESH_NONE
);
+ $optvals[SMOPT_GRP_MAILBOX][] = array(
+ 'name' => 'truncate_sender',
+ 'caption' => _("Length of From/To Field (0 for full)"),
+ 'type' => SMOPT_TYPE_INTEGER,
+ 'refresh' => SMOPT_REFRESH_NONE,
+ 'size' => SMOPT_SIZE_TINY
+ );
+
+ $optvals[SMOPT_GRP_MAILBOX][] = array(
+ 'name' => 'truncate_subject',
+ 'caption' => _("Length of Subject Field (0 for full)"),
+ 'type' => SMOPT_TYPE_INTEGER,
+ 'refresh' => SMOPT_REFRESH_NONE,
+ 'size' => SMOPT_SIZE_TINY
+ );
+
+ $optvals[SMOPT_GRP_MAILBOX][] = array(
+ 'name' => 'show_recipient_instead',
+ 'caption' => _("Show recipient name if the message is from your default identity"),
+ 'type' => SMOPT_TYPE_BOOLEAN,
+ 'refresh' => SMOPT_REFRESH_NONE,
+ 'size' => SMOPT_SIZE_TINY
+ );
+
+
/*** Load the General Options into the array ***/
$optgrps[SMOPT_GRP_MESSAGE] = _("Message Display and Composition");
$optvals[SMOPT_GRP_MESSAGE] = array();
'refresh' => SMOPT_REFRESH_NONE
);
+ $optvals[SMOPT_GRP_MESSAGE][] = array(
+ 'name' => 'strip_sigs',
+ 'caption' => _("Strip signature when replying"),
+ 'type' => SMOPT_TYPE_BOOLEAN,
+ 'refresh' => SMOPT_REFRESH_NONE
+ );
+
$optvals[SMOPT_GRP_MESSAGE][] = array(
'name' => 'internal_date_sort',
'caption' => _("Enable Sort by of Receive Date"),
/* Assemble all this together and return it as our result. */
$result = array(
'grps' => $optgrps,
- 'vals' => $optvals
+ 'vals' => $optvals,
+ 'xtra' => $onLoadScript
);
return ($result);
}