projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b9a0ac)
Add Horde::getFavicon()
authorMichael M Slusarz <slusarz@curecanti.org>
Wed, 17 Nov 2010 00:26:08 +0000 (17:26 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Wed, 17 Nov 2010 03:26:17 +0000 (20:26 -0700)
29 files changed:
agora/templates/common-header.inc patch | blob | history
ansel/templates/common-header.inc patch | blob | history
beatnik/templates/common-header.inc patch | blob | history
chora/templates/common-header.inc patch | blob | history
folks/templates/common-header.inc patch | blob | history
framework/Core/lib/Horde.php patch | blob | history
framework/Core/lib/Horde/Themes/Element.php patch | blob | history
gollem/templates/common-header.inc patch | blob | history
hermes/templates/common-header.inc patch | blob | history
horde/templates/common-header.inc patch | blob | history
hylax/templates/common-header.inc patch | blob | history
imp/templates/common-header.inc patch | blob | history
ingo/templates/common-header.inc patch | blob | history
jonah/templates/common-header.inc patch | blob | history
koward/lib/Koward/View/shared/_header.html.php patch | blob | history
kronolith/lib/Kronolith.php patch | blob | history
kronolith/templates/common-header.inc patch | blob | history
luxor/templates/common-header.inc patch | blob | history
mnemo/templates/common-header.inc patch | blob | history
nag/templates/common-header.inc patch | blob | history
operator/templates/common-header.inc patch | blob | history
passwd/templates/common-header.inc patch | blob | history
pastie/templates/common-header.inc patch | blob | history
skeleton/templates/common-header.inc patch | blob | history
trean/templates/common-header.inc patch | blob | history
turba/templates/common-header.inc patch | blob | history
vilma/templates/common-header.inc patch | blob | history
whups/templates/common-header.inc patch | blob | history
wicked/templates/common-header.inc patch | blob | history

diff --git a/agora/templates/common-header.inc b/agora/templates/common-header.inc
index 107e07f..4b043b7 100644 (file)
--- a/agora/templates/common-header.inc
+++ b/agora/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?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/templates/common-header.inc b/ansel/templates/common-header.inc
index 2118911..50bca96 100644 (file)
--- a/ansel/templates/common-header.inc
+++ b/ansel/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php echo Ansel::stylesheetLinks() ?>
 <?php echo Horde::wrapInlineScript(Ansel::initJSVars());?>
 <?php Horde::outputInlineScript(); ?>
diff --git a/beatnik/templates/common-header.inc b/beatnik/templates/common-header.inc
index a329240..6908121 100644 (file)
--- a/beatnik/templates/common-header.inc
+++ b/beatnik/templates/common-header.inc
@@ -33,7 +33,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?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 acb737c..919fb19 100644 (file)
--- a/chora/templates/common-header.inc
+++ b/chora/templates/common-header.inc
@@ -23,7 +23,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/folks/templates/common-header.inc b/folks/templates/common-header.inc
index 792811f..bb0d528 100644 (file)
--- a/folks/templates/common-header.inc
+++ b/folks/templates/common-header.inc
@@ -20,7 +20,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?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") ?>" />
diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 8941562..9d04793 100644 (file)
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1408,6 +1408,25 @@ HTML;
     }
 
     /**
+     * Generate the favicon tag for the current application.
+     *
+     * @return string  The favicon LINK tag.
+     */
+    static public function includeFavicon()
+    {
+        $img = strval(Horde_Themes::img('favicon.ico', array(
+            'nohorde' => true
+        )));
+        if (!$img) {
+            $img = strval(Horde_Themes::img('favicon.ico', array(
+                'app' => 'horde'
+            )));
+        }
+
+        return '<link href="' . $img . '" rel="SHORTCUT ICON" />';
+    }
+
+    /**
      * Determines the location of the system temporary directory. If a specific
      * configuration cannot be found, it defaults to /tmp.
      *
diff --git a/framework/Core/lib/Horde/Themes/Element.php b/framework/Core/lib/Horde/Themes/Element.php
index 084c114..22dffc0 100644 (file)
--- a/framework/Core/lib/Horde/Themes/Element.php
+++ b/framework/Core/lib/Horde/Themes/Element.php
@@ -123,7 +123,8 @@ class Horde_Themes_Element
             if (empty($this->_opts['notheme']) &&
                 isset($GLOBALS['prefs']) &&
                 (($theme = $GLOBALS['prefs']->getValue('theme')) ||
-                 (!empty($this->_opts['theme']) && ($theme = $this->_opts['theme'])))) {
+                 (!empty($this->_opts['theme']) &&
+                  ($theme = $this->_opts['theme'])))) {
                 $tpath = '/' . $theme . $path;
                 foreach ($app_list as $app) {
                     $filepath = $registry->get('themesfs', $app) . $tpath;
diff --git a/gollem/templates/common-header.inc b/gollem/templates/common-header.inc
index d63dfc1..d38c70f 100644 (file)
--- a/gollem/templates/common-header.inc
+++ b/gollem/templates/common-header.inc
@@ -25,7 +25,7 @@ require GOLLEM_TEMPLATES . '/javascript_defs.php';
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 <?php Horde::outputInlineScript(); ?>
 </head>
diff --git a/hermes/templates/common-header.inc b/hermes/templates/common-header.inc
index 7c48361..27c9822 100644 (file)
--- a/hermes/templates/common-header.inc
+++ b/hermes/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/horde/templates/common-header.inc b/horde/templates/common-header.inc
index 7aa0330..e764c78 100644 (file)
--- a/horde/templates/common-header.inc
+++ b/horde/templates/common-header.inc
@@ -23,7 +23,7 @@ Horde::outputMetaTags();
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
 <?php if (!$GLOBALS['browser']->isMobile()): ?>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php
 echo Horde_Themes::includeStylesheetFiles();
 echo Horde::includeScriptFiles();
diff --git a/hylax/templates/common-header.inc b/hylax/templates/common-header.inc
index 86ef99f..9e3bc4e 100644 (file)
--- a/hylax/templates/common-header.inc
+++ b/hylax/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/imp/templates/common-header.inc b/imp/templates/common-header.inc
index d4e4cca..9182ed2 100644 (file)
--- a/imp/templates/common-header.inc
+++ b/imp/templates/common-header.inc
@@ -65,10 +65,10 @@ default:
 </head>
 <body>
 <?php elseif ($imp_view == 'dimp'): ?>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 </head>
 <?php else: ?>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?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/ingo/templates/common-header.inc b/ingo/templates/common-header.inc
index 601867f..684dc7b 100644 (file)
--- a/ingo/templates/common-header.inc
+++ b/ingo/templates/common-header.inc
@@ -17,7 +17,7 @@ if (!empty($title)) {
     Horde::includeScriptFiles();
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde::outputInlineScript(); ?>
 </head>
 
diff --git a/jonah/templates/common-header.inc b/jonah/templates/common-header.inc
index 22049be..7b6dd9c 100644 (file)
--- a/jonah/templates/common-header.inc
+++ b/jonah/templates/common-header.inc
@@ -26,7 +26,7 @@ if ($channel_id = Horde_Util::getFormData('channel_id')) {
 }
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img(null, array('notheme' => true, 'nohorde' => true));?>/favicon.ico" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/koward/lib/Koward/View/shared/_header.html.php b/koward/lib/Koward/View/shared/_header.html.php
index 4257c1b..ccdc527 100644 (file)
--- a/koward/lib/Koward/View/shared/_header.html.php
+++ b/koward/lib/Koward/View/shared/_header.html.php
@@ -27,7 +27,7 @@ $page_title .= !empty($this->title) ? ' :: ' . $this->title : '';
 Horde::includeScriptFiles();
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 2df3f92..3267fc7 100644 (file)
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -87,7 +87,7 @@ class Kronolith
              (!empty($GLOBALS['language']) ? '<html lang="' . strtr($GLOBALS['language'], '_', '-') . '"' : '<html') . ">\n".
              "<head>\n" .
              '<title>' . htmlspecialchars($GLOBALS['registry']->get('name')) . "</title>\n" .
-             '<link href="' . Horde_Themes::img('favicon.ico', array('nohorde' => true)) . "\" rel=\"SHORTCUT ICON\" />\n".
+             Horde::getFavicon() .
              Horde::wrapInlineScript(self::includeJSVars());
 
         Horde_Themes::includeStylesheetFiles();
diff --git a/kronolith/templates/common-header.inc b/kronolith/templates/common-header.inc
index a7993c3..b5abfc6 100644 (file)
--- a/kronolith/templates/common-header.inc
+++ b/kronolith/templates/common-header.inc
@@ -32,7 +32,7 @@ $bc = (isset($view) && is_object($view) && $prefs->getValue('show_panel'))
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?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" />
diff --git a/luxor/templates/common-header.inc b/luxor/templates/common-header.inc
index 1e62a82..14159a6 100644 (file)
--- a/luxor/templates/common-header.inc
+++ b/luxor/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico') ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/mnemo/templates/common-header.inc b/mnemo/templates/common-header.inc
index efd662b..45bbadc 100644 (file)
--- a/mnemo/templates/common-header.inc
+++ b/mnemo/templates/common-header.inc
@@ -28,7 +28,7 @@ $bc = $prefs->getValue('show_panel')
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/nag/templates/common-header.inc b/nag/templates/common-header.inc
index 8f9282a..91cf800 100644 (file)
--- a/nag/templates/common-header.inc
+++ b/nag/templates/common-header.inc
@@ -30,7 +30,7 @@ $bc = $prefs->getValue('show_panel')
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/operator/templates/common-header.inc b/operator/templates/common-header.inc
index d1bc89c..f9f11b1 100644 (file)
--- a/operator/templates/common-header.inc
+++ b/operator/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/passwd/templates/common-header.inc b/passwd/templates/common-header.inc
index b2173fc..c2f2243 100644 (file)
--- a/passwd/templates/common-header.inc
+++ b/passwd/templates/common-header.inc
@@ -23,7 +23,7 @@ Horde::outputMetaTags();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo $GLOBALS['registry']->getImageDir()?>/favicon.ico" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php echo Horde::stylesheetLink('passwd') ?>
 </head>
 
diff --git a/pastie/templates/common-header.inc b/pastie/templates/common-header.inc
index 06da9aa..0695301 100644 (file)
--- a/pastie/templates/common-header.inc
+++ b/pastie/templates/common-header.inc
@@ -19,7 +19,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php echo Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/skeleton/templates/common-header.inc b/skeleton/templates/common-header.inc
index 06da9aa..0695301 100644 (file)
--- a/skeleton/templates/common-header.inc
+++ b/skeleton/templates/common-header.inc
@@ -19,7 +19,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php echo Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/trean/templates/common-header.inc b/trean/templates/common-header.inc
index 344c13f..b8b459f 100644 (file)
--- a/trean/templates/common-header.inc
+++ b/trean/templates/common-header.inc
@@ -38,7 +38,7 @@ if ($prefs->getValue('show_folder_actions')) {
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/turba/templates/common-header.inc b/turba/templates/common-header.inc
index 679f150..5f5c014 100644 (file)
--- a/turba/templates/common-header.inc
+++ b/turba/templates/common-header.inc
@@ -23,7 +23,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/vilma/templates/common-header.inc b/vilma/templates/common-header.inc
index 835d61a..b022f3a 100644 (file)
--- a/vilma/templates/common-header.inc
+++ b/vilma/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?php echo Horde::getFavicon(); ?>
 <?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
diff --git a/whups/templates/common-header.inc b/whups/templates/common-header.inc
index dd5ee2d..fd59264 100644 (file)
--- a/whups/templates/common-header.inc
+++ b/whups/templates/common-header.inc
@@ -29,7 +29,7 @@ if (isset($whups_query) && isset($whups_query->id)) {
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?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>
diff --git a/wicked/templates/common-header.inc b/wicked/templates/common-header.inc
index 19da3f3..a2d519a 100644 (file)
--- a/wicked/templates/common-header.inc
+++ b/wicked/templates/common-header.inc
@@ -22,7 +22,7 @@ Horde::includeScriptFiles();
 
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo Horde_Themes::img('favicon.ico', array('nohorde' => true)) ?>" rel="SHORTCUT ICON" />
+<?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>
Unnamed repository; edit this file to name it for gitweb.