From: Michael M Slusarz Date: Thu, 29 Jul 2010 17:42:43 +0000 (-0600) Subject: Some DIMP index template cleanups X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f65c3c883afee135628e0b6d3b288f7a7ebc4848;p=horde.git Some DIMP index template cleanups --- diff --git a/imp/index-dimp.php b/imp/index-dimp.php index a16fd2ed9..81ca4bc9b 100644 --- a/imp/index-dimp.php +++ b/imp/index-dimp.php @@ -51,19 +51,6 @@ Horde::addInlineScript($js_code, 'load'); Horde::noDnsPrefetch(); IMP_Dimp::header('', $scripts); -/* Get application folders list. */ -$application_folders = array(); -foreach (IMP_Dimp::menuList() as $app) { - if ($registry->get('status', $app) != 'inactive' && - $registry->hasPermission($app, Horde_Perms::SHOW)) { - $application_folders[] = array( - 'name' => htmlspecialchars($registry->get('name', $app)), - 'icon' => $registry->get('icon', $app), - 'app' => rawurlencode($app) - ); - } -} - echo "\n"; require IMP_TEMPLATES . '/dimp/index.inc'; Horde::includeScriptFiles(); diff --git a/imp/templates/dimp/index.inc b/imp/templates/dimp/index.inc index 3fae74690..f9c51327c 100644 --- a/imp/templates/dimp/index.inc +++ b/imp/templates/dimp/index.inc @@ -8,8 +8,8 @@ * did not receive this file, see http://www.fsf.org/copyleft/gpl.html. */ -$usetrash = $prefs->getValue('use_trash'); $use_sub = $prefs->getValue('subscribe'); +$use_trash = $prefs->getValue('use_trash'); $has_blacklist = $registry->hasMethod('mail/blacklistFrom'); $has_whitelist = $registry->hasMethod('mail/whitelistFrom'); @@ -20,6 +20,19 @@ $show_quota = (isset($_SESSION['imp']['imap']['quota']) && is_array($_SESSION['i // Get the list of available IMAP flags $flag_list = $injector->getInstance('IMP_Imap_Flags')->getList(array('imap' => true)); +// Get application folders list. +$application_folders = array(); +foreach (IMP_Dimp::menuList() as $app) { + if (($registry->get('status', $app) != 'inactive') && + $registry->hasPermission($app, Horde_Perms::SHOW)) { + $application_folders[] = array( + 'app' => rawurlencode($app), + 'icon' => $registry->get('icon', $app), + 'name' => htmlspecialchars($registry->get('name', $app)) + ); + } +} + function _simpleButton($id, $text, $image, $nodisplay = false) { $ak = Horde::getAccessKey($text, true); @@ -30,6 +43,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false) '' . '' . Horde::highlightAccessKey($text, $ak) . ''; } + ?>

@@ -388,7 +402,7 @@ function _simpleButton($id, $text, $image, $nodisplay = false) - +