From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 31 Jul 2009 19:42:08 +0000 (-0400)
Subject: Re-add some require statements for libraries that can't be autoloaded
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3c53a7de043fcc520e1f8b7d3b1cef28f11fa64d;p=horde.git

Re-add some require statements for libraries that can't be autoloaded
yet.
---

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index de061d3e2..6da32da2a 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -6,6 +6,12 @@
  * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
  */
 
+/** Horde_Share */
+require_once 'Horde/Share.php';
+
+/** Need to bring this in explicitly since we extend the object class */
+require_once 'Horde/Share/sql_hierarchical.php';
+
 /**
  * Ansel Base Class.
  *
@@ -1477,6 +1483,7 @@ class Ansel_Gallery extends Horde_Share_Object_sql_hierarchical {
      */
     function getOwner()
     {
+        require_once 'Horde/Identity.php';
         $identity = Identity::singleton('none', $this->data['share_owner']);
         return $identity;
     }
@@ -2835,6 +2842,7 @@ class Ansel_Image {
         }
 
         if (empty($watermark)) {
+            require_once 'Horde/Identity.php';
             $identity = Identity::singleton();
             $name = $identity->getValue('fullname');
             if (empty($name)) {
diff --git a/ansel/lib/Form/Ecard.php b/ansel/lib/Form/Ecard.php
index ebcb47833..bf50f3f2f 100644
--- a/ansel/lib/Form/Ecard.php
+++ b/ansel/lib/Form/Ecard.php
@@ -23,6 +23,7 @@ class Ansel_Form_Ecard extends Horde_Form {
         if (empty($user)) {
             $this->addVariable(_("Use the following return address:"), 'ecard_retaddr', 'text', true);
         } else {
+            require_once 'Horde/Identity.php';
             $identity = Identity::singleton();
             $from_addr = $identity->getDefaultFromAddress();
             $vars->set('ecard_retaddr', $from_addr);
diff --git a/ansel/lib/Report.php b/ansel/lib/Report.php
index cb6a02252..7a491733d 100644
--- a/ansel/lib/Report.php
+++ b/ansel/lib/Report.php
@@ -56,6 +56,7 @@ class Ansel_Report {
     function _getUserEmail($user = null)
     {
         // Get user email
+        require_once 'Horde/Identity.php';
         $identity = Identity::singleton('none', $user);
         return $identity->getValue('from_addr');
     }
diff --git a/ansel/lib/View/List.php b/ansel/lib/View/List.php
index aea0364b0..b6a6c51ff 100644
--- a/ansel/lib/View/List.php
+++ b/ansel/lib/View/List.php
@@ -133,6 +133,7 @@ class Ansel_View_List extends Ansel_View_Base
                                                 'ansel', $owner, '', null, false);
                     $fullname = $uprefs->getValue('grouptitle');
                     if (!$fullname) {
+                        require_once 'Horde/Identity.php';
                         $identity = &Identity::singleton('none', $owner);
                         $fullname = $identity->getValue('fullname');
                         if (!$fullname) {
diff --git a/ansel/rss.php b/ansel/rss.php
index 4d7b1d6f2..5f0670dbd 100644
--- a/ansel/rss.php
+++ b/ansel/rss.php
@@ -140,6 +140,7 @@ if (empty($rss)) {
         if (isset($galleries) && count($galleries)) {
             $images = $ansel_storage->getRecentImages($galleries);
             if (!is_a($images, 'PEAR_Error') && count($images)) {
+                require_once 'Horde/Identity.php';
                 $owner = Identity::singleton('none', $id);
                 $name = $owner->getValue('fullname');
                 $author = $owner->getValue('from_addr');