From 672a65d70280fe6bc429359e0daaccbd4f435e3d Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sun, 22 Feb 2009 18:57:37 -0700
Subject: [PATCH] Fatally exit if prefs files don't exist.

Also, there is no way around using extract() until the prefs UI code is
rewritten.
---
 imp/acl.php            | 7 ++++---
 imp/fetchmailprefs.php | 6 +++---
 imp/filterprefs.php    | 7 ++++---
 imp/pgp.php            | 7 ++++---
 imp/smime.php          | 7 ++++---
 imp/stationery.php     | 6 +++---
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/imp/acl.php b/imp/acl.php
index af748328f..88df9989d 100644
--- a/imp/acl.php
+++ b/imp/acl.php
@@ -135,10 +135,11 @@ $canEdit = $ACLDriver->canEdit($folder, $_SESSION['imp']['uniquser']);
 
 require_once 'Horde/Prefs/UI.php';
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');
-if (!is_a($result, 'PEAR_Error')) {
-    // @todo Don't use extract
-    extract($result);
+if (is_a($result, 'PEAR_Error')) {
+    Horde::fatal($result, __FILE__, __LINE__);
 }
+extract($result);
+
 $app = 'imp';
 $chunk = Util::nonInputVar('chunk');
 Prefs_UI::generateHeader(null, $chunk);
diff --git a/imp/fetchmailprefs.php b/imp/fetchmailprefs.php
index 519124b82..16f2fd88f 100644
--- a/imp/fetchmailprefs.php
+++ b/imp/fetchmailprefs.php
@@ -89,10 +89,10 @@ case 'fetchmail_prefs_delete':
 
 require_once 'Horde/Prefs/UI.php';
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');
-if (!is_a($result, 'PEAR_Error')) {
-    // @todo Don't use extract()
-    extract($result);
+if (is_a($result, 'PEAR_Error')) {
+    Horde::fatal($result, __FILE__, __LINE__);
 }
+extract($result);
 
 $app = 'imp';
 $chunk = Util::nonInputVar('chunk');
diff --git a/imp/filterprefs.php b/imp/filterprefs.php
index b8b85be35..76ede1ec3 100644
--- a/imp/filterprefs.php
+++ b/imp/filterprefs.php
@@ -12,11 +12,12 @@
 require_once dirname(__FILE__) . '/lib/base.php';
 require_once 'Horde/Help.php';
 require_once 'Horde/Prefs/UI.php';
+
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');
-if (!is_a($result, 'PEAR_Error')) {
-    // @todo Don't use extract()
-    extract($result);
+if (is_a($result, 'PEAR_Error')) {
+    Horde::fatal($result, __FILE__, __LINE__);
 }
+extract($result);
 
 /* Are preferences locked? */
 $login_locked = $prefs->isLocked('filter_on_login') || empty($_SESSION['imp']['filteravail']);
diff --git a/imp/pgp.php b/imp/pgp.php
index 358225e2a..b1d0cf3fe 100644
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -282,10 +282,11 @@ try {
 }
 
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');
-if (!is_a($result, 'PEAR_Error')) {
-    // @todo Don't use extract()
-    extract($result);
+if (is_a($result, 'PEAR_Error')) {
+    Horde::fatal($result, __FILE__, __LINE__);
 }
+extract($result);
+
 require_once 'Horde/Help.php';
 require_once 'Horde/Prefs/UI.php';
 $app = 'imp';
diff --git a/imp/smime.php b/imp/smime.php
index fd169fbf4..5fab5b17a 100644
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -215,10 +215,11 @@ try {
 }
 
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');
-if (!is_a($result, 'PEAR_Error')) {
-    // @todo Don't use extract()
-    extract($result);
+if (is_a($result, 'PEAR_Error')) {
+    Horde::fatal($result, __FILE__, __LINE__);
 }
+extract($result);
+
 require_once 'Horde/Help.php';
 require_once 'Horde/Prefs/UI.php';
 $app = 'imp';
diff --git a/imp/stationery.php b/imp/stationery.php
index 06516fbc9..dbc8ee983 100644
--- a/imp/stationery.php
+++ b/imp/stationery.php
@@ -97,10 +97,10 @@ if ($stationery['t'] == 'html') {
 /* Show the header. */
 require_once 'Horde/Prefs/UI.php';
 $result = Horde::loadConfiguration('prefs.php', array('prefGroups', '_prefs'), 'imp');
-if (!is_a($result, 'PEAR_Error')) {
-    // @todo Don't use extract()
-    extract($result);
+if (is_a($result, 'PEAR_Error')) {
+    Horde::fatal($result, __FILE__, __LINE__);
 }
+extract($result);
 
 $app = 'imp';
 $chunk = Util::nonInputVar('chunk');
-- 
2.11.0