From: Jan Schneider <jan@horde.org>
Date: Tue, 29 Jun 2010 17:50:31 +0000 (+0200)
Subject: Do this check in a single place.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bad88c7b12aa154a64de9471361a2f28fe1f684e;p=horde.git

Do this check in a single place.
---

diff --git a/ansel/templates/menu.inc b/ansel/templates/menu.inc
index 0fb2e81e6..900134078 100644
--- a/ansel/templates/menu.inc
+++ b/ansel/templates/menu.inc
@@ -1,5 +1,7 @@
 <div id="menu">
  <?php echo Ansel::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
-<?php $GLOBALS['notification']->notify(array('listeners' => 'status')); ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+
+<?php
+$GLOBALS['notification']->notify(array('listeners' => 'status'));
diff --git a/beatnik/templates/menu.inc b/beatnik/templates/menu.inc
index 48b2d43a0..56455b439 100644
--- a/beatnik/templates/menu.inc
+++ b/beatnik/templates/menu.inc
@@ -37,5 +37,5 @@ $menu_view = $prefs->getValue('menu_view');
 </span>
 <?php echo Beatnik::getMenu('string') ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/chora/templates/menu.inc b/chora/templates/menu.inc
index f6d1648dc..4224b9f67 100644
--- a/chora/templates/menu.inc
+++ b/chora/templates/menu.inc
@@ -4,5 +4,5 @@
  </div>
  <?php echo Chora::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/crumb/templates/menu.inc b/crumb/templates/menu.inc
index e8d056f94..a77bfd53f 100644
--- a/crumb/templates/menu.inc
+++ b/crumb/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Crumb::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/fima/templates/menu.inc b/fima/templates/menu.inc
index 613cfca26..b6395f4cd 100644
--- a/fima/templates/menu.inc
+++ b/fima/templates/menu.inc
@@ -37,5 +37,5 @@ function ledgerSubmit(clear)
     }
 }
 </script>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/folks/templates/menu.inc b/folks/templates/menu.inc
index c38fc018b..ddb1d82da 100644
--- a/folks/templates/menu.inc
+++ b/folks/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Folks::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/gollem/lib/Gollem.php b/gollem/lib/Gollem.php
index c9b76fe04..ce7d1f4a7 100644
--- a/gollem/lib/Gollem.php
+++ b/gollem/lib/Gollem.php
@@ -714,9 +714,7 @@ class Gollem
         $t->set('menu_string', Gollem::getMenu()->render());
 
         echo $t->fetch(GOLLEM_TEMPLATES . '/menu.html');
