From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 14 Jul 2009 04:49:32 +0000 (-0600)
Subject: For fatal w/ Horde_Exception, no need to provide file or line numbers
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f8d998c7fdf3821a5472715e1751706250c3b456;p=horde.git

For fatal w/ Horde_Exception, no need to provide file or line numbers
---

diff --git a/imp/acl.php b/imp/acl.php
index 813954261..4d11959eb 100644
--- a/imp/acl.php
+++ b/imp/acl.php
@@ -73,7 +73,7 @@ case 'imp_acl_set':
         try {
             $current_acl = $ACLDriver->getACL($folder);
         } catch (Horde_Exception $e) {
-            Horde::fatal($e, __FILE__, __LINE__);
+            Horde::fatal($e);
         }
         foreach ($acls as $user => $acl) {
             if ($acl) {
@@ -129,7 +129,7 @@ if (empty($folder)) {
 try {
     $curr_acl = $ACLDriver->getACL($folder);
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 $canEdit = $ACLDriver->canEdit($folder, $_SESSION['imp']['uniquser']);
 
@@ -137,7 +137,7 @@ require_once 'Horde/Prefs/UI.php';
 try {
     extract(Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 $app = 'imp';
diff --git a/imp/cache.php b/imp/cache.php
index 5bd473ef8..12eafaedf 100644
--- a/imp/cache.php
+++ b/imp/cache.php
@@ -77,7 +77,7 @@ if (empty($cid)) {
 }
 
 if (!($cache = IMP::getCache())) {
-    Horde::fatal('No cache backend available.', __FILE__, __LINE__);
+    Horde::fatal(new Horde_Exception('No cache backend available.'));
 }
 
 // If cache info doesn't exist, just output an empty body.
diff --git a/imp/fetchmailprefs.php b/imp/fetchmailprefs.php
index e68a46ee7..c57b0c65f 100644
--- a/imp/fetchmailprefs.php
+++ b/imp/fetchmailprefs.php
@@ -91,7 +91,7 @@ require_once 'Horde/Prefs/UI.php';
 try {
     extract(Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 $app = 'imp';
diff --git a/imp/filterprefs.php b/imp/filterprefs.php
index a04ce52a5..b54ca6b2c 100644
--- a/imp/filterprefs.php
+++ b/imp/filterprefs.php
@@ -15,7 +15,7 @@ require_once 'Horde/Prefs/UI.php';
 try {
     extract(Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 /* Are preferences locked? */
diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 708738d75..ae3a53288 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -1731,7 +1731,7 @@ class IMP
         try {
             return Horde_Cache::singleton($GLOBALS['conf']['cache']['driver'], Horde::getDriverConfig('cache', $GLOBALS['conf']['cache']['driver']));
         } catch (Horde_Exception $e) {
-            Horde::fatal($e, __FILE__, __LINE__);
+            Horde::fatal($e);
         }
     }
 
diff --git a/imp/pgp.php b/imp/pgp.php
index ccec617c7..2e1ffeda1 100644
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -74,7 +74,7 @@ require_once dirname(__FILE__) . '/lib/base.php';
 try {
     $imp_pgp = Horde_Crypt::singleton(array('IMP', 'Pgp'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 $secure_check = Horde::isConnectionSecure();
@@ -261,11 +261,11 @@ case 'save_attachment_public_key':
     try {
         $contents = IMP_Contents::singleton(Horde_Util::getFormData('uid') . IMP::IDX_SEP . Horde_Util::getFormData('mailbox'));
     } catch (Horde_Exception $e) {
-        Horde::fatal($e, __FILE__, __LINE__);
+        Horde::fatal($e);
     }
     $mime_part = $contents->getMIMEPart(Horde_Util::getFormData('mime_id'));
     if (empty($mime_part)) {
-        Horde::fatal('Cannot retrieve public key from message.', __FILE__, __LINE__);
+        Horde::fatal(new Horde_Exception('Cannot retrieve public key from message.'));
     }
 
     /* Add the public key to the storage system. */
@@ -305,7 +305,7 @@ try {
 try {
     extract(Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 require_once 'Horde/Prefs/UI.php';
diff --git a/imp/smime.php b/imp/smime.php
index 141624f0c..b74b4cbd8 100644
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -83,7 +83,7 @@ require_once dirname(__FILE__) . '/lib/base.php';
 try {
     $imp_smime = Horde_Crypt::singleton(array('IMP', 'Smime'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 $secure_check = Horde::isConnectionSecure();
@@ -181,11 +181,11 @@ case 'save_attachment_public_key':
     try {
         $contents = IMP_Contents::singleton(Horde_Util::getFormData('uid') . IMP::IDX_SEP . Horde_Util::getFormData('mailbox'));
     } catch (Horde_Exception $e) {
-        Horde::fatal($e, __FILE__, __LINE__);
+        Horde::fatal($e);
     }
     $mime_part = $contents->getMIMEPart(Horde_Util::getFormData('mime_id'));
     if (empty($mime_part)) {
-        Horde::fatal('Cannot retrieve public key from message.', __FILE__, __LINE__);
+        Horde::fatal(new Horde_Exception('Cannot retrieve public key from message.'));
     }
 
     /* Add the public key to the storage system. */
@@ -222,7 +222,7 @@ try {
 try {
     extract(Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 require_once 'Horde/Prefs/UI.php';
diff --git a/imp/stationery.php b/imp/stationery.php
index f4ede2056..f288f74fd 100644
--- a/imp/stationery.php
+++ b/imp/stationery.php
@@ -98,7 +98,7 @@ require_once 'Horde/Prefs/UI.php';
 try {
     extract(Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp'));
 } catch (Horde_Exception $e) {
-    Horde::fatal($e, __FILE__, __LINE__);
+    Horde::fatal($e);
 }
 
 $app = 'imp';
diff --git a/imp/view.php b/imp/view.php
index 2ce8b4f68..742afa343 100644
--- a/imp/view.php
+++ b/imp/view.php
@@ -85,7 +85,7 @@ if ($actionID == 'compose_attach_preview') {
     try {
         $contents = IMP_Contents::singleton($uid . IMP::IDX_SEP . $mailbox);
     } catch (Horde_Exception $e) {
-        Horde::fatal($e, __FILE__, __LINE__);
+        Horde::fatal($e);
     }
 }