From: Michael M Slusarz Date: Thu, 1 Jul 2010 18:18:58 +0000 (-0600) Subject: Add META tag output to Horde::. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4f3bc19eac444e3d99b7e56b188bd9f99db3686d;p=horde.git Add META tag output to Horde::. Centralize creation of META refresh tags. --- diff --git a/agora/templates/common-header.inc b/agora/templates/common-header.inc index 2b57bc908..27e5ce71d 100644 --- a/agora/templates/common-header.inc +++ b/agora/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/ansel/templates/common-header.inc b/ansel/templates/common-header.inc index bccd5a7d7..99d87ebd3 100644 --- a/ansel/templates/common-header.inc +++ b/ansel/templates/common-header.inc @@ -13,11 +13,13 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } + +Horde::outputMetaTags(); Horde::includeScriptFiles(); + ?> <?php echo htmlspecialchars($page_title, ENT_COMPAT, Horde_Nls::getCharset()) ?> diff --git a/babel/templates/common-header.inc b/babel/templates/common-header.inc index 689879e8d..3dfb2b09b 100644 --- a/babel/templates/common-header.inc +++ b/babel/templates/common-header.inc @@ -10,11 +10,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/beatnik/templates/common-header.inc b/beatnik/templates/common-header.inc index 52ba3479a..a329240c6 100644 --- a/beatnik/templates/common-header.inc +++ b/beatnik/templates/common-header.inc @@ -24,11 +24,11 @@ if (count(Beatnik::needCommit())) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/chora/templates/common-header.inc b/chora/templates/common-header.inc index cae4d3497..8cb7a32af 100644 --- a/chora/templates/common-header.inc +++ b/chora/templates/common-header.inc @@ -6,15 +6,16 @@ if (isset($language)) { echo !empty($language) ? '' : ''; $page_title = $GLOBALS['registry']->get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); + if (Horde_Util::nonInputVar('js_vars')) { - echo '\n"; + Horde::addInlineScript('var Chora = ' . Horde_Serialize::serialize($js_vars, Horde_Serialize::JSON, Horde_Nls::getCharset())); } + Horde::includeScriptFiles(); ?> diff --git a/crumb/templates/common-header.inc b/crumb/templates/common-header.inc index b45d7f271..c54f0a4e1 100644 --- a/crumb/templates/common-header.inc +++ b/crumb/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/fima/templates/common-header.inc b/fima/templates/common-header.inc index 4fefe2b5b..796bc6906 100644 --- a/fima/templates/common-header.inc +++ b/fima/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/folks/templates/common-header.inc b/folks/templates/common-header.inc index 1e2e32a3f..8666bc05e 100644 --- a/folks/templates/common-header.inc +++ b/folks/templates/common-header.inc @@ -11,11 +11,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index 87924ce92..0f70ffcbc 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -72,6 +72,13 @@ class Horde static protected $_contentSent = false; /** + * META tag cache. + * + * @var array + */ + static protected $_metaTags = array(); + + /** * Shortcut to logging method. * * @see Horde_Core_Log_Logger @@ -2004,4 +2011,40 @@ HTML; (!self::$_bufferLevel && (ob_get_length() || headers_sent()))); } + /** + * Adds a META http-equiv tag to the page output. + * + * @param string $type The http-equiv type value. + * @param string $content The content of the META tag. + */ + static public function addMetaTag($type, $content) + { + self::$_metaTags[$type] = $content; + } + + /** + * Adds a META refresh tag. + * + * @param integer $time Refresh time. + * @param string $url Refresh URL + */ + static public function metaRefresh($time, $url) + { + if (!empty($time) && !empty($url)) { + self::addMetaTag('refresh', $refresh_time . ';url=' . $refresh_url); + } + } + + /** + * Output META tags to page. + */ + static public function outputMetaTags() + { + foreach (self::$_metaTags as $key => $val) { + echo '\n"; + } + + self::$_metaTags = array(); + } + } diff --git a/gollem/templates/common-header.inc b/gollem/templates/common-header.inc index 2e1b141ba..74fb55de7 100644 --- a/gollem/templates/common-header.inc +++ b/gollem/templates/common-header.inc @@ -14,12 +14,13 @@ echo !empty($language) get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); + require GOLLEM_TEMPLATES . '/javascript_defs.php'; ?> diff --git a/hermes/templates/common-header.inc b/hermes/templates/common-header.inc index 7713b4d5d..2c0b5cf88 100644 --- a/hermes/templates/common-header.inc +++ b/hermes/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/horde/services/portal/index.php b/horde/services/portal/index.php index 035873701..7abd1f1f8 100644 --- a/horde/services/portal/index.php +++ b/horde/services/portal/index.php @@ -14,8 +14,7 @@ Horde_Registry::appInit('horde'); // Get refresh interval. if (($r_time = $prefs->getValue('summary_refresh_time')) && !$browser->hasFeature('xmlhttpreq')) { - $refresh_time = $r_time; - $refresh_url = Horde::applicationUrl('services/portal/'); + Horde::metaRefresh($r_time, Horde::applicationUrl('services/portal/')); } // Load layout from preferences. diff --git a/horde/templates/common-header.inc b/horde/templates/common-header.inc index 0bbe371bc..c11cfd1ea 100644 --- a/horde/templates/common-header.inc +++ b/horde/templates/common-header.inc @@ -14,10 +14,12 @@ echo (!empty($GLOBALS['language']) ? '\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } + +Horde::outputMetaTags(); + ?> <?php echo htmlspecialchars($page_title) ?> isMobile()): ?> diff --git a/hylax/templates/common-header.inc b/hylax/templates/common-header.inc index f6a852089..2f69c6a1b 100644 --- a/hylax/templates/common-header.inc +++ b/hylax/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/imp/folders.php b/imp/folders.php index 438ff4e35..777af0eda 100644 --- a/imp/folders.php +++ b/imp/folders.php @@ -50,8 +50,7 @@ $imaptree = $injector->getInstance('IMP_Imap_Tree'); /* $folder_list is already encoded in UTF7-IMAP. */ $folder_list = Horde_Util::getFormData('folder_list', array()); -/* Set the URL to refresh the page to in the META tag */ -$refresh_url = Horde::applicationUrl('folders.php', true); +/* META refresh time (might be altered by actionID). */ $refresh_time = $prefs->getValue('refresh_time'); /* Run through the action handlers. */ @@ -474,6 +473,7 @@ $template->set('rows', $rows); $title = _("Folder Navigator"); IMP::prepareMenu(); +Horde::metaRefresh($refresh_time, Horde::applicationUrl('folders.php', true)); require IMP_TEMPLATES . '/common-header.inc'; IMP::menu(); IMP::status(); diff --git a/imp/mailbox.php b/imp/mailbox.php index 47f58eb08..21b91ec3b 100644 --- a/imp/mailbox.php +++ b/imp/mailbox.php @@ -286,7 +286,6 @@ if (!is_null($rss_box)) { } /* If user wants the mailbox to be refreshed, set time here. */ -$refresh_time = $prefs->getValue('refresh_time'); $refresh_url = $mailbox_imp_url->copy()->add('page', $pageOb['page']); if (isset($filter_url)) { $filter_url->add('page', $pageOb['page']); @@ -371,6 +370,7 @@ if (!empty($newmsgs)) { } IMP::prepareMenu(); +Horde::metaRefresh($prefs->getValue('refresh_time'), $refresh_url); require IMP_TEMPLATES . '/common-header.inc'; IMP::menu(); IMP::status(); diff --git a/imp/templates/common-header.inc b/imp/templates/common-header.inc index d534b9b6b..00286280e 100644 --- a/imp/templates/common-header.inc +++ b/imp/templates/common-header.inc @@ -28,14 +28,11 @@ if (isset($GLOBALS['language'])) { echo (!empty($GLOBALS['language']) ? '' : '') . ''; $page_title = $GLOBALS['registry']->get('name'); - if (!empty($title)) { $page_title .= ' :: ' . $title; } -if (!empty($refresh_time) && !empty($refresh_url)) { - echo "\n"; -} +Horde::outputMetaTags(); switch ($imp_view) { case 'dimp': diff --git a/ingo/templates/common-header.inc b/ingo/templates/common-header.inc index 8b75ffccb..17e8f5f9e 100644 --- a/ingo/templates/common-header.inc +++ b/ingo/templates/common-header.inc @@ -11,11 +11,11 @@ if (!empty($title)) { ' : '' ?> - - - - - + <?php echo htmlspecialchars($page_title) ?> diff --git a/jonah/templates/common-header.inc b/jonah/templates/common-header.inc index d86687768..dfbbe6fab 100644 --- a/jonah/templates/common-header.inc +++ b/jonah/templates/common-header.inc @@ -10,11 +10,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); if ($channel_id = Horde_Util::getFormData('channel_id')) { diff --git a/kastalia/templates/common-header.inc b/kastalia/templates/common-header.inc index d37d59d18..63bc89934 100755 --- a/kastalia/templates/common-header.inc +++ b/kastalia/templates/common-header.inc @@ -16,11 +16,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/kronolith/templates/common-header.inc b/kronolith/templates/common-header.inc index b6320ba0f..125a8b992 100644 --- a/kronolith/templates/common-header.inc +++ b/kronolith/templates/common-header.inc @@ -18,11 +18,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); require KRONOLITH_TEMPLATES . '/javascript_defs.php'; diff --git a/luxor/templates/common-header.inc b/luxor/templates/common-header.inc index e74d55513..f6830d85e 100644 --- a/luxor/templates/common-header.inc +++ b/luxor/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/mnemo/templates/common-header.inc b/mnemo/templates/common-header.inc index ba35a3717..6aef95a5f 100644 --- a/mnemo/templates/common-header.inc +++ b/mnemo/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); $bc = $prefs->getValue('show_panel') diff --git a/nag/templates/common-header.inc b/nag/templates/common-header.inc index 9bd72bacb..7b41c5991 100644 --- a/nag/templates/common-header.inc +++ b/nag/templates/common-header.inc @@ -10,11 +10,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); $bc = $prefs->getValue('show_panel') diff --git a/news/templates/common-header.inc b/news/templates/common-header.inc index f06f9de80..193c0acf0 100644 --- a/news/templates/common-header.inc +++ b/news/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/operator/templates/common-header.inc b/operator/templates/common-header.inc index 7e9ae1035..a15e4f3a3 100644 --- a/operator/templates/common-header.inc +++ b/operator/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/passwd/templates/common-header.inc b/passwd/templates/common-header.inc index df4789c1f..b2173fc00 100644 --- a/passwd/templates/common-header.inc +++ b/passwd/templates/common-header.inc @@ -15,11 +15,12 @@ if (isset($language)) { /* Print the page title. */ $page_title = $registry->get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); + ?> <?php echo htmlspecialchars($page_title) ?> diff --git a/pastie/templates/common-header.inc b/pastie/templates/common-header.inc index 255429b3d..e6b62df0b 100644 --- a/pastie/templates/common-header.inc +++ b/pastie/templates/common-header.inc @@ -10,11 +10,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/shout/templates/common-header.inc b/shout/templates/common-header.inc index 20a8304f9..fda1826fa 100644 --- a/shout/templates/common-header.inc +++ b/shout/templates/common-header.inc @@ -12,13 +12,14 @@ ' : '' ?> get('name'); - if (!empty($title)) $page_title .= ' :: ' . $title; - if (!empty($refresh_time) && !empty($refresh_url)) { - echo "\n"; - } - Horde::includeScriptFiles(); +$page_title = $GLOBALS['registry']->get('name'); +if (!empty($title)) { + $page_title .= ' :: ' . $title; +} + +Horde::outputMetaTags(); +Horde::includeScriptFiles(); ?> <?php echo $page_title ?> diff --git a/skeleton/templates/common-header.inc b/skeleton/templates/common-header.inc index 255429b3d..e6b62df0b 100644 --- a/skeleton/templates/common-header.inc +++ b/skeleton/templates/common-header.inc @@ -10,11 +10,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/skoli/templates/common-header.inc b/skoli/templates/common-header.inc index 9350066fd..3103145ee 100644 --- a/skoli/templates/common-header.inc +++ b/skoli/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); $bc = $prefs->getValue('show_panel') diff --git a/trean/templates/common-header.inc b/trean/templates/common-header.inc index 03befd2ac..c8b82d677 100644 --- a/trean/templates/common-header.inc +++ b/trean/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); $rss = Horde::applicationUrl('rss.php', true, -1); diff --git a/turba/templates/common-header.inc b/turba/templates/common-header.inc index a39408ff9..b331ce00d 100644 --- a/turba/templates/common-header.inc +++ b/turba/templates/common-header.inc @@ -14,11 +14,13 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } + +Horde::outputMetaTags(); Horde::includeScriptFiles(); + ?> <?php echo htmlspecialchars($page_title) ?> diff --git a/vilma/templates/common-header.inc b/vilma/templates/common-header.inc index 93db958ae..afbc18f7b 100644 --- a/vilma/templates/common-header.inc +++ b/vilma/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?> diff --git a/whups/mybugs.php b/whups/mybugs.php index 4ca716a3c..da1c56ad7 100644 --- a/whups/mybugs.php +++ b/whups/mybugs.php @@ -25,8 +25,7 @@ if ($r_time = $prefs->getValue('summary_refresh_time')) { if ($browser->hasFeature('xmlhttpreq')) { Horde::addScriptFile('prototype.js', 'horde', true); } else { - $refresh_time = $r_time; - $refresh_url = Horde::applicationUrl('mybugs.php'); + Horde::metaRefresh($r_time, Horde::applicationUrl('mybugs.php')); } } diff --git a/whups/templates/common-header.inc b/whups/templates/common-header.inc index ef9bab6ee..6ab785e9c 100644 --- a/whups/templates/common-header.inc +++ b/whups/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); if (isset($ticket)) { diff --git a/wicked/templates/common-header.inc b/wicked/templates/common-header.inc index 724939c4d..a90f90f81 100644 --- a/wicked/templates/common-header.inc +++ b/wicked/templates/common-header.inc @@ -13,11 +13,11 @@ if (isset($language)) { get('name'); -if (!empty($title)) $page_title .= ' :: ' . $title; -if (!empty($refresh_time) && ($refresh_time > 0) && !empty($refresh_url)) { - echo "\n"; +if (!empty($title)) { + $page_title .= ' :: ' . $title; } +Horde::outputMetaTags(); Horde::includeScriptFiles(); ?>