From e5aa351d4dfa0cebb04383a98de3f7627543bab3 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 16 Nov 2010 18:03:35 -0700
Subject: [PATCH] Add Horde::includeStylesheetFiles()

Horde_Themes::includeStylesheetFiles() ->
Horde_Themes::getStylesheetUrls()

Horde::getFavicon() -> Horde::includeFavicon()
---
 agora/templates/common-header.inc              |  4 +-
 ansel/lib/Ansel.php                            |  3 +-
 ansel/templates/common-header.inc              |  8 +--
 beatnik/templates/common-header.inc            |  4 +-
 chora/templates/common-header.inc              |  4 +-
 folks/templates/common-header.inc              |  4 +-
 framework/Core/lib/Horde.php                   | 17 ++++-
 framework/Core/lib/Horde/Themes.php            | 98 +++++++++++++-------------
 gollem/templates/common-header.inc             |  6 +-
 hermes/templates/common-header.inc             |  4 +-
 horde/templates/common-header.inc              | 17 +++--
 hylax/templates/common-header.inc              |  4 +-
 imp/lib/Mime/Viewer/Plain.php                  |  4 +-
 imp/templates/common-header.inc                | 10 +--
 imp/view.php                                   |  2 +-
 ingo/templates/common-header.inc               |  6 +-
 jonah/templates/common-header.inc              |  4 +-
 koward/lib/Koward/View/shared/_header.html.php |  5 +-
 kronolith/lib/Kronolith.php                    |  8 +--
 kronolith/templates/common-header.inc          | 13 ++--
 luxor/templates/common-header.inc              |  4 +-
 mnemo/templates/common-header.inc              |  4 +-
 nag/templates/common-header.inc                |  4 +-
 operator/templates/common-header.inc           |  4 +-
 passwd/templates/common-header.inc             |  4 +-
 pastie/templates/common-header.inc             |  4 +-
 shout/templates/common-header.inc              |  2 +-
 skeleton/templates/common-header.inc           |  4 +-
 trean/templates/common-header.inc              |  4 +-
 turba/templates/common-header.inc              |  4 +-
 vilma/templates/common-header.inc              |  4 +-
 whups/templates/common-header.inc              |  4 +-
 wicked/templates/common-header.inc             |  4 +-
 33 files changed, 146 insertions(+), 129 deletions(-)

diff --git a/agora/templates/common-header.inc b/agora/templates/common-header.inc
index 4b043b7f2..8fab3b204 100644
--- a/agora/templates/common-header.inc
+++ b/agora/templates/common-header.inc
@@ -19,11 +19,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 <link rel="alternate" title="<?php echo _("Forums") ?>" href="<?php echo Horde_Util::addParameter(Horde::url('rss/index.php', true, -1), 'scope', $scope) ?>" type="application/rss+xml" />
 </head>
 
diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 5c3a35339..ffede222e 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -772,7 +772,8 @@ class Ansel
             foreach ($css as $f => $u) {
                 Horde_Themes::addStylesheet($f, $u);
             }
-            Horde_Themes::includeStylesheetFiles();
+
+            Horde::includeStylesheetFiles();
         } else {
             foreach ($css as $u) {
                 echo '<link href="' . $u . '" rel="stylesheet" type="text/css" />' . "\n";
diff --git a/ansel/templates/common-header.inc b/ansel/templates/common-header.inc
index 50bca962e..a607aee27 100644
--- a/ansel/templates/common-header.inc
+++ b/ansel/templates/common-header.inc
@@ -19,13 +19,13 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+echo Ansel::stylesheetLinks();
+echo Horde::wrapInlineScript(Ansel::initJSVars());
+Horde::outputInlineScript();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php echo Ansel::stylesheetLinks() ?>
-<?php echo Horde::wrapInlineScript(Ansel::initJSVars());?>
-<?php Horde::outputInlineScript(); ?>
 </head>
 
 <body>
diff --git a/beatnik/templates/common-header.inc b/beatnik/templates/common-header.inc
index 6908121b1..73ce0853b 100644
--- a/beatnik/templates/common-header.inc
+++ b/beatnik/templates/common-header.inc
@@ -30,10 +30,10 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php echo Horde_Themes::includeStylesheetFiles(); ?>
 </head>
 <body>
diff --git a/chora/templates/common-header.inc b/chora/templates/common-header.inc
index 919fb19b8..7bb033705 100644
--- a/chora/templates/common-header.inc
+++ b/chora/templates/common-header.inc
@@ -20,11 +20,11 @@ if (Horde_Util::nonInputVar('js_vars')) {
 }
 
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/folks/templates/common-header.inc b/folks/templates/common-header.inc
index bb0d528b3..e3fc6bc05 100644
--- a/folks/templates/common-header.inc
+++ b/folks/templates/common-header.inc
@@ -17,17 +17,17 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
 <link rel="alternate" type="application/rss+xml" href="<?php echo Folks::getUrlFor('feed', 'online') ?>" title="<?php echo _("Online users") ?>" />
 <?php if ($GLOBALS['registry']->isAuthenticated()): ?>
 <link rel="alternate" type="application/rss+xml" href="<?php echo Folks::getUrlFor('feed', 'friends') ?>" title="<?php echo _("Online friends") ?>" />
 <link rel="alternate" type="application/rss+xml" href="<?php echo Folks::getUrlFor('feed', 'activity') ?>" title="<?php echo _("Friends activity") ?>" />
 <link rel="alternate" type="application/rss+xml" href="<?php echo Folks::getUrlFor('feed', 'know') ?>" title="<?php echo _("People you might know") ?>" />
 <?php endif; ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 9d0479399..79242f11e 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1409,8 +1409,6 @@ HTML;
 
     /**
      * Generate the favicon tag for the current application.
-     *
-     * @return string  The favicon LINK tag.
      */
     static public function includeFavicon()
     {
@@ -1423,7 +1421,20 @@ HTML;
             )));
         }
 
