$aUserStyles = array();
// 2. Option user-defined stylesheet from preferences.
- if (!empty($used_theme)) {
+ if (!empty($used_theme) && $used_theme != 'none') {
/**
- * All styles just point to a directory, so we need to include all .css
- * files in that directory.
+ * All styles (except "none" - ugh) just point to a directory,
+ * so we need to include all .css files in that directory.
*/
- $styles = list_files($used_theme, '.css');
+//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');
foreach ($styles as $sheet) {
$aUserStyles[] = $used_theme .'/'.$sheet;
}
return create_hyperlink($base_uri . $path, $text, $target);
}
-/**
- * Same as makeInternalLink, but echoes it too
- */
-function displayInternalLink($path, $text, $target='') {
-// FIXME: should let the template echo all these kinds of things
- echo makeInternalLink($path, $text, $target);
-}
-
/**
* Outputs a complete SquirrelMail page header, starting with <!doctype> and
* including the default menu bar. Uses displayHtmlHeader and takes