*
* 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);
-// 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");
- }
- }
- }
-}
-
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, $sTplDir;
+ $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();
$templateset_values = array();
foreach ($aTemplateSet as $sKey => $aTemplateSetAttributes) {
- $templateset_values[$aTemplateSetAttributes['NAME']] = $aTemplateSetAttributes['PATH'];
+ $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' => 'sTplDir',
- 'caption' => _("Template"),
+ 'name' => 'sTemplateID',
+ 'caption' => _("Skin"),
'type' => SMOPT_TYPE_STRLIST,
'refresh' => SMOPT_REFRESH_ALL,
'posvals' => $templateset_values,
/* Load the theme option. */
$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
+ $template_themes = $oTemplate->get_alternative_stylesheets(true);
+ asort($template_themes);
+ foreach ($template_themes as $sheet=>$name) {
+ $theme_values[$sheet] = 'Template Theme - '.htmlspecialchars($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'
- );
-
- $css_values = array( 'none' => _("Default" ) );
- $css_dir = SM_PATH . 'themes/css';
- if (is_readable($css_dir) && is_dir($css_dir)) {
- $handle=opendir($css_dir);
- while ($file = readdir($handle) ) {
- if ( substr( $file, -4 ) == '.css' ) {
- $css_values[$file] = substr( $file, 0, strlen( $file ) - 4 );
- }
- }
- closedir($handle);
+ // 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']);
}
- /*
- if ( count( $css_values ) > 1 ) {
-
+ if (count($user_themes) + count($template_themes) > 1) {
$optvals[SMOPT_GRP_GENERAL][] = array(
- 'name' => 'custom_css',
- 'caption' => _("Custom Stylesheet"),
+ 'name' => 'chosen_theme',
+ 'caption' => _("Theme"),
'type' => SMOPT_TYPE_STRLIST,
'refresh' => SMOPT_REFRESH_ALL,
- 'posvals' => $css_values
+ 'posvals' => $theme_values,
+ 'save' => 'css_theme_save'
);
+ }
+ /* 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'
+ );
+ }
}
- */
$fontset_values = array();
$fontset_list = array();
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(
SMPREF_TIME_24HR => _("24-hour clock"))
);
- /* Icon theme selection */
- if ($use_icons) {
- global $icon_themes, $icon_theme;
-
- $temp = array();
- $value = 0;
- for ($count = 0; $count < sizeof($icon_themes); $count++) {
- $temp[$count] = $icon_themes[$count]['NAME'];
- if ($icon_theme == $icon_themes[$count]['PATH'] ||
- (($icon_theme == $sTplDir.'images/') && ($icon_themes[$count]['PATH']=='template'))
- ) {
- $value = $count;
- }
- }
- 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,
- 'initial_value' => $value,
- 'save' => 'icon_theme_save'
- );
- }
- }
-
-
/*** Load the General Options into the array ***/
$optgrps[SMOPT_GRP_MAILBOX] = _("Mailbox Display Options");
$optvals[SMOPT_GRP_MAILBOX] = array();
'size' => SMOPT_SIZE_TINY
);
/*
+FIXME!
disabled because the template doesn't support it (yet?)
$optvals[SMOPT_GRP_MAILBOX][] = array(
'name' => 'show_recipient_instead',
function save_option_template($option) {
global $aTemplateSet;
- /* Do checking to make sure $new_theme is in the array. */
+ /* Do checking to make sure new template is in the available templates array. */
$templateset_in_array = false;
for ($i = 0; $i < count($aTemplateSet); ++$i) {
- if ($aTemplateSet[$i]['PATH'] == $option->new_value) {
+ 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;
-
- /* 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;
- }
- }
+ } else {
+
+ // clear template cache when changing template sets
+ // (in order to do so, we have to change the global
+ // template set ID now... should not be a problem --
+ // in fact, if we don't do it now, very anomalous
+ // problems occur)
+ //
+ global $sTemplateID;
+ $sTemplateID = $option->new_value;
+ Template::cache_template_file_hierarchy(TRUE);
- 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
- //
- if (isset($icon_themes[$option->new_value]['PATH']))
- setPref($data_dir, $username, 'icon_theme', $icon_themes[$option->new_value]['PATH']);
- else
- setPref($data_dir, $username, 'icon_theme', 'none');
+ $found = false;
+ while (!$found && (list($index, $data) = each($icon_themes))) {
+ if ($data['PATH'] == $option->new_value)
+ $found = true;
+ }
+
+ if (!$found)
+ $option->new_value = 'none';
+
+ save_option($option);
+}
+
+function css_theme_save ($option) {
+ global $user_themes, $oTemplate;
+ // Don't assume the new value is there, double check
+ // and only save if found
+ $found = false;
+ reset($user_themes);
+ while (!$found && (list($index, $data) = each($user_themes))) {
+ if ($data['PATH'] == $option->new_value)
+ $found = true;
+ }
+
+ 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