SOURCES: horde-branch.diff - updated

[glen]

Author: glen                         Date: Sun Jan 15 17:16:17 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   horde-branch.diff (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/horde-branch.diff
diff -u SOURCES/horde-branch.diff:1.2 SOURCES/horde-branch.diff:1.3
--- SOURCES/horde-branch.diff:1.2	Fri Jan 13 00:36:05 2006
+++ SOURCES/horde-branch.diff	Sun Jan 15 18:16:11 2006
@@ -27795,6 +27795,74 @@
              $menu['options_' . $app] = array('name' => $name,
                                               'status' => 'active',
                                               'menu_parent' => 'options',
+diff -ur -Nur horde-3.1-rc1/services/prefs.php horde-FRAMEWORK_3/services/prefs.php
+--- horde-3.1-rc1/services/prefs.php	2006-01-01 23:29:10.000000000 +0200
++++ horde-FRAMEWORK_3/services/prefs.php	2006-01-13 00:25:25.000000000 +0200
+@@ -1,6 +1,6 @@
+ <?php
+ /**
+- * $Horde: horde/services/prefs.php,v 1.19.2.7 2006/01/01 21:29:10 jan Exp $
++ * $Horde: horde/services/prefs.php,v 1.19.2.8 2006/01/12 22:25:25 jan Exp $
+  *
+  * Copyright 1999-2006 Charles J. Hagenbuch <chuck at horde.org>
+  * Copyright 1999-2006 Jon Parise <jon at horde.org>
+@@ -22,24 +22,14 @@
+ /* See if we have a preferences group set. */
+ $group = Util::getFormData('group');
+ 
+-/* Load $app's base environment, but don't request that the app
+- * perform authentication beyond Horde's. */
++/* Load $app's base environment, but don't request that the app perform
++ * authentication beyond Horde's. */
+ $authentication = 'none';
+ require_once $appbase . '/lib/base.php';
+ 
+ /* Set title. */
+ $title = sprintf(_("Options for %s"), $registry->get('name'));
+ 
+-if ($group == 'identities') {
+-    require_once 'Horde/Identity.php';
+-    $identity = &Identity::singleton($app == 'horde' ? null : array($app, $app));
+-    if ($app != 'horde') {
+-        require HORDE_BASE . '/config/prefs.php';
+-        $horde_members = $prefGroups['identities']['members'];
+-        unset($prefGroups);
+-    }
+-}
+-
+ /* Load $app's preferences, if any. */
+ if (file_exists($appbase . '/config/prefs.php')) {
+     require $appbase . '/config/prefs.php';
+@@ -50,7 +40,29 @@
+     require_once $appbase . '/lib/prefs.php';
+ }
+ 
++/* If there's only one prefGroup, just show it. */
++if (empty($group) && count($prefGroups) == 1) {
++    $group = array_keys($prefGroups);
++    $group = array_pop($group);
++}
++
+ if ($group == 'identities') {
++    require_once 'Horde/Identity.php';
++    $identity = &Identity::singleton($app == 'horde' ? null : array($app, $app));
++    if ($app != 'horde') {
++        if (Util::nonInputVar('prefGroups')) {
++            $keepPrefGroups = $prefGroups;
++            unset($prefGroups);
++        }
++        require HORDE_BASE . '/config/prefs.php';
++        $horde_members = $prefGroups['identities']['members'];
++        if (Util::nonInputVar('keepPrefGroups')) {
++            $prefGroups = $keepPrefGroups;
++        } else {
++            unset($prefGroups);
++        }
++    }
++
+     if (isset($horde_members)) {
+         $prefGroups['identities']['members'] = array_merge($horde_members, $prefGroups['identities']['members']);
+     }
 diff -ur -Nur horde-3.1-rc1/templates/common-header.inc horde-FRAMEWORK_3/templates/common-header.inc
 --- horde-3.1-rc1/templates/common-header.inc	2006-01-03 21:35:26.000000000 +0200
 +++ horde-FRAMEWORK_3/templates/common-header.inc	2006-01-05 12:52:53.000000000 +0200
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/horde-branch.diff?r1=1.2&r2=1.3&f=u