Fatally exit if prefs files don't exist.

Also, there is no way around using extract() until the prefs UI code is
rewritten.

diff --git a/imp/acl.php b/imp/acl.php
index af74832..88df998 100644 (file)
--- 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 519124b..16f2fd8 100644 (file)
--- 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 b8b85be..76ede1e 100644 (file)
--- 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 358225e..b1d0cf3 100644 (file)
--- 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 fd169fb..5fab5b1 100644 (file)
--- 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 06516fb..dbc8ee9 100644 (file)
--- 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');