[SM-CVS] CVS: squirrelmail/include load_prefs.php,1.73,1.74

[Steve B. <ste...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/include
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19602/include

Modified Files:
	load_prefs.php 
Log Message:
Add support for fallback icon themes.  Similar to fallback template set.

Index: load_prefs.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/load_prefs.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -w -r1.73 -r1.74
--- load_prefs.php	9 Oct 2006 16:56:50 -0000	1.73
+++ load_prefs.php	9 Oct 2006 18:04:42 -0000	1.74
@@ -116,6 +116,7 @@
 // user's icon theme, if using icons
 $icon_theme = getPref($data_dir, $username, 'icon_theme');
 $default_icon_theme = $icon_themes[$icon_theme_def]['PATH'];
+$fallback_icon_theme = $icon_themes[$icon_theme_fallback]['PATH'];
 $found_theme = false;
 
 // Make sure the chosen icon theme is a legitimate one.
@@ -137,6 +138,8 @@
  *       set the icon theme to "None," no icons will be used.
  */
 $icon_theme_path = (!$use_icons || $icon_theme=='none') ? NULL : ($icon_theme == 'template' ? SM_PATH . Template::calculate_template_images_directory($sTemplateID) : $icon_theme);
+$default_icon_theme_path = (!$use_icons || $default_icon_theme=='none') ? NULL : ($default_icon_theme == 'template' ? SM_PATH . Template::calculate_template_images_directory($sTemplateID) : $default_icon_theme);
+$fallback_icon_theme_path = (!$use_icons || $fallback_icon_theme=='none') ? NULL : ($fallback_icon_theme == 'template' ? SM_PATH . Template::calculate_template_images_directory($sTemplateID) : $fallback_icon_theme);
 
 // show (or not) flag and unflag buttons on mailbox list screen
 $show_flag_buttons = getPref($data_dir, $username, 'show_flag_buttons', SMPREF_ON );