[dev] [patch] logout is not application fix

[Vilius Sumskas]

Hi,

patch fixes bug #624 (http://bugs.horde.org/ticket/?id=624).

By the way, this code:

    /* Skip app if no conf.xml file. */
    $path = $registry->getParam('fileroot', $app) . '/config';
    if (!file_exists($path . '/conf.xml')) {
        continue;
    }

in /horde/setup/index.php on line 88 will not do, because getParam returns
Horde's path, which conf.xml is always present. Sadly I haven't got patch for
this.

-- 
   Best Regards,

   Vilius Sumskas
   LNK TV system administrator
   mob.: +370 614 75713
   www.lnk.lt
-------------- next part --------------
Index: Registry.php
===================================================================
RCS file: /repository/framework/Horde/Horde/Registry.php,v
retrieving revision 1.218
diff -u -r1.218 Registry.php
--- Registry.php	11 Sep 2004 04:01:24 -0000	1.218
+++ Registry.php	24 Sep 2004 11:24:03 -0000
@@ -215,6 +215,9 @@
         }
 
         foreach ($this->applications as $app => $params) {
+            if ($app == 'logout') {
+                continue;
+            }
             if (in_array($params['status'], $filter) &&
                 (defined('AUTH_HANDLER') || Auth::isAdmin() || ($GLOBALS['perms']->exists($app) ?
                                                                 $GLOBALS['perms']->hasPermission($app, Auth::getAuth(), $perm) :
-------------- next part --------------
Index: index.php
===================================================================
RCS file: /repository/horde/admin/setup/index.php,v
retrieving revision 1.16
diff -u -r1.16 index.php
--- index.php	20 Sep 2004 15:47:56 -0000	1.16
+++ index.php	24 Sep 2004 11:38:20 -0000
@@ -85,11 +85,6 @@
 $apps = array();
 $i = -1;
 foreach ($a as $app) {
-    /* Skip virtual applications. */
-    if ($app == 'logout' || $app == 'problem') {
-        continue;
-    }
-
     /* Skip app if no conf.xml file. */
     $path = $registry->getParam('fileroot', $app) . '/config';
     if (!file_exists($path . '/conf.xml')) {
-------------- next part --------------
Index: UI.php
===================================================================
RCS file: /repository/framework/Prefs/Prefs/UI.php,v
retrieving revision 1.50
diff -u -r1.50 UI.php
--- UI.php	30 Aug 2004 20:21:52 -0000	1.50
+++ UI.php	24 Sep 2004 11:26:53 -0000
@@ -275,9 +275,7 @@
         /* Get list of accessible applications. */
         $apps = array();
         foreach ($registry->applications as $application => $params) {
-            if ($application == 'problem' ||
-                $application == 'logout' ||
-                $params['status'] == 'heading' ||
+            if ($params['status'] == 'heading' ||
                 $params['status'] == 'block') {
                 continue;
             }