-        return '<link href="' . $img . '" rel="SHORTCUT ICON" />';
+        echo '<link href="' . $img . '" rel="SHORTCUT ICON" />';
+    }
+
+    /**
+     * Generate the stylesheet tags for the current application.
+     *
+     * @param array $opts  Options to pass to
+     *                     Horde_Themes::getStylesheetUrls().
+     */
+    static public function includeStylesheetFiles(array $opts = array())
+    {
+        foreach (Horde_Themes::getStylesheetUrls($opts) as $val) {
+            echo '<link href="' . $val . '" rel="stylesheet" type="text/css" />';
+        }
     }
 
     /**
diff --git a/framework/Core/lib/Horde/Themes.php b/framework/Core/lib/Horde/Themes.php
index 28c689ffa..3263ab91c 100644
--- a/framework/Core/lib/Horde/Themes.php
+++ b/framework/Core/lib/Horde/Themes.php
@@ -31,8 +31,8 @@ class Horde_Themes
     }
 
     /**
-     * Outputs the necessary style tags, honoring configuration choices as
-     * to stylesheet caching.
+     * Generate the stylesheet URLs needed to display the current page.
+     * Honors configuration choices as to stylesheet caching.
      *
      * @param array $options  Additional options:
      * <pre>
@@ -44,8 +44,10 @@ class Horde_Themes
      * 'theme' - (string) Use this theme instead of the default.
      * 'themeonly' - (boolean) If true, only load the theme files.
      * </pre>
+     *
+     * @return array  The list of URLs to display.
      */