-        if (!Horde_Util::getFormData('ajaxui')) {
-            require HORDE_BASE . '/services/portal/sidebar.php';
-        }
+        require HORDE_BASE . '/services/portal/sidebar.php';
     }
 
     /**
diff --git a/hermes/templates/menu.inc b/hermes/templates/menu.inc
index b63c007cc..64e011b05 100644
--- a/hermes/templates/menu.inc
+++ b/hermes/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Hermes::getMenu('string') ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/horde/services/portal/sidebar.php b/horde/services/portal/sidebar.php
index b3df44003..97b4198e3 100644
--- a/horde/services/portal/sidebar.php
+++ b/horde/services/portal/sidebar.php
@@ -277,8 +277,10 @@ if (!empty($_GET['httpclient'])) {
     Horde_Registry::appInit('horde', array('authentication' => 'none'));
 }
 
-if ($GLOBALS['conf']['menu']['always'] ||
-    ($GLOBALS['registry']->getAuth() && $GLOBALS['prefs']->getValue('show_sidebar'))) {
+if (!Horde_Util::getFormData('ajaxui') &&
+    ($GLOBALS['conf']['menu']['always'] ||
+     ($GLOBALS['registry']->getAuth() &&
+      $GLOBALS['prefs']->getValue('show_sidebar')))) {
     sidebar();
 }
 
diff --git a/horde/templates/admin/menu.inc b/horde/templates/admin/menu.inc
index 38e23bf5a..d9a48c27e 100644
--- a/horde/templates/admin/menu.inc
+++ b/horde/templates/admin/menu.inc
@@ -15,5 +15,5 @@
 ?>
  </div>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status'));
diff --git a/horde/templates/menu/menu.inc b/horde/templates/menu/menu.inc
index f3b0d0729..40cac39a8 100644
--- a/horde/templates/menu/menu.inc
+++ b/horde/templates/menu/menu.inc
@@ -10,4 +10,4 @@
 <div id="menu">
  <div class="leftFloat"><?php echo $menu->render(); ?></div>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 18072c720..fd23469b8 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -600,9 +600,7 @@ class IMP
     {
         self::prepareMenu();
         echo self::$_menuTemplate->fetch(IMP_TEMPLATES . '/imp/menu/menu.html');
-        if (!Horde_Util::getFormData('ajaxui')) {
-            require HORDE_BASE . '/services/portal/sidebar.php';
-        }
+        require HORDE_BASE . '/services/portal/sidebar.php';
     }
 
     /**
diff --git a/ingo/lib/Ingo.php b/ingo/lib/Ingo.php
index 252d7eba8..6fbab1679 100644
--- a/ingo/lib/Ingo.php
+++ b/ingo/lib/Ingo.php
@@ -489,9 +489,7 @@ class Ingo
     {
         self::prepareMenu();
         echo self::$_menuTemplate->fetch(INGO_TEMPLATES . '/menu/menu.html');
-        if (!Horde_Util::getFormData('ajaxui')) {
-            require HORDE_BASE . '/services/portal/sidebar.php';
-        }
+        require HORDE_BASE . '/services/portal/sidebar.php';
     }
 
     /**
diff --git a/kastalia/templates/menu.inc b/kastalia/templates/menu.inc
index f049fef08..1b4437e14 100755
--- a/kastalia/templates/menu.inc
+++ b/kastalia/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Kastalia::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/kronolith/templates/menu.inc b/kronolith/templates/menu.inc
index 8c12cf737..1483c9e53 100644
--- a/kronolith/templates/menu.inc
+++ b/kronolith/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Kronolith::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/luxor/templates/menu.inc b/luxor/templates/menu.inc
index c7fdbafec..c9df7890c 100644
--- a/luxor/templates/menu.inc
+++ b/luxor/templates/menu.inc
@@ -17,5 +17,5 @@ function jump()
 </div>
 </form>
 
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/mnemo/templates/menu.inc b/mnemo/templates/menu.inc
index f9268260a..49654b75b 100644
--- a/mnemo/templates/menu.inc
+++ b/mnemo/templates/menu.inc
@@ -1,4 +1,4 @@
 <div id="menu">
  <?php echo Mnemo::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
diff --git a/nag/templates/menu.inc b/nag/templates/menu.inc
index da55b68e1..0c6a24b3a 100644
--- a/nag/templates/menu.inc
+++ b/nag/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Nag::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php Nag::status();
diff --git a/news/templates/menu.inc b/news/templates/menu.inc
index 28a32b7a9..d3fe6c290 100644
--- a/news/templates/menu.inc
+++ b/news/templates/menu.inc
@@ -10,5 +10,5 @@
 </div>
 <?php echo News::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/operator/templates/menu.inc b/operator/templates/menu.inc
index a45c4da78..d3c19df67 100644
--- a/operator/templates/menu.inc
+++ b/operator/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Operator::getMenu('string') ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/pastie/templates/menu.inc b/pastie/templates/menu.inc
index df3a62ac2..a3881937f 100644
--- a/pastie/templates/menu.inc
+++ b/pastie/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Pastie::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/shout/templates/menu.inc b/shout/templates/menu.inc
index 0eecd4ddf..e5d54a9cc 100644
--- a/shout/templates/menu.inc
+++ b/shout/templates/menu.inc
@@ -55,4 +55,4 @@ function accountSubmit(clear)
 
   <?php echo Shout::getMenu('string') ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
diff --git a/skeleton/templates/menu.inc b/skeleton/templates/menu.inc
index 513b3eac8..c3ce3dfd5 100644
--- a/skeleton/templates/menu.inc
+++ b/skeleton/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Skeleton::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/skoli/templates/menu.inc b/skoli/templates/menu.inc
index 893d639c0..c1174406e 100644
--- a/skoli/templates/menu.inc
+++ b/skoli/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Skoli::getMenu()->render() ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/trean/templates/menu.inc b/trean/templates/menu.inc
index 3846eaa59..e21f50a58 100644
--- a/trean/templates/menu.inc
+++ b/trean/templates/menu.inc
@@ -1,5 +1,5 @@
 <div id="menu">
  <?php echo Trean::getMenu('string') ?>
 </div>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/turba/templates/menu.inc b/turba/templates/menu.inc
index 98445d790..a9a510a5d 100644
--- a/turba/templates/menu.inc
+++ b/turba/templates/menu.inc
@@ -13,5 +13,5 @@
  </div>
 </div>
 </form>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/whups/templates/menu.inc b/whups/templates/menu.inc
index 711ce0e14..e2414d791 100644
--- a/whups/templates/menu.inc
+++ b/whups/templates/menu.inc
@@ -8,6 +8,6 @@
  <br class="clear" />
 </div>
 </form>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php echo Horde_Util::nonInputVar('menuBottom'); ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status')) ?>
diff --git a/wicked/templates/menu.inc b/wicked/templates/menu.inc
index b3afc4fab..c6cd627c6 100644
--- a/wicked/templates/menu.inc
+++ b/wicked/templates/menu.inc
@@ -20,5 +20,5 @@ function jump()
  <br class="clear" />
 </div>
 </form>
-<?php if (!Horde_Util::getFormData('ajaxui')) require HORDE_BASE . '/services/portal/sidebar.php'; ?>
+<?php require HORDE_BASE . '/services/portal/sidebar.php'; ?>
 <?php $GLOBALS['notification']->notify(array('listeners' => 'status'));