More places to use Horde_Variables::

diff --git a/imp/attachment.php b/imp/attachment.php
index 96f969f..b5d3212 100644 (file)
--- a/imp/attachment.php
+++ b/imp/attachment.php
@@ -27,10 +27,8 @@ if (!$conf['compose']['link_attachments']) {
 }
 
 // Gather required form variables.
-$mail_user = Horde_Util::getFormData('u');
-$time_stamp = Horde_Util::getFormData('t');
-$file_name = Horde_Util::getFormData('f');
-if (is_null($mail_user) || is_null($time_stamp) || is_null($file_name)) {
+$vars = Horde_Variables::getDefaultVariables();
+if (!$vars->mail_user || !$vars->$time_stamp || !$vars->file_name) {
     throw new IMP_Exception(_("The attachment was not found."));
 }
 
@@ -42,9 +40,9 @@ try {
 }
 
 // Check if the file exists.
-$mail_user = basename($mail_user);
-$time_stamp = basename($time_stamp);
-$file_name = escapeshellcmd(basename($file_name));
+$mail_user = basename($vars->mail_user);
+$time_stamp = basename($vars->time_stamp);
+$file_name = escapeshellcmd(basename($vars->file_name));
 $full_path = sprintf(IMP_Compose::VFS_LINK_ATTACH_PATH . '/%s/%d', $mail_user, $time_stamp);
 if (!$vfsroot->exists($full_path, $file_name)) {
     throw new IMP_Exception(_("The specified attachment does not exist. It may have been deleted by the original sender."));
@@ -53,10 +51,9 @@ if (!$vfsroot->exists($full_path, $file_name)) {
 // Check to see if we need to send a verification message.
 if ($conf['compose']['link_attachments_notify']) {
     if ($vfsroot->exists($full_path, $file_name . '.notify')) {
-        $delete_id = Horde_Util::getFormData('d');
         try {
             $read_id = $vfsroot->read($full_path, $file_name . '.notify');
-            if ($delete_id == $read_id) {
+            if ($vars->d == $read_id) {
                 $vfsroot->deleteFile($full_path, $file_name);
                 $vfsroot->deleteFile($full_path, $file_name . '.notify');
                 printf(_("Attachment %s deleted."), $file_name);

diff --git a/imp/folders.php b/imp/folders.php
index 81f0362..2156221 100644 (file)
--- a/imp/folders.php
+++ b/imp/folders.php
@@ -31,6 +31,7 @@ $subscribe = $prefs->getValue('subscribe');
 $showAll = (!$subscribe || $_SESSION['imp']['showunsub']);
 
 $charset = $registry->getCharset();
+$vars = Horde_Variables::getDefaultVariables();
 
 /* Get the base URL for this page. */
 $folders_url = Horde::selfUrl();
@@ -47,28 +48,28 @@ $imp_folder = $injector->getInstance('IMP_Folder');
 $imaptree = $injector->getInstance('IMP_Imap_Tree');
 
 /* $folder_list is already encoded in UTF7-IMAP. */
-$folder_list = Horde_Util::getFormData('folder_list', array());
+$folder_list = isset($vars->folder_list)
+    ? $vars->folder_list
+    : array();
 
 /* META refresh time (might be altered by actionID). */
 $refresh_time = $prefs->getValue('refresh_time');
 
 /* Run through the action handlers. */
-$actionID = Horde_Util::getFormData('actionID');
-if ($actionID) {
+if ($vars->actionID) {
     try {
-        Horde::checkRequestToken('imp.folders', Horde_Util::getFormData('folders_token'));
+        Horde::checkRequestToken('imp.folders', $vars->folders_token);
     } catch (Horde_Exception $e) {
         $notification->push($e);
-        $actionID = null;
+        $vars->actionID = null;
     }
 }
 
-switch ($actionID) {
+switch ($vars->actionID) {
 case 'collapse_folder':
 case 'expand_folder':
-    $folder = Horde_Util::getFormData('folder');
-    if (!empty($folder)) {
-        ($actionID == 'expand_folder') ? $imaptree->expand($folder) : $imaptree->collapse($folder);
+    if ($vars->folder) {
+        ($vars->actionID == 'expand_folder') ? $imaptree->expand($vars->folder) : $imaptree->collapse($vars->folder);
     }
     break;
 
@@ -98,11 +99,10 @@ case 'delete_folder':
     break;
 
 case 'delete_search_query':
-    $queryid = Horde_Util::getFormData('queryid');
-    if (!empty($queryid)) {
+    if ($vars->queryid) {
         $imp_search = $injector->getInstance('IMP_Search');
-        $notification->push(sprintf(_("Deleted Virtual Folder \"%s\"."), $imp_search->getLabel($queryid)), 'horde.success');
-        $imp_search->deleteSearchQuery($queryid);
+        $notification->push(sprintf(_("Deleted Virtual Folder \"%s\"."), $imp_search->getLabel($vars->queryid)), 'horde.success');
+        $imp_search->deleteSearchQuery($vars->queryid);
     }
     break;
 
@@ -110,7 +110,7 @@ case 'download_folder':
 case 'download_folder_zip':
     if (!empty($folder_list)) {
         $mbox = $imp_folder->generateMbox($folder_list);
-        if ($actionID == 'download_folder') {
+        if ($vars->actionID == 'download_folder') {
             $data = $mbox;
             fseek($data, 0, SEEK_END);
             $browser->downloadHeaders($folder_list[0] . '.mbox', null, false, ftell($data));
@@ -134,11 +134,10 @@ case 'download_folder_zip':
     break;
 
 case 'import_mbox':
-    $import_folder = Horde_Util::getFormData('import_folder');
-    if (!empty($import_folder)) {
+    if ($vars->import_folder) {
         try {
             $browser->wasFileUploaded('mbox_upload', _("mailbox file"));
-            $res = $imp_folder->importMbox(Horde_String::convertCharset($import_folder, $charset, 'UTF7-IMAP'), $_FILES['mbox_upload']['tmp_name']);
+            $res = $imp_folder->importMbox(Horde_String::convertCharset($vars->import_folder, $charset, 'UTF7-IMAP'), $_FILES['mbox_upload']['tmp_name']);
             $mbox_name = basename(Horde_Util::dispelMagicQuotes($_FILES['mbox_upload']['name']));
             if ($res === false) {
                 $notification->push(sprintf(_("There was an error importing %s."), $mbox_name), 'horde.error');
@@ -148,17 +147,16 @@ case 'import_mbox':
         } catch (Horde_Browser_Exception $e) {
             $notification->push($e);
         }
-        $actionID = null;
+        $vars->actionID = null;
     } else {
         $refresh_time = null;
     }
     break;
 
 case 'create_folder':
-    $new_mailbox = Horde_Util::getFormData('new_mailbox');
-    if (!empty($new_mailbox)) {
+    if ($vars->new_mailbox) {
         try {
-            $new_mailbox = $imaptree->createMailboxName(array_shift($folder_list), Horde_String::convertCharset($new_mailbox, $charset, 'UTF7-IMAP'));
+            $new_mailbox = $imaptree->createMailboxName(array_shift($folder_list), Horde_String::convertCharset($vars->new_mailbox, $charset, 'UTF7-IMAP'));
             $imp_folder->create($new_mailbox, $subscribe);
         } catch (Horde_Exception $e) {
             $notification->push($e);
@@ -168,8 +166,8 @@ case 'create_folder':
 
 case 'rename_folder':
     // $old_names already in UTF7-IMAP
-    $old_names = array_map('trim', explode("\n", Horde_Util::getFormData('old_names')));
-    $new_names = array_map('trim', explode("\n", Horde_Util::getFormData('new_names')));
+    $old_names = array_map('trim', explode("\n", $vars->old_names));
+    $new_names = array_map('trim', explode("\n", $vars->new_names));
 
     $iMax = count($new_names);
     if (!empty($new_names) &&
@@ -196,7 +194,7 @@ case 'rename_folder':
 case 'subscribe_folder':
 case 'unsubscribe_folder':
     if (!empty($folder_list)) {
-        if ($actionID == 'subscribe_folder') {
+        if ($vars->actionID == 'subscribe_folder') {
             $imp_folder->subscribe($folder_list);
         } else {
             $imp_folder->unsubscribe($folder_list);
@@ -235,7 +233,7 @@ case 'folders_empty_mailbox':
 case 'mark_folder_seen':
 case 'mark_folder_unseen':
     if (!empty($folder_list)) {
-        $injector->getInstance('IMP_Message')->flagAllInMailbox(array('seen'), $folder_list, ($actionID == 'mark_folder_seen'));
+        $injector->getInstance('IMP_Message')->flagAllInMailbox(array('seen'), $folder_list, ($vars->actionID == 'mark_folder_seen'));
     }
     break;
 
@@ -245,7 +243,7 @@ case 'folders_empty_mailbox_confirm':
         $loop = array();
         $rowct = 0;
         foreach ($folder_list as $val) {
-            if (($actionID == 'delete_folder_confirm') &&
+            if (($vars->actionID == 'delete_folder_confirm') &&
                 !empty($conf['server']['fixed_folders']) &&
                 in_array(IMP::folderPref($val, false), $conf['server']['fixed_folders'])) {
                 $notification->push(sprintf(_("The folder \"%s\" may not be deleted."), IMP::displayFolder($val)), 'horde.error');
@@ -277,8 +275,8 @@ case 'folders_empty_mailbox_confirm':
 
         $template = $injector->createInstance('Horde_Template');
         $template->setOption('gettext', true);
-        $template->set('delete', ($actionID == 'delete_folder_confirm'));
-        $template->set('empty', ($actionID == 'folders_empty_mailbox_confirm'));
+        $template->set('delete', ($vars->actionID == 'delete_folder_confirm'));
+        $template->set('empty', ($vars->actionID == 'folders_empty_mailbox_confirm'));
         $template->set('folders', $loop);
         $template->set('folders_url', $folders_url);
         $template->set('folders_token', Horde::getRequestToken('imp.folders'));
@@ -336,7 +334,7 @@ $folders_token = Horde::getRequestToken('imp.folders');
 $folders_url_ob = new Horde_Url($folders_url);
 $folders_url_ob->add('folders_token', $folders_token);
 
-if ($_SESSION['imp']['file_upload'] && ($actionID == 'import_mbox')) {
+if ($_SESSION['imp']['file_upload'] && ($vars->actionID == 'import_mbox')) {
     $title = _("Folder Navigator");
     IMP::prepareMenu();
     require IMP_TEMPLATES . '/common-header.inc';

diff --git a/imp/search-basic.php b/imp/search-basic.php
index 5395650..0635ffd 100644 (file)
--- a/imp/search-basic.php
+++ b/imp/search-basic.php
@@ -27,19 +27,18 @@ if ($_SESSION['imp']['protocol'] == 'pop') {
 }
 
 $imp_search = $injector->getInstance('IMP_Search');
+$vars = Horde_Variables::getDefaultVariables();
 
 /* If search_basic_mbox is set, we are processing the search query. */
-$search_mailbox = Horde_Util::getFormData('search_basic_mbox');
-if ($search_mailbox) {
+if ($vars->search_mailbox) {
     $imp_ui_search = new IMP_Ui_Search();
-    $id = $imp_ui_search->processBasicSearch($search_mailbox, Horde_Util::getFormData('search_criteria'), Horde_Util::getFormData('search_criteria_text'), Horde_Util::getFormData('search_criteria_not'), Horde_Util::getFormData('search_flags'));
+    $id = $imp_ui_search->processBasicSearch($vars->search_mailbox, $vars->search_criteria, $vars->search_criteria_text, $vars->search_criteria_not, $vars->search_flags);
 
     /* Redirect to the mailbox screen. */
     Horde::applicationUrl('mailbox.php', true)->add('mailbox', $imp_search->createSearchID($id))->redirect();
 }
 
 $f_fields = $s_fields = array();
-$search_mailbox = Horde_Util::getFormData('search_mailbox');
 
 foreach ($imp_search->searchFields() as $key => $val) {
     if (!in_array($val['type'], array('customhdr', 'date', 'within'))) {
@@ -62,8 +61,8 @@ $t = $injector->createInstance('Horde_Template');
 $t->setOption('gettext', true);
 
 $t->set('action', Horde::applicationUrl('search-basic.php'));
-$t->set('mbox', htmlspecialchars($search_mailbox));
-$t->set('search_title', sprintf(_("Search %s"), htmlspecialchars(IMP::displayFolder($search_mailbox))));
+$t->set('mbox', htmlspecialchars($vars->search_mailbox));
+$t->set('search_title', sprintf(_("Search %s"), htmlspecialchars(IMP::displayFolder($vars->search_mailbox))));
 $t->set('s_fields', $s_fields);
 $t->set('f_fields', $f_fields);
 
@@ -74,7 +73,7 @@ IMP::menu();
 IMP::status();
 
 if ($browser->hasFeature('javascript')) {
-    $t->set('advsearch', Horde::link(Horde::applicationUrl('search.php')->add(array('search_mailbox' => $search_mailbox))));
+    $t->set('advsearch', Horde::link(Horde::applicationUrl('search.php')->add(array('search_mailbox' => $vars->search_mailbox))));
 }
 
 echo $t->fetch(IMP_TEMPLATES . '/imp/search/search-basic.html');