From b59a9a7f414dc3edc7d6fc0caf8396e38b1c4649 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 14 May 2010 20:56:01 -0600
Subject: [PATCH] Move Perms UI code to Core

---
 framework/{Perms/lib/Horde => Core/lib/Horde/Core}/Perms/Ui.php | 6 +++---
 framework/Core/package.xml                                      | 7 ++++++-
 framework/Perms/package.xml                                     | 7 +++----
 horde/admin/perms/addchild.php                                  | 2 +-
 horde/admin/perms/delete.php                                    | 2 +-
 horde/admin/perms/edit.php                                      | 2 +-
 horde/admin/perms/index.php                                     | 2 +-
 7 files changed, 16 insertions(+), 12 deletions(-)
 rename framework/{Perms/lib/Horde => Core/lib/Horde/Core}/Perms/Ui.php (99%)

diff --git a/framework/Perms/lib/Horde/Perms/Ui.php b/framework/Core/lib/Horde/Core/Perms/Ui.php
similarity index 99%
rename from framework/Perms/lib/Horde/Perms/Ui.php
rename to framework/Core/lib/Horde/Core/Perms/Ui.php
index e4188d782..b6659ee87 100644
--- a/framework/Perms/lib/Horde/Perms/Ui.php
+++ b/framework/Core/lib/Horde/Core/Perms/Ui.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The Horde_Perms_Ui:: class provides UI methods for the Horde permissions
+ * The Horde_Core_Perms_Ui:: class provides UI methods for the Horde permissions
  * system.
  *
  * Copyright 2001-2010 The Horde Project (http://www.horde.org/)
@@ -10,9 +10,9 @@
  *
  * @author   Chuck Hagenbuch <chuck@horde.org>
  * @category Horde
- * @package  Horde_Perms
+ * @package  Core
  */
-class Horde_Perms_Ui
+class Horde_Core_Perms_Ui
 {
     /**
      * The Horde_Perms object we're displaying UI stuff for.
diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 6290539cb..0239c9aad 100644
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -37,7 +37,8 @@ Application Framework.
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Import prefs UI handling class from Horde_Prefs.
+ <notes>* Import perms UI handling class from horde/Perms.
+ * Import prefs UI handling class from horde/Prefs.
  * Convert from PEAR Log to Horde_Log for logging.
  * Add Horde_Themes:: class.
  * Add Horde::nocacheUrl().
@@ -103,6 +104,9 @@ Application Framework.
        <file name="Hordelog.php" role="php" />
        <file name="Status.php" role="php" />
       </dir> <!-- /lib/Horde/Core/Notification -->
+      <dir name="Perms">
+       <file name="Ui.php" role="php" />
+      </dir> <!-- /lib/Horde/Core/Perms -->
       <dir name="Prefs">
        <dir name="Ui">
         <file name="Widgets.php" role="php" />
@@ -255,6 +259,7 @@ Application Framework.
    <install name="lib/Horde/Core/Log/Logger.php" as="Horde/Core/Log/Logger.php" />
    <install name="lib/Horde/Core/Notification/Hordelog.php" as="Horde/Core/Notification/Hordelog.php" />
    <install name="lib/Horde/Core/Notification/Status.php" as="Horde/Core/Notification/Status.php" />
+   <install name="lib/Horde/Core/Perms/Ui.php" as="Horde/Core/Perms/Ui.php" />
    <install name="lib/Horde/Core/Prefs/Ui/Widgets.php" as="Horde/Core/Prefs/Ui/Widgets.php" />
    <install name="lib/Horde/Core/Prefs/Ui.php" as="Horde/Core/Prefs/Ui.php" />
    <install name="lib/Horde/ErrorHandler.php" as="Horde/ErrorHandler.php" />
diff --git a/framework/Perms/package.xml b/framework/Perms/package.xml
index 96bdf93f6..dc9c39dc5 100644
--- a/framework/Perms/package.xml
+++ b/framework/Perms/package.xml
@@ -30,7 +30,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <api>beta</api>
  </stability>
  <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Initial Horde 4 package.
+ <notes>* Eliminated horde/Core dependency.
+ * Initial Horde 4 package.
  </notes>
  <contents>
   <dir name="/">
@@ -45,7 +46,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="Exception.php" role="php" />
       <file name="Permission.php" role="php" />
       <file name="Sql.php" role="php" />
-      <file name="Ui.php" role="php" />
      </dir> <!-- /lib/Horde/Perms -->
      <file name="Perms.php" role="php" />
     </dir> <!-- /lib/Horde -->
@@ -78,7 +78,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     <channel>pear.horde.org</channel>
    </package>
    <package>
-    <name>Horde_Tree</name>
+    <name>Tree</name>
     <channel>pear.horde.org</channel>
    </package>
   </optional>
@@ -91,7 +91,6 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Perms/Permission/DataTreeObject.php" as="Horde/Perms/Permission/DataTreeObject.php" />
    <install name="lib/Horde/Perms/Permission/SqlObject.php" as="Horde/Perms/Permission/SqlObject.php" />
    <install name="lib/Horde/Perms/Sql.php" as="Horde/Perms/Sql.php" />
-   <install name="lib/Horde/Perms/Ui.php" as="Horde/Perms/Ui.php" />
    <install name="lib/Horde/Perms.php" as="Horde/Perms.php" />
   </filelist>
  </phprelease>
diff --git a/horde/admin/perms/addchild.php b/horde/admin/perms/addchild.php
index 9534404f1..a6f52086d 100644
--- a/horde/admin/perms/addchild.php
+++ b/horde/admin/perms/addchild.php
@@ -27,7 +27,7 @@ try {
 }
 
 /* Set up form. */
-$ui = new Horde_Perms_Ui($perms);
+$ui = new Horde_Core_Perms_Ui($perms);
 $ui->setVars($vars);
 $ui->setupAddForm($permission);
 
diff --git a/horde/admin/perms/delete.php b/horde/admin/perms/delete.php
index 35560b305..5ec3c365f 100644
--- a/horde/admin/perms/delete.php
+++ b/horde/admin/perms/delete.php
@@ -28,7 +28,7 @@ try {
 }
 
 /* Set up form. */
-$ui = new Horde_Perms_Ui($perms);
+$ui = new Horde_Core_Perms_Ui($perms);
 $ui->setVars($vars);
 $ui->setupDeleteForm($permission);
 
diff --git a/horde/admin/perms/edit.php b/horde/admin/perms/edit.php
index 7fb277551..d755fb0ea 100644
--- a/horde/admin/perms/edit.php
+++ b/horde/admin/perms/edit.php
@@ -94,7 +94,7 @@ if ($category !== null) {
     }
 }
 
-$ui = new Horde_Perms_Ui($perms);
+$ui = new Horde_Core_Perms_Ui($perms);
 $ui->setVars($vars);
 $ui->setupEditForm($permission);
 
diff --git a/horde/admin/perms/index.php b/horde/admin/perms/index.php
index 93c14c6c6..3fbcf7aa5 100644
--- a/horde/admin/perms/index.php
+++ b/horde/admin/perms/index.php
@@ -18,7 +18,7 @@ $title = _("Permissions Administration");
 require HORDE_TEMPLATES . '/common-header.inc';
 require HORDE_TEMPLATES . '/admin/menu.inc';
 
-$ui = new Horde_Perms_Ui($injector->getInstance('Horde_Perms'));
+$ui = new Horde_Core_Perms_Ui($injector->getInstance('Horde_Perms'));
 
 echo '<h1 class="header">' . Horde::img('perms.png') . ' ' . _("Permissions") . '</h1>';
 $ui->renderTree($perm_id);
-- 
2.11.0