if ( !sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION) ) {
global $base_uri;
}
- global $theme_css, $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction,
- $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize, $chosen_theme;
+ global $custom_css, $pageheader_sent, $theme, $theme_default, $text_direction,
+ $default_fontset, $chosen_fontset, $default_fontsize, $chosen_fontsize,
+ $chosen_theme, $chosen_theme_path, $user_themes, $user_theme_default;
/* add no cache headers here */
//FIXME: should change all header() calls in SM core to use $oTemplate->header()!!
$used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset);
$used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize);
- $used_theme = basename((!empty($chosen_theme) ? $chosen_theme : $theme[$theme_default]['PATH']),'.php');
-
+ $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;
+
/**
* Stylesheets are loaded in the following order:
* 1) All stylesheets provided by the template. Normally, these are
- * stylsheets in $sTplDir/css/. This is accomplished by calling
+ * stylsheets in templates/<template>/css/. This is accomplished by calling
* $oTemplate->fetch_standard_stylesheet_links().
* 2) An optional user-defined stylesheet. This is set in the Display
* Preferences.
* 3) src/style.php which sets some basic font prefs.
* 4) If we are dealing with an RTL language, we load rtl.css from the
* template set.
- **/
-
+ */
+
// 1. Stylesheets from the template.
$header_tags .= $oTemplate->fetch_standard_stylesheet_links();
$aUserStyles = array();
+
// 2. Option user-defined stylesheet from preferences.
-// FIXME: the following user pref ("sUserStyle"; rename as necessary) will have to be populated by the display prefs screen from a widget similar to the color themes widget (which it replaces) where its values should be full relative paths (from SM_PATH) to the selected css "themes" (either in template css/alternates dir or SM_PATH/css/alternates dir)
-// FIXME: uhhh, getPref() is not available yet here. (at least on login page) Ugh. Nor has load_prefs been included yet -- how do we fix this?
-// $aUserStyles[] = getPref($data_dir, $username, 'sUserStyle', '');
+ if (!empty($used_theme)) {
+ /**
+ * All styles just point to a directory, so we need to include all .css
+ * files in that directory.
+ */
+ $styles = list_files($used_theme, '.css');
+ foreach ($styles as $sheet) {
+ $aUserStyles[] = $used_theme .'/'.$sheet;
+ }
+ }
// 3. src/style.php
$aUserStyles[] = $base_uri .'src/style.php?'
. (!empty($used_fontset) ? '&fontset='.$used_fontset : '')
. (!empty($used_fontsize) ? '&fontsize='.$used_fontsize : '');
+
+ // 3.1. Load the stylesheets we have already
$header_tags .= $oTemplate->fetch_external_stylesheet_links($aUserStyles);
// 4. Optional rtl.css stylesheet
if ($do_hook) {
// NOTE! plugins here must assign output to template
// and NOT echo anything directly!!
- do_hook('generic_header');
+ global $null;
+ do_hook('generic_header', $null);
}
$header_tags .= $xtra;
* @param string target the target frame for this link
*/
function makeInternalLink($path, $text, $target='') {
- global $base_uri;
+ global $base_uri, $oTemplate;
// sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
- if ($target != '') {
- $target = " target=\"$target\"";
- }
// This is an inefficient hook and is only used by
// one plugin that still needs to patch this code,
// here just in case we find a good (non-visual?)
// use for the internal_link hook.
//
- //$hooktext = do_hook_function('internal_link',$text);
- //if ($hooktext != '')
- // $text = $hooktext;
+ //do_hook('internal_link', $text);
+
+ $oTemplate->assign('uri', $base_uri . $path);
+ $oTemplate->assign('text', $text);
+ $oTemplate->assign('target', $target);
+
+ // blank the onclick because the template object might
+ // already contain an onclick value due to having been
+ // used to show a compose link (when comp_in_new is turned on)
+ //
+ $oTemplate->assign('onclick', '');
- return '<a href="'.$base_uri.$path.'"'.$target.'>'.$text.'</a>';
+ return $oTemplate->fetch('hyperlink.tpl');
}
/**