X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Fdisplay.php;h=2774c9c372dbd52ce24bc201c2cd8d2810500826;hp=7ccb61101aa553d618aa3568cac12c6bc0167012;hb=deb25c8f038fb468935c920c2c6f2c61b3e72ece;hpb=ac50138c1be7836d931e8c45a959f815a500203f diff --git a/include/options/display.php b/include/options/display.php index 7ccb6110..2774c9c3 100644 --- a/include/options/display.php +++ b/include/options/display.php @@ -3,23 +3,74 @@ /** * options_display.php * - * Copyright (c) 1999-2002 The SquirrelMail Project Team - * Licensed under the GNU GPL. For full terms see the file COPYING. - * * Displays all optinos about display preferences * - * $Id$ + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail */ -/* Define the group constants for the display options page. */ +/** Define the group constants for the display options page. */ define('SMOPT_GRP_GENERAL', 0); define('SMOPT_GRP_MAILBOX', 1); define('SMOPT_GRP_MESSAGE', 2); -/* Define the optpage load function for the display options page. */ +/** + * Icon themes and user CSS themes should probably both be moved to conf.pl + * + * TODO: move to conf.pl + **/ +// load icon themes if in use +global $use_icons; +if ($use_icons) { + global $icon_themes; + $dirName = SM_PATH . 'images/themes'; + if (is_readable($dirName) && is_dir($dirName)) { + $d = dir($dirName); + while($dir = $d->read()) { + if ($dir != "." && $dir != "..") { + if (is_dir($dirName."/".$dir) && file_exists("$dirName/$dir/theme.php")) + include("$dirName/$dir/theme.php"); + } + } + } +} + +// load user-provided CSS themes +global $css_themes; +$dirName = SM_PATH . 'css'; +if (is_readable($dirName) && is_dir($dirName)) { + $d = dir($dirName); + while($dir = $d->read()) { + if ($dir != "." && $dir != "..") { + if (is_dir($dirName."/".$dir) && file_exists("$dirName/$dir/config.php")) + include("$dirName/$dir/config.php"); + } + } +} + +global $use_iframe; +if (! isset($use_iframe)) $use_iframe=false; + +/** + * This function builds an array with all the information about + * the options available to the user, and returns it. The options + * are grouped by the groups in which they are displayed. + * For each option, the following information is stored: + * - name: the internal (variable) name + * - caption: the description of the option in the UI + * - type: one of SMOPT_TYPE_* + * - refresh: one of SMOPT_REFRESH_* + * - size: one of SMOPT_SIZE_* + * - save: the name of a function to call when saving this option + * @return array all option information + */ function load_optpage_data_display() { - global $theme, $language, $languages, $js_autodetect_results, - $compose_new_win, $default_use_mdn, $squirrelmail_language, $allow_thread_sort; + global $theme, $fontsets, $language, $languages,$aTemplateSet, + $default_use_mdn, $squirrelmail_language, $allow_thread_sort, + $show_alternative_names, $use_icons, $use_iframe, $sTemplateID, + $oTemplate, $css_themes; /* Build a simple array into which we will build options. */ $optgrps = array(); @@ -33,60 +84,152 @@ function load_optpage_data_display() { $optgrps[SMOPT_GRP_GENERAL] = _("General Display Options"); $optvals[SMOPT_GRP_GENERAL] = array(); + /* load the template set option */ + $templateset_values = array(); + + foreach ($aTemplateSet as $sKey => $aTemplateSetAttributes) { + $templateset_values[$aTemplateSetAttributes['NAME']] = $aTemplateSetAttributes['ID']; + } + ksort($templateset_values); + $templateset_values = array_flip($templateset_values); + // display template options only when there is more than one template + if (count($templateset_values)>1) { + $optvals[SMOPT_GRP_GENERAL][] = array( + 'name' => 'sTemplateID', + 'caption' => _("Skin"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_ALL, + 'posvals' => $templateset_values, + 'save' => 'save_option_template' + ); + } + /* Load the theme option. */ + + /** + * User themes start with a 'u_', template themes start with a 't_' to + * differentiate which is which. This seems kind of hackish, but we can + * come up with a better solution later. + * + * TODO: Clean me. + **/ $theme_values = array(); - foreach ($theme as $theme_key => $theme_attributes) { - $theme_values[$theme_attributes['NAME']] = $theme_attributes['PATH']; + + // Always provide the template default first. + $theme_values['none'] = 'Template Default Theme'; + + // List alternate themes provided by templates first +/* + * Since this requires mods to the template class, I'm holding off on alternate + * template styles until Paul finishes template inheritence. + * -- SB, 2006-09-30 + * + $template_provided = $oTemplate->get_alternative_stylesheets(); + asort($template_provided); + foreach ($template_provided as $sheet=>$name) { + $theme_values['t_'.$sheet] = 'Template Theme - '.htmlspecialchars($name); + } +*/ + // Next, list styles provided in SM_PATH/css/ + // FIXME, these should probably be defined in conf.pl!! + asort($css_themes); + foreach ($css_themes as $style) { + $theme_values['u_'.$style['PATH']] = 'User Theme - '.htmlspecialchars($style['NAME']); } - ksort($theme_values); - $theme_values = array_flip($theme_values); + $optvals[SMOPT_GRP_GENERAL][] = array( 'name' => 'chosen_theme', 'caption' => _("Theme"), 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_ALL, 'posvals' => $theme_values, - 'save' => 'save_option_theme' + 'save' => 'css_theme_save' ); - - $css_values = array( 'none' => _("Default" ) ); - $handle=opendir('../themes/css/'); - while ($file = readdir($handle) ) { - if ( substr( $file, -4 ) == '.css' ) { - $css_values[$file] = substr( $file, 0, strlen( $file ) - 4 ); + + /* Icon theme selection */ + if ($use_icons) { + global $icon_themes, $icon_theme; + + $temp = array(); + $value = 0; + for ($count = 0; $count < sizeof($icon_themes); $count++) { + $temp[$icon_themes[$count]['PATH']] = $icon_themes[$count]['NAME']; + } + if (sizeof($icon_themes) > 0) { + $optvals[SMOPT_GRP_GENERAL][] = array( + 'name' => 'icon_theme', + 'caption' => _("Icon Theme"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_NONE, + 'posvals' => $temp, + 'save' => 'icon_theme_save' + ); } } - closedir($handle); - - if ( count( $css_values > 1 ) ) { - + + $fontset_values = array(); + $fontset_list = array(); + + if (!empty($fontsets) && is_array($fontsets)) { + + foreach (array_keys($fontsets) as $fontset_key) { + $fontset_list[$fontset_key]=$fontset_key; + } + ksort($fontset_list); + } + + if (count($fontset_list) > 1) { + $fontset_list = array_merge(array('' => _("Default font style")), $fontset_list); $optvals[SMOPT_GRP_GENERAL][] = array( - 'name' => 'custom_css', - 'caption' => _("Custom Stylesheet"), + 'name' => 'chosen_fontset', + 'caption' => _("Font style"), 'type' => SMOPT_TYPE_STRLIST, 'refresh' => SMOPT_REFRESH_ALL, - 'posvals' => $css_values + 'posvals' => $fontset_list ); - } - + + $optvals[SMOPT_GRP_GENERAL][] = array( + 'name' => 'chosen_fontsize', + 'caption' => _("Font size"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_ALL, + 'posvals' => array('' => _("Default font size"), + '8' => '8 px', + '10' => '10 px', + '12' => '12 px', + '14' => '14 px') + ); + $language_values = array(); foreach ($languages as $lang_key => $lang_attributes) { if (isset($lang_attributes['NAME'])) { $language_values[$lang_key] = $lang_attributes['NAME']; + if ( isset($show_alternative_names) && + $show_alternative_names && + isset($lang_attributes['ALTNAME']) ) { + $language_values[$lang_key] .= " / " . $lang_attributes['ALTNAME']; + } } } + asort($language_values); $language_values = array_merge(array('' => _("Default")), $language_values); $language = $squirrelmail_language; - $optvals[SMOPT_GRP_GENERAL][] = array( - 'name' => 'language', - 'caption' => _("Language"), - 'type' => SMOPT_TYPE_STRLIST, - 'refresh' => SMOPT_REFRESH_ALL, - 'posvals' => $language_values - ); + + // add language selection only when more than 2 languages are available + // (default, English and some other) + if (count($language_values)>2) { + $optvals[SMOPT_GRP_GENERAL][] = array( + 'name' => 'language', + 'caption' => _("Language"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_ALL, + 'posvals' => $language_values, + 'htmlencoded' => true + ); + } /* Set values for the "use javascript" option. */ $optvals[SMOPT_GRP_GENERAL][] = array( @@ -96,21 +239,26 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_ALL, 'posvals' => array(SMPREF_JS_AUTODETECT => _("Autodetect"), SMPREF_JS_ON => _("Always"), - SMPREF_JS_OFF => _("Never")) + SMPREF_JS_OFF => _("Never")), + 'save' => 'save_option_javascript_autodetect', + 'script' => 'onclick="document.forms[0].new_js_autodetect_results.value = \'' . SMPREF_JS_ON . '\';"' ); - $js_autodetect_script = - "\n"; - $js_autodetect_results = SMPREF_JS_OFF; $optvals[SMOPT_GRP_GENERAL][] = array( 'name' => 'js_autodetect_results', 'caption' => '', 'type' => SMOPT_TYPE_HIDDEN, - 'refresh' => SMOPT_REFRESH_NONE, - 'script' => $js_autodetect_script, - 'save' => 'save_option_javascript_autodetect' + 'refresh' => SMOPT_REFRESH_NONE + //'post_script' => $js_autodetect_script, + ); + + $optvals[SMOPT_GRP_GENERAL][] = array( + 'name' => 'hour_format', + 'caption' => _("Hour Format"), + 'type' => SMOPT_TYPE_STRLIST, + 'refresh' => SMOPT_REFRESH_FOLDERLIST, + 'posvals' => array(SMPREF_TIME_12HR => _("12-hour clock"), + SMPREF_TIME_24HR => _("24-hour clock")) ); /*** Load the General Options into the array ***/ @@ -119,7 +267,7 @@ function load_optpage_data_display() { $optvals[SMOPT_GRP_MAILBOX][] = array( 'name' => 'show_num', - 'caption' => _("Number of Messages to Index"), + 'caption' => _("Number of Messages per Page"), 'type' => SMOPT_TYPE_INTEGER, 'refresh' => SMOPT_REFRESH_NONE, 'size' => SMOPT_SIZE_TINY @@ -132,6 +280,27 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_NONE ); + $optvals[SMOPT_GRP_MAILBOX][] = array( + 'name' => 'fancy_index_highlite', + 'caption' => _("Enable Fancy Row Mouseover Highlighting"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[SMOPT_GRP_MAILBOX][] = array( + 'name' => 'show_flag_buttons', + 'caption' => _("Show Flag / Unflag Buttons"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + + $optvals[SMOPT_GRP_MAILBOX][] = array( + 'name' => 'show_copy_buttons', + 'caption' => _("Enable Message Copy Buttons"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + $optvals[SMOPT_GRP_MAILBOX][] = array( 'name' => 'page_selector', 'caption' => _("Enable Page Selector"), @@ -139,6 +308,13 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_NONE ); + $optvals[SMOPT_GRP_MAILBOX][] = array( + 'name' => 'compact_paginator', + 'caption' => _("Use Compact Page Selector"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); + $optvals[SMOPT_GRP_MAILBOX][] = array( 'name' => 'page_selector_max', 'caption' => _("Maximum Number of Pages to Show"), @@ -147,44 +323,61 @@ function load_optpage_data_display() { 'size' => SMOPT_SIZE_TINY ); - /*** Load the General Options into the array ***/ - $optgrps[SMOPT_GRP_MESSAGE] = _("Message Display and Composition"); - $optvals[SMOPT_GRP_MESSAGE] = array(); + $optvals[SMOPT_GRP_MAILBOX][] = array( + 'name' => 'show_full_date', + 'caption' => _("Always Show Full Date"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_NONE + ); - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'wrap_at', - 'caption' => _("Wrap Incoming Text At"), + $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_MESSAGE][] = array( - 'name' => 'editor_size', - 'caption' => _("Size of Editor Window"), + $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_MESSAGE][] = array( - 'name' => 'location_of_buttons', - 'caption' => _("Location of Buttons when Composing"), - 'type' => SMOPT_TYPE_STRLIST, +/* +FIXME! + disabled because the template doesn't support it (yet?) + $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, - 'posvals' => array(SMPREF_LOC_TOP => _("Before headers"), - SMPREF_LOC_BETWEEN => _("Between headers and message body"), - SMPREF_LOC_BOTTOM => _("After message body")) + 'size' => SMOPT_SIZE_TINY ); +*/ + + if ($allow_thread_sort == TRUE) { + $optvals[SMOPT_GRP_MAILBOX][] = array( + 'name' => 'sort_by_ref', + 'caption' => _("Enable Thread Sort by References Header"), + 'type' => SMOPT_TYPE_BOOLEAN, + 'refresh' => SMOPT_REFRESH_ALL + ); + } + + /*** Load the General Options into the array ***/ + $optgrps[SMOPT_GRP_MESSAGE] = _("Message Display Options"); + $optvals[SMOPT_GRP_MESSAGE] = array(); + $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'use_javascript_addr_book', - 'caption' => _("Addressbook Display Format"), - 'type' => SMOPT_TYPE_STRLIST, + 'name' => 'wrap_at', + 'caption' => _("Wrap Incoming Text At"), + 'type' => SMOPT_TYPE_INTEGER, 'refresh' => SMOPT_REFRESH_NONE, - 'posvals' => array('1' => _("Javascript"), - '0' => _("HTML")) + 'size' => SMOPT_SIZE_TINY ); $optvals[SMOPT_GRP_MESSAGE][] = array( @@ -194,6 +387,16 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_NONE ); + if ($use_iframe) { + // Type is set to string in order to be able to use 100%. + $optvals[SMOPT_GRP_MESSAGE][] = array( + 'name' => 'iframe_height', + 'caption' => _("Height of inline frame"), + 'type' => SMOPT_TYPE_STRING, + 'size' => SMOPT_SIZE_TINY, + 'refresh' => SMOPT_REFRESH_NONE + ); + } $optvals[SMOPT_GRP_MESSAGE][] = array( 'name' => 'enable_forward_as_attachment', 'caption' => _("Enable Forward as Attachment"), @@ -201,20 +404,6 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_NONE ); - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'forward_cc', - 'caption' => _("Include CCs when Forwarding Messages"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_NONE - ); - - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'include_self_reply_all', - 'caption' => _("Include Me in CC when I Reply All"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_NONE - ); - $optvals[SMOPT_GRP_MESSAGE][] = array( 'name' => 'show_xmailer_default', 'caption' => _("Enable Mailer Display"), @@ -229,20 +418,6 @@ function load_optpage_data_display() { 'refresh' => SMOPT_REFRESH_NONE ); - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'pf_subtle_link', - 'caption' => _("Enable Subtle Printer Friendly Link"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_NONE - ); - - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'pf_cleandisplay', - 'caption' => _("Enable Printer Friendly Clean Display"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_NONE - ); - if ($default_use_mdn) { $optvals[SMOPT_GRP_MESSAGE][] = array( 'name' => 'mdn_user_support', @@ -253,49 +428,12 @@ function load_optpage_data_display() { } $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'compose_new_win', - 'caption' => _("Compose Messages in New Window"), + 'name' => 'delete_prev_next_display', + 'caption' => _("Show 'Delete & Prev/Next' Links"), 'type' => SMOPT_TYPE_BOOLEAN, 'refresh' => SMOPT_REFRESH_ALL ); - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'compose_width', - 'caption' => _("Width of Compose Window"), - 'type' => SMOPT_TYPE_INTEGER, - 'refresh' => SMOPT_REFRESH_ALL, - 'size' => SMOPT_SIZE_TINY - ); - - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'compose_height', - 'caption' => _("Height of Compose Window"), - 'type' => SMOPT_TYPE_INTEGER, - 'refresh' => SMOPT_REFRESH_ALL, - 'size' => SMOPT_SIZE_TINY - ); - - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'sig_first', - 'caption' => _("Append Signature before Reply/Forward Text"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_NONE - ); - - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'internal_date_sort', - 'caption' => _("Enable Sort by of Receive Date"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_ALL - ); - if ($allow_thread_sort == TRUE) { - $optvals[SMOPT_GRP_MESSAGE][] = array( - 'name' => 'sort_by_ref', - 'caption' => _("Enable Thread Sort by References Header"), - 'type' => SMOPT_TYPE_BOOLEAN, - 'refresh' => SMOPT_REFRESH_ALL - ); - } /* Assemble all this together and return it as our result. */ $result = array( 'grps' => $optgrps, @@ -308,6 +446,33 @@ function load_optpage_data_display() { /** Define any specialized save functions for this option page. ***/ /******************************************************************/ +/** + * This function saves a new template setting. + * It updates the template array. + */ +function save_option_template($option) { + global $aTemplateSet; + + /* Do checking to make sure $new_theme is in the array. */ + $templateset_in_array = false; + for ($i = 0; $i < count($aTemplateSet); ++$i) { + if ($aTemplateSet[$i]['ID'] == $option->new_value) { + $templateset_in_array = true; + break; + } + } + + if (!$templateset_in_array) { + $option->new_value = ''; + } + /* Save the option like normal. */ + save_option($option); +} + +/** + * This function saves a new theme setting. + * It updates the theme array. + */ function save_option_theme($option) { global $theme; @@ -328,19 +493,52 @@ function save_option_theme($option) { save_option($option); } +/** + * This function saves the javascript detection option. + */ function save_option_javascript_autodetect($option) { - global $data_dir, $username, $new_javascript_setting; - - /* Set javascript either on or off. */ - if ($new_javascript_setting == SMPREF_JS_AUTODETECT) { - if ($option->new_value == SMPREF_JS_ON) { - setPref($data_dir, $username, 'javascript_on', SMPREF_JS_ON); - } else { - setPref($data_dir, $username, 'javascript_on', SMPREF_JS_OFF); - } - } else { - setPref($data_dir, $username, 'javascript_on', $new_javascript_setting); + save_option($option); + checkForJavascript(TRUE); +} + +/** + * This function saves the user's icon theme setting + */ +function icon_theme_save($option) { + global $icon_themes, $data_dir, $username; + + + // Don't assume the new value is there, double check + // and only save if found + // + $found = false; + while (!$found && (list($index, $data) = each($icon_themes))) { + if ($data['PATH'] == $option->new_value) + $found = true; + } + if ($found) + setPref($data_dir, $username, 'icon_theme', $option->new_value); + else + setPref($data_dir, $username, 'icon_theme', 'none'); + +} + +function css_theme_save ($option) { + global $css_themes, $data_dir, $username; + + // Don't assume the new value is there, double check + // and only save if found + // + $found = false; + reset($css_themes); + while (!$found && (list($index, $data) = each($css_themes))) { + if ('u_'.$data['PATH'] == $option->new_value) + $found = true; } + if ($found) + setPref($data_dir, $username, 'chosen_theme', $option->new_value); + else + setPref($data_dir, $username, 'chosen_theme', 'none'); } -?> +