To much encoding. Now we only encode what's needed.

[squirrelmail.git] / functions / attachment_common.php

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 3ee385a362a7b402ae7ec95525234cb97ba64383..eea42c5c46312e294d9e6f879357b227cbc310c7 100644 (file)
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -3,7 +3,7 @@
 /**
  * attachment_common.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file provides the handling of often-used attachment types.
@@ -28,6 +28,7 @@ $FileExtensionToMimeType = array('bmp'  => 'image/x-bitmap',
                                  'vcf'  => 'text/x-vcard');
 
 /* Register browser-supported image types */
+sqgetGlobalVar('attachment_common_types', $attachment_common_types);
 if (isset($attachment_common_types)) {
     /* Don't run this before being logged in. That may happen
        when plugins include mime.php */
@@ -93,8 +94,8 @@ function attachment_common_link_text(&$Args)
        $Args[1]['attachment_common']['href'] = Where it links to
       
        This sets the 'href' of this plugin for a new link. */
-       
-    global $QUERY_STRING;
+    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
+
     $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING;
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'], 
@@ -128,9 +129,10 @@ function attachment_common_link_message(&$Args)
 }
 
 
-function attachment_common_link_html(&$Args)
+function attachment_common_link_html(&$Args) 
 {
-    global $QUERY_STRING;
+    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
+
     $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING.
        /* why use the overridetype? can this be removed */
        '&override_type0=text&override_type1=html';
@@ -145,7 +147,9 @@ function attachment_common_link_html(&$Args)
 
 function attachment_common_link_image(&$Args)
 {
+    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
     global $attachment_common_show_images, $attachment_common_show_images_list;
+
     
     $info['passed_id'] = $Args[3];
     $info['mailbox'] = $Args[4];
@@ -153,7 +157,6 @@ function attachment_common_link_image(&$Args)
     
     $attachment_common_show_images_list[] = $info;
     
-    global $QUERY_STRING;
     $Args[1]['attachment_common']['href'] = '../src/image.php?'. $QUERY_STRING;
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'], 
@@ -168,7 +171,8 @@ function attachment_common_link_image(&$Args)
 
 function attachment_common_link_vcard(&$Args)
 {
-    global $QUERY_STRING;
+    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
+
     $Args[1]['attachment_common']['href'] = '../src/vcard.php?'. $QUERY_STRING;
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'],