[SM-CVS] SF.net SVN: squirrelmail:[14940] trunk/squirrelmail/functions/ page_header.php

[<pdo...@us...>]

Revision: 14940
          http://sourceforge.net/p/squirrelmail/code/14940
Author:   pdontthink
Date:     2022-02-28 20:19:39 +0000 (Mon, 28 Feb 2022)
Log Message:
-----------
Fix whacky theme name logic, though it's still needlessly complex and should not be using 'none' when no theme is chosen...

Modified Paths:
--------------
    trunk/squirrelmail/functions/page_header.php

Modified: trunk/squirrelmail/functions/page_header.php
===================================================================
--- trunk/squirrelmail/functions/page_header.php	2022-02-28 18:35:13 UTC (rev 14939)
+++ trunk/squirrelmail/functions/page_header.php	2022-02-28 20:19:39 UTC (rev 14940)
@@ -95,7 +95,13 @@
 
     $used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset);
     $used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize);
-    $used_theme = !isset($chosen_theme) && $user_theme_default != 'none' && is_dir($chosen_theme) && is_readable($chosen_theme)?  $user_themes[$user_theme_default]['PATH'].'/default.css' : $chosen_theme_path;
+    if (!empty($chosen_theme) && is_dir($chosen_theme) && is_readable($chosen_theme))
+        $used_theme = $chosen_theme_path;
+    else if ($user_theme_default != 'none')
+        $used_theme = $user_themes[$user_theme_default]['PATH'];
+    else
+        $used_theme = 'none';
+
     
     /**
      * Stylesheets are loaded in the following order:
@@ -115,14 +121,13 @@
     $aUserStyles = array();
 
     // 2. Option user-defined stylesheet from preferences.
-    if (!empty($used_theme) && $used_theme != 'none') {
+    if ($used_theme != 'none') {
+//FIXME: rid ourselves of "none" strings!  I didn't do it here because I think the problem is that the theme itself should never be "none" (? well, what else would it be?  if "none" theme is actually OK, then is there a constant to use below instead of a hard-coded string?)
         /**
          * All styles (except "none" - ugh) just point to a directory,
          * so we need to include all .css files in that directory.
          */
-//FIXME: rid ourselves of "none" strings!  I didn't do it here because I think the problem is that the theme itself should never be "none" (? well, what else would it be?  if "none" theme is actually OK, then is there a constant to use below in stead of a hard-coded string?)
-        $styles = $used_theme == 'none' ? array()
-                : list_files($used_theme, '.css');
+        $styles = list_files($used_theme, '.css');
         foreach ($styles as $sheet) { 
             $aUserStyles[] = $used_theme .'/'.$sheet;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.