-    static public function includeStylesheetFiles($options = array())
+    static public function getStylesheetUrls($options = array())
     {
         global $conf, $prefs, $registry;
 
@@ -60,68 +62,68 @@ class Horde_Themes
             : $conf['cachecssparams']['driver'];
 
         if ($cache_type == 'none') {
-            $css_out = $css;
-        } else {
-            $mtime = array(0);
-            $out = '';
-
+            $css_out = array();
             foreach ($css as $file) {
-                $mtime[] = filemtime($file['f']);
+                $css_out[] = $file['u'];
             }
+            return $css_out;
+        }
 
-            $sig = hash('md5', serialize($css) . max($mtime));
+        $mtime = array(0);
+        $out = '';
 
-            switch ($cache_type) {
-            case 'filesystem':
-                $css_filename = '/static/' . $sig . '.css';
-                $css_path = $registry->get('fileroot', 'horde') . $css_filename;
-                $css_url = $registry->get('webroot', 'horde') . $css_filename;
-                $exists = file_exists($css_path);
-                break;
+        foreach ($css as $file) {
+            $mtime[] = filemtime($file['f']);
+        }
 
-            case 'horde_cache':
-                $cache = $GLOBALS['injector']->getInstance('Horde_Cache');
+        $sig = hash('md5', serialize($css) . max($mtime));
 
-                // Do lifetime checking here, not on cache display page.
-                $exists = $cache->exists($sig, empty($GLOBALS['conf']['cachecssparams']['lifetime']) ? 0 : $GLOBALS['conf']['cachecssparams']['lifetime']);
-                $css_url = Horde::getCacheUrl('css', array('cid' => $sig));
-                break;
-            }
+        switch ($cache_type) {
+        case 'filesystem':
+            $css_filename = '/static/' . $sig . '.css';
+            $css_path = $registry->get('fileroot', 'horde') . $css_filename;
+            $css_url = $registry->get('webroot', 'horde') . $css_filename;
+            $exists = file_exists($css_path);
+            break;
 
-            if (!$exists) {
-                $out = self::loadCssFiles($css);
+        case 'horde_cache':
+            $cache = $GLOBALS['injector']->getInstance('Horde_Cache');
 
-                /* Use CSS tidy to clean up file. */
-                if ($conf['cachecssparams']['compress'] == 'php') {
-                    try {
-                        $out = $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($out, 'csstidy');
-                    } catch (Horde_Exception $e) {}
-                }
+            // Do lifetime checking here, not on cache display page.
+            $exists = $cache->exists($sig, empty($GLOBALS['conf']['cachecssparams']['lifetime']) ? 0 : $GLOBALS['conf']['cachecssparams']['lifetime']);
+            $css_url = Horde::getCacheUrl('css', array('cid' => $sig));
+            break;
+        }
 
-                switch ($cache_type) {
-                case 'filesystem':
-                    if (!file_put_contents($css_path, $out)) {
-                        throw new Horde_Exception('Could not write cached CSS file to disk.');
-                    }
-                    break;
+        if (!$exists) {
+            $out = $this->loadCssFiles($css);
 
-                case 'horde_cache':
-                    $cache->set($sig, $out);
-                    break;
-                }
+            /* Use CSS tidy to clean up file. */
+            if ($conf['cachecssparams']['compress'] == 'php') {
+                try {
+                    $out = $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($out, 'csstidy');
+                } catch (Horde_Exception $e) {}
             }
 
-            $css_out = array(array('u' => $css_url));
-        }
+            switch ($cache_type) {
+            case 'filesystem':
+                if (!file_put_contents($css_path, $out)) {
+                    throw new Horde_Exception('Could not write cached CSS file to disk.');
+                }
+                break;
 
-        foreach ($css_out as $file) {
-            echo '<link href="' . $file['u'] . "\" rel=\"stylesheet\" type=\"text/css\" />\n";
+            case 'horde_cache':
+                $cache->set($sig, $out);
+                break;
+            }
         }
+
+        return $css_url;
     }
 
     /**
-     * Callback for includeStylesheetFiles() to convert images to base64
-     * data strings.
+     * Callback for getStylesheetUrls() to convert images to base64 data
+     * strings.
      *
      * @param array $matches  The list of matches from preg_replace_callback.
      *
diff --git a/gollem/templates/common-header.inc b/gollem/templates/common-header.inc
index d38c70f5d..0acaf0044 100644
--- a/gollem/templates/common-header.inc
+++ b/gollem/templates/common-header.inc
@@ -20,14 +20,14 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
+Horde::outputInlineScript();
 
 require GOLLEM_TEMPLATES . '/javascript_defs.php';
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
-<?php Horde::outputInlineScript(); ?>
 </head>
 
 <body>
diff --git a/hermes/templates/common-header.inc b/hermes/templates/common-header.inc
index 27c98222f..15eaab2ca 100644
--- a/hermes/templates/common-header.inc
+++ b/hermes/templates/common-header.inc
@@ -19,11 +19,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon()
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/horde/templates/common-header.inc b/horde/templates/common-header.inc
index e764c78d2..5f8ca3afa 100644
--- a/horde/templates/common-header.inc
+++ b/horde/templates/common-header.inc
@@ -20,17 +20,16 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 
+if (!$GLOBALS['browser']->isMobile()) {
+    Horde::includeFavicon();
+    Horde::includeStylesheetFiles();
+    Horde::includeScriptFiles();
+    echo implode("\n", Horde_Util::nonInputVar('linkTags', array()));
+    Horde::outputInlineScript();
+}
+
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php if (!$GLOBALS['browser']->isMobile()): ?>
-<?php echo Horde::getFavicon(); ?>
-<?php
-echo Horde_Themes::includeStylesheetFiles();
-echo Horde::includeScriptFiles();
-echo implode("\n", Horde_Util::nonInputVar('linkTags', array()));
-Horde::outputInlineScript();
-?>
-<?php endif ?>
 </head>
 
 <body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/hylax/templates/common-header.inc b/hylax/templates/common-header.inc
index 9e3bc4efb..246ac27b4 100644
--- a/hylax/templates/common-header.inc
+++ b/hylax/templates/common-header.inc
@@ -19,11 +19,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/imp/lib/Mime/Viewer/Plain.php b/imp/lib/Mime/Viewer/Plain.php
index 02c2c8c91..4523a0aef 100644
--- a/imp/lib/Mime/Viewer/Plain.php
+++ b/imp/lib/Mime/Viewer/Plain.php
@@ -32,7 +32,9 @@ class IMP_Mime_Viewer_Plain extends Horde_Mime_Viewer_Plain
     {
         $data = $this->_impRender(false);
         $item = reset($data);
-        $item['data'] = '<html><head>' . Horde_Themes::includeStylesheetFiles() . '</head><body><tt>' . $item['data'] . '</tt></body></html>';
+        Horde::startBuffer();
+        Horde::includeStylesheetFiles();
+        $item['data'] = '<html><head>' . Horde::endBuffer() . '</head><body><tt>' . $item['data'] . '</tt></body></html>';
         return $data;
     }
 
diff --git a/imp/templates/common-header.inc b/imp/templates/common-header.inc
index 9182ed2b7..5f81118d5 100644
--- a/imp/templates/common-header.inc
+++ b/imp/templates/common-header.inc
@@ -36,17 +36,18 @@ Horde::outputMetaTags();
 
 switch ($imp_view) {
 case 'dimp':
-    Horde_Themes::includeStylesheetFiles(array(
+    Horde::includeStylesheetFiles(array(
         'sub' => 'dimp'
     ));
     if (!in_array(basename($_SERVER['PHP_SELF']), array('compose-dimp.php', 'index-dimp.php', 'message-dimp.php'))) {
         Horde::includeScriptFiles();
         Horde::outputInlineScript();
     }
+    Horde::includeFavicon();
     break;
 
 case 'mimp':
-    Horde_Themes::includeStylesheetFiles(array(
+    Horde::includeStylesheetFiles(array(
         'nohorde' => true,
         'sub' => 'mimp',
         'subonly' => true
@@ -54,8 +55,9 @@ case 'mimp':
     break;
 
 default:
-    Horde_Themes::includeStylesheetFiles();
+    Horde::includeStylesheetFiles();
     Horde::includeScriptFiles();
+    Horde::includeFavicon();
     Horde::outputInlineScript();
     break;
 }
@@ -65,10 +67,8 @@ default:
 </head>
 <body>
 <?php elseif ($imp_view == 'dimp'): ?>
-<?php echo Horde::getFavicon(); ?>
 </head>
 <?php else: ?>
-<?php echo Horde::getFavicon(); ?>
 <?php if ($mailbox_url = Horde_Util::nonInputVar('mailbox_url')): ?>
 <link href="<?php echo $mailbox_url ?>" rel="Up" />
 <?php elseif (!Horde_Util::nonInputVar('login_page')): ?>
diff --git a/imp/view.php b/imp/view.php
index 635978a5d..83d5cf983 100644
--- a/imp/view.php
+++ b/imp/view.php
@@ -257,7 +257,7 @@ case 'print_attach':
 
             if (!$browser->isBrowser('mozilla')) {
                 Horde::startBuffer();
-                Horde_Themes::includeStylesheetFiles();
+                Horde::includeStylesheetFiles();
                 $t->set('css', Horde::endBuffer());
                 echo $t->fetch(IMP_TEMPLATES . '/print/headers.html');
                 break;
diff --git a/ingo/templates/common-header.inc b/ingo/templates/common-header.inc
index 684dc7bd7..3fdd05233 100644
--- a/ingo/templates/common-header.inc
+++ b/ingo/templates/common-header.inc
@@ -13,12 +13,12 @@ if (!empty($title)) {
 <head>
 <?php
     Horde::outputMetaTags();
-    Horde_Themes::includeStylesheetFiles();
+    Horde::includeStylesheetFiles();
     Horde::includeScriptFiles();
+    Horde::includeFavicon();
+    Horde::outputInlineScript();
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde::outputInlineScript(); ?>
 </head>
 
 <body>
diff --git a/jonah/templates/common-header.inc b/jonah/templates/common-header.inc
index 7b6dd9ca5..6c228d58e 100644
--- a/jonah/templates/common-header.inc
+++ b/jonah/templates/common-header.inc
@@ -16,6 +16,8 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 if ($channel_id = Horde_Util::getFormData('channel_id')) {
     $rss_url_params = array('channel_id' => $channel_id);
@@ -26,8 +28,6 @@ if ($channel_id = Horde_Util::getFormData('channel_id')) {
 }
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/koward/lib/Koward/View/shared/_header.html.php b/koward/lib/Koward/View/shared/_header.html.php
index ccdc527d9..1aea0a568 100644
--- a/koward/lib/Koward/View/shared/_header.html.php
+++ b/koward/lib/Koward/View/shared/_header.html.php
@@ -24,11 +24,12 @@ global $registry;
 $page_title = $registry->get('name');
 $page_title .= !empty($this->title) ? ' :: ' . $this->title : '';
 
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 Horde::includeScriptFiles();
+
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 3267fc79c..9c524cb67 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -86,11 +86,11 @@ class Kronolith
         echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">' . "\n" .
              (!empty($GLOBALS['language']) ? '<html lang="' . strtr($GLOBALS['language'], '_', '-') . '"' : '<html') . ">\n".
              "<head>\n" .
-             '<title>' . htmlspecialchars($GLOBALS['registry']->get('name')) . "</title>\n" .
-             Horde::getFavicon() .
-             Horde::wrapInlineScript(self::includeJSVars());
+             '<title>' . htmlspecialchars($GLOBALS['registry']->get('name')) . "</title>\n";
 
-        Horde_Themes::includeStylesheetFiles();
+        Horde::includeFavicon();
+        echo Horde::wrapInlineScript(self::includeJSVars());
+        Horde::includeStylesheetFiles();
 
         echo "</head>\n";
 
diff --git a/kronolith/templates/common-header.inc b/kronolith/templates/common-header.inc
index b5abfc625..35f626252 100644
--- a/kronolith/templates/common-header.inc
+++ b/kronolith/templates/common-header.inc
@@ -22,9 +22,16 @@ if (!empty($title)) {
     $page_title .= ' :: ' . $title;
 }
 
+foreach ($GLOBALS['display_calendars'] as $calendar) {
+    echo '<link href="' . Kronolith::feedUrl($calendar) . '" rel="alternate" type="application/atom+xml" />';
+}
+
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
 require KRONOLITH_TEMPLATES . '/javascript_defs.php';
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
+Horde::outputInlineScript();
 
 $bc = (isset($view) && is_object($view) && $prefs->getValue('show_panel'))
     ? 'rightPanel'
@@ -32,12 +39,6 @@ $bc = (isset($view) && is_object($view) && $prefs->getValue('show_panel'))
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
-<?php foreach ($GLOBALS['display_calendars'] as $calendar): ?>
-<link href="<?php echo Kronolith::feedUrl($calendar) ?>" rel="alternate" type="application/atom+xml" />
-<?php endforeach; ?>
-<?php Horde::outputInlineScript(); ?>
 </head>
 
 <body<?php if ($bc) echo ' class="' . $bc . '"' ?>>
diff --git a/luxor/templates/common-header.inc b/luxor/templates/common-header.inc
index 14159a6c0..828564282 100644
--- a/luxor/templates/common-header.inc
+++ b/luxor/templates/common-header.inc
@@ -19,11 +19,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/mnemo/templates/common-header.inc b/mnemo/templates/common-header.inc
index 45bbadc11..5e551bda2 100644
--- a/mnemo/templates/common-header.inc
+++ b/mnemo/templates/common-header.inc
@@ -19,8 +19,10 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
 
 Horde_Themes::addStylesheet($registry->get('themesfs') . '/categoryCSS.php', $registry->get('themesuri') . '/categoryCSS.php');
+Horde::includeStylesheetFiles();
 
 $bc = $prefs->getValue('show_panel')
     ? 'rightPanel'
@@ -28,8 +30,6 @@ $bc = $prefs->getValue('show_panel')
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/nag/templates/common-header.inc b/nag/templates/common-header.inc
index 91cf800cd..e712cdf4b 100644
--- a/nag/templates/common-header.inc
+++ b/nag/templates/common-header.inc
@@ -21,8 +21,10 @@ Horde::addInlineJsVars(array(
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
 Horde::outputInlineScript();
+Horde::includeFavicon();
 
 Horde_Themes::addStylesheet($registry->get('themesfs') . '/categoryCSS.php', $registry->get('themesuri') . '/categoryCSS.php');
+Horde::includeStylesheetFiles();
 
 $bc = $prefs->getValue('show_panel')
     ? 'rightPanel'
@@ -30,8 +32,6 @@ $bc = $prefs->getValue('show_panel')
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc) echo ' class="' . $bc . '"' ?>>
diff --git a/operator/templates/common-header.inc b/operator/templates/common-header.inc
index f9f11b1fc..8b345be5e 100644
--- a/operator/templates/common-header.inc
+++ b/operator/templates/common-header.inc
@@ -19,11 +19,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/passwd/templates/common-header.inc b/passwd/templates/common-header.inc
index c2f224309..456e7a167 100644
--- a/passwd/templates/common-header.inc
+++ b/passwd/templates/common-header.inc
@@ -20,11 +20,11 @@ if (!empty($title)) {
 }
 
 Horde::outputMetaTags();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php echo Horde::stylesheetLink('passwd') ?>
 </head>
 
 <body<?php if ($bc = Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/pastie/templates/common-header.inc b/pastie/templates/common-header.inc
index 069530197..82da81522 100644
--- a/pastie/templates/common-header.inc
+++ b/pastie/templates/common-header.inc
@@ -16,11 +16,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php echo Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/shout/templates/common-header.inc b/shout/templates/common-header.inc
index edec2934c..c146ab4d2 100644
--- a/shout/templates/common-header.inc
+++ b/shout/templates/common-header.inc
@@ -20,10 +20,10 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeStylesheetFiles();
 
 ?>
  <title><?php echo $page_title ?></title>
- <?php echo Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/skeleton/templates/common-header.inc b/skeleton/templates/common-header.inc
index 069530197..82da81522 100644
--- a/skeleton/templates/common-header.inc
+++ b/skeleton/templates/common-header.inc
@@ -16,11 +16,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php echo Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/trean/templates/common-header.inc b/trean/templates/common-header.inc
index b8b459f28..d44effe66 100644
--- a/trean/templates/common-header.inc
+++ b/trean/templates/common-header.inc
@@ -19,8 +19,10 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
 
 Horde_Themes::addStylesheet($registry->get('themesfs') . '/grids-min.css', $registry->get('themesuri')  . '/grids-min.css');
+Horde::includeStylesheetFiles();
 
 $rss = Horde::url('rss.php', true, -1);
 if (Horde_Util::getFormData('f')) {
@@ -38,8 +40,6 @@ if ($prefs->getValue('show_folder_actions')) {
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
diff --git a/turba/templates/common-header.inc b/turba/templates/common-header.inc
index 5f5c01452..464bbc3c1 100644
--- a/turba/templates/common-header.inc
+++ b/turba/templates/common-header.inc
@@ -20,11 +20,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?>>
diff --git a/vilma/templates/common-header.inc b/vilma/templates/common-header.inc
index b022f3a1f..96299076e 100644
--- a/vilma/templates/common-header.inc
+++ b/vilma/templates/common-header.inc
@@ -19,11 +19,11 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/whups/templates/common-header.inc b/whups/templates/common-header.inc
index fd5926400..2701fe896 100644
--- a/whups/templates/common-header.inc
+++ b/whups/templates/common-header.inc
@@ -19,6 +19,8 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 if (isset($ticket)) {
     echo '<link rel="alternate" type="application/rss+xml" title="' . htmlspecialchars('[#' . $ticket->getId() . '] ' . $ticket->get('summary')) . '" href="' . Whups::urlFor('ticket_rss', $ticket->getId(), true, -1) . '" />';
@@ -29,9 +31,7 @@ if (isset($whups_query) && isset($whups_query->id)) {
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
 <link href="<?php echo Horde::url('opensearch.php', true, -1) ?>" rel="search" type="application/opensearchdescription+xml" title="<?php echo $registry->get('name') . ' (' . Horde::url('', true) . ')' ?>" />
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
diff --git a/wicked/templates/common-header.inc b/wicked/templates/common-header.inc
index a2d519ae8..74c4bc00c 100644
--- a/wicked/templates/common-header.inc
+++ b/wicked/templates/common-header.inc
@@ -19,12 +19,12 @@ if (!empty($title)) {
 
 Horde::outputMetaTags();
 Horde::includeScriptFiles();
+Horde::includeFavicon();
+Horde::includeStylesheetFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<?php echo Horde::getFavicon(); ?>
 <link href="<?php echo Horde::url('opensearch.php', true, -1) ?>" rel="search" type="application/opensearchdescription+xml" title="<?php echo $registry->get('name') . ' (' . Horde::url('', true) . ')' ?>" />
-<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body>
-- 
2.11.0