*
* Displays all optinos about display preferences
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
define('SMOPT_GRP_MAILBOX', 1);
define('SMOPT_GRP_MESSAGE', 2);
-/**
- * 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;
function load_optpage_data_display() {
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;
+ $show_alternative_names, $use_iframe, $use_icons,
+ $sTemplateID, $oTemplate,
+ $user_themes, $chosen_theme;
/* Build a simple array into which we will build options. */
$optgrps = array();
}
/* 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();
// 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);
+ $template_themes = $oTemplate->get_alternative_stylesheets(true);
+ asort($template_themes);
+ foreach ($template_themes as $sheet=>$name) {
+ $theme_values[$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']);
+ // Next, list user-provided styles
+ asort($user_themes);
+ foreach ($user_themes as $style) {
+ if ($style['PATH'] == 'none')
+ continue;
+ $theme_values[$style['PATH']] = 'User Theme - '.htmlspecialchars($style['NAME']);
}
- $optvals[SMOPT_GRP_GENERAL][] = array(
- 'name' => 'chosen_theme',
- 'caption' => _("Theme"),
- 'type' => SMOPT_TYPE_STRLIST,
- 'refresh' => SMOPT_REFRESH_ALL,
- 'posvals' => $theme_values,
- 'save' => 'css_theme_save'
- );
+ if (count($user_themes) + count($template_themes) > 1) {
+ $optvals[SMOPT_GRP_GENERAL][] = array(
+ 'name' => 'chosen_theme',
+ 'caption' => _("Theme"),
+ 'type' => SMOPT_TYPE_STRLIST,
+ 'refresh' => SMOPT_REFRESH_ALL,
+ 'posvals' => $theme_values,
+ 'save' => 'css_theme_save'
+ );
+ }
/* Icon theme selection */
if ($use_icons) {
SMPREF_JS_ON => _("Always"),
SMPREF_JS_OFF => _("Never")),
'save' => 'save_option_javascript_autodetect',
- 'script' => 'onclick="document.forms[0].new_js_autodetect_results.value = \'' . SMPREF_JS_ON . '\';"'
+ 'extra_attributes' => array('onclick' => 'document.forms[0].new_js_autodetect_results.value = \'' . SMPREF_JS_ON . '\';'),
);
$optvals[SMOPT_GRP_GENERAL][] = array(
'refresh' => SMOPT_REFRESH_NONE
);
+ $optvals[SMOPT_GRP_MAILBOX][] = array(
+ 'name' => 'custom_date_format',
+ 'caption' => _("Custom Date Format"),
+ 'trailing_text' => ' ' . _("(Uses format of PHP date() function)"),
+ 'type' => SMOPT_TYPE_STRING,
+ 'refresh' => SMOPT_REFRESH_NONE,
+ 'size' => SMOPT_SIZE_TINY,
+ );
+
$optvals[SMOPT_GRP_MAILBOX][] = array(
'name' => 'truncate_sender',
'caption' => _("Length of From/To Field (0 for full)"),
}
- /* 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;
-
- /* Do checking to make sure $new_theme is in the array. */
- $theme_in_array = false;
- for ($i = 0; $i < count($theme); ++$i) {
- if ($theme[$i]['PATH'] == $option->new_value) {
- $theme_in_array = true;
- break;
- }
- }
-
- if (!$theme_in_array) {
- $option->new_value = '';
- }
-
+ /**
+ * TODO: If the template changes and we are using a template provided theme
+ * ($user_theme), do we want to reset $user_theme?
+ */
/* Save the option like normal. */
save_option($option);
}
* This function saves the user's icon theme setting
*/
function icon_theme_save($option) {
- global $icon_themes, $data_dir, $username;
+ global $icon_themes;
// 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');
-
+
+ if (!$found)
+ $option->new_value = 'none';
+
+ save_option($option);
}
function css_theme_save ($option) {
- global $css_themes, $data_dir, $username;
+ global $user_themes, $oTemplate;
// 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)
+ reset($user_themes);
+ while (!$found && (list($index, $data) = each($user_themes))) {
+ if ($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');
+
+ if (!$found) {
+ $template_themes = $oTemplate->get_alternative_stylesheets(true);
+ while (!$found && (list($path, $name) = each($template_themes))) {
+ if ($path == $option->new_value)
+ $found = true;
+ }
+ }
+
+ if (!$found)
+ $option->new_value = 'none';
+
+ save_option($option);
}
projects / squirrelmail.git / blobdiff