X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fattachment_common.php;h=2f6e9b0599420a325ff46add5afa605df506de76;hb=2b0a416283909fe6a6dc712e50ec2dc28bacd207;hp=939648fc131971cfb34b8c69c1c670f3d95d882c;hpb=b854f93ad744a87ab3a06aaa1dbe55a9a986a2c3;p=squirrelmail.git

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 939648fc..2f6e9b05 100644
--- a/functions/attachment_common.php
+++ b/functions/attachment_common.php
@@ -3,14 +3,20 @@
 /**
  * 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.
  *
  * $Id$
+ * @package squirrelmail
  */
 
+/**
+ * Needs documentation
+ */
+require_once(SM_PATH . 'functions/global.php');
+
 global $attachment_common_show_images_list;
 $attachment_common_show_images_list = array();
 
@@ -28,6 +34,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 */
@@ -60,6 +67,7 @@ register_attachment_common('text/html',      'link_html');
 
 /* Register vcards */
 register_attachment_common('text/x-vcard',   'link_vcard');
+register_attachment_common('text/directory', 'link_vcard');
 
 /* Register rules for general types.
  * These will be used if there isn't a more specific rule available. */
@@ -93,9 +101,9 @@ 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;
-    $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING;
+    sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
+
+    $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING;
     $Args[1]['attachment_common']['href'] =
           set_url_var($Args[1]['attachment_common']['href'], 
 	  'ent_id',$Args[5]);
@@ -115,10 +123,9 @@ function attachment_common_link_text(&$Args)
     $Args[6] = $Args[1]['attachment_common']['href'];
 }
 
-
 function attachment_common_link_message(&$Args)
 {
-    $Args[1]['attachment_common']['href'] = '../src/read_body.php?startMessage=' .
+    $Args[1]['attachment_common']['href'] = SM_PATH . 'src/read_body.php?startMessage=' .
         $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
         '&passed_ent_id=' . $Args[5] . '&override_type0=message&override_type1=rfc822';
     /* The link that we created needs a name.  "view" will be displayed for
@@ -129,41 +136,38 @@ function attachment_common_link_message(&$Args)
 }
 
 
-function attachment_common_link_html(&$Args)
+function attachment_common_link_html(&$Args) 
 {
-    $Args[1]['attachment_common']['href'] = '../src/download.php?startMessage=' . 
-        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
-       '&passed_ent_id=' . $Args[5] . '&override_type0=text&override_type1=html';
-    
-    if ($Args[8] && $Args[9]) {
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
-    }
+    sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
+
+    $Args[1]['attachment_common']['href'] = SM_PATH . 'src/view_text.php?'. $QUERY_STRING.
+       /* why use the overridetype? can this be removed */
+       '&override_type0=text&override_type1=html';
+    $Args[1]['attachment_common']['href'] =
+          set_url_var($Args[1]['attachment_common']['href'], 
+	  'ent_id',$Args[5]);
 
     $Args[1]['attachment_common']['text'] = _("view");
 
     $Args[6] = $Args[1]['attachment_common']['href'];
 }
 
-
 function attachment_common_link_image(&$Args)
 {
     global $attachment_common_show_images, $attachment_common_show_images_list;
-    
+
+    sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
+   
     $info['passed_id'] = $Args[3];
     $info['mailbox'] = $Args[4];
     $info['ent_id'] = $Args[5];
     
     $attachment_common_show_images_list[] = $info;
     
-    $Args[1]['attachment_common']['href'] = '../src/image.php?startMessage=' .
-        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
-        '&passed_ent_id=' . $Args[5];
-    
-    if ($Args[8] && $Args[9]) {
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
-    }
+    $Args[1]['attachment_common']['href'] = SM_PATH . 'src/image.php?'. $QUERY_STRING;
+    $Args[1]['attachment_common']['href'] =
+          set_url_var($Args[1]['attachment_common']['href'], 
+	  'ent_id',$Args[5]);
   
     $Args[1]['attachment_common']['text'] = _("view");
     
@@ -174,13 +178,12 @@ function attachment_common_link_image(&$Args)
 
 function attachment_common_link_vcard(&$Args)
 {
-    $Args[1]['attachment_common']['href'] = '../src/vcard.php?startMessage=' .
-        $Args[2] . '&passed_id=' . $Args[3] . '&mailbox=' . $Args[4] .
-        '&passed_ent_id=' . $Args[5];
-  
-    if (isset($where) && isset($what))
-        $Args[1]['attachment_common']['href'] .= '&where=' . 
-        urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
+    sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
+ 
+    $Args[1]['attachment_common']['href'] = SM_PATH . 'src/vcard.php?'. $QUERY_STRING;
+    $Args[1]['attachment_common']['href'] =
+          set_url_var($Args[1]['attachment_common']['href'], 
+	  'ent_id',$Args[5]);
   
     $Args[1]['attachment_common']['text'] = _("Business Card");