From bfaca0a124b505888247e0c5aadec74127dd37c8 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 12 Jan 2009 15:09:38 -0700
Subject: [PATCH] These functions should not be called statically

---
 imp/folders.php     | 2 +-
 imp/lib/Compose.php | 2 +-
 imp/lib/Session.php | 2 +-
 imp/pgp.php         | 2 +-
 imp/smime.php       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/imp/folders.php b/imp/folders.php
index 391bbe0d6..82a5b0350 100644
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -138,7 +138,7 @@ case 'download_folder_zip':
 case 'import_mbox':
     $import_folder = Util::getFormData('import_folder');
     if (!empty($import_folder)) {
-        $res = Browser::wasFileUploaded('mbox_upload', _("mailbox file"));
+        $res = $browser->wasFileUploaded('mbox_upload', _("mailbox file"));
         if (!is_a($res, 'PEAR_Error')) {
             $res = $imp_folder->importMbox(String::convertCharset($import_folder, $charset, 'UTF7-IMAP'), $_FILES['mbox_upload']['tmp_name']);
             $mbox_name = basename(Util::dispelMagicQuotes($_FILES['mbox_upload']['name']));
diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 26e756c3d..20949c47e 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1526,7 +1526,7 @@ class IMP_Compose
     {
         global $conf;
 
-        $res = Browser::wasFileUploaded($name, _("attachment"));
+        $res = $GLOBALS['browser']->wasFileUploaded($name, _("attachment"));
         if (is_a($res, 'PEAR_Error')) {
             return $res;
         }
diff --git a/imp/lib/Session.php b/imp/lib/Session.php
index 1681b7186..40eb08ab7 100644
--- a/imp/lib/Session.php
+++ b/imp/lib/Session.php
@@ -148,7 +148,7 @@ class IMP_Session
 
         /* Does the server allow file uploads? If yes, store the
          * value, in bytes, of the maximum file size. */
-        $sess['file_upload'] = Browser::allowFileUploads();
+        $sess['file_upload'] = $GLOBALS['browser']->allowFileUploads();
 
         /* Is the 'mail/canApplyFilters' API call available? */
         if ($registry->hasMethod('mail/canApplyFilters') &&
diff --git a/imp/pgp.php b/imp/pgp.php
index c70a352bb..6a20a07c4 100644
--- a/imp/pgp.php
+++ b/imp/pgp.php
@@ -40,7 +40,7 @@ function _getImportKey()
         return $key;
     }
 
-    $res = Browser::wasFileUploaded('upload_key', _("key"));
+    $res = $GLOBALS['browser']->wasFileUploaded('upload_key', _("key"));
     if (!is_a($res, 'PEAR_Error')) {
         return file_get_contents($_FILES['upload_key']['tmp_name']);
     } else {
diff --git a/imp/smime.php b/imp/smime.php
index 07c0189d9..83da94bc9 100644
--- a/imp/smime.php
+++ b/imp/smime.php
@@ -34,7 +34,7 @@ function _getImportKey()
         return $key;
     }
 
-    $res = Browser::wasFileUploaded('upload_key', _("key"));
+    $res = $GLOBALS['browser']->wasFileUploaded('upload_key', _("key"));
     if (!is_a($res, 'PEAR_Error')) {
         return file_get_contents($_FILES['upload_key']['tmp_name']);
     } else {
-- 
2.11.0