X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Fattachment_common.php;h=65bfba0d8615ebdb85da8a77a62bf3d8a56695ca;hp=1d3365230db4e4f9835dbd9ae5926cd83e267670;hb=eb548244cf42565bbad450f308b760d3b6c2fc94;hpb=03ee7515c010074877fa88440ad59ba7fd606aa0

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 1d336523..65bfba0d 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-2004 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$
+ * @version $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,7 +34,7 @@ $FileExtensionToMimeType = array('bmp'  => 'image/x-bitmap',
                                  'vcf'  => 'text/x-vcard');
 
 /* Register browser-supported image types */
-$attachment_common_types = $_SESSION['attachment_common_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 */
@@ -61,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. */
@@ -84,23 +91,23 @@ function attachment_common_link_text(&$Args)
 {
     /* If there is a text attachment, we would like to create a 'view' button
        that links to the text attachment viewer.
-      
+
        $Args[1] = the array of actions
-      
+
        Use our plugin name for adding an action
        $Args[1]['attachment_common'] = array for href and text
-      
+
        $Args[1]['attachment_common']['text'] = What is displayed
        $Args[1]['attachment_common']['href'] = Where it links to
-      
+
        This sets the 'href' of this plugin for a new link. */
-    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
+    sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
 
-    $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING;
+    $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'], 
+          set_url_var($Args[1]['attachment_common']['href'],
 	  'ent_id',$Args[5]);
-  
+
     /* The link that we created needs a name.  "view" will be displayed for
        all text attachments handled by this plugin. */
     $Args[1]['attachment_common']['text'] = _("view");
@@ -109,7 +116,7 @@ function attachment_common_link_text(&$Args)
        Where that link points to can be changed.  Just in case the link above
        for viewing text attachments is not the same as the default link for
        this file, we'll change it.
-      
+
        This is a lot better in the image links, since the defaultLink will just
        download the image, but the one that we set it to will format the page
        to have an image tag in the center (looking a lot like this text viewer) */
@@ -118,26 +125,26 @@ function attachment_common_link_text(&$Args)
 
 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
        all text attachments handled by this plugin. */
     $Args[1]['attachment_common']['text'] = _("view");
 
-    $Args[6] = $Args[1]['attachment_common']['href'];    
+    $Args[6] = $Args[1]['attachment_common']['href'];
 }
 
 
-function attachment_common_link_html(&$Args) 
+function attachment_common_link_html(&$Args)
 {
-    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
+    sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
 
-    $Args[1]['attachment_common']['href'] = '../src/view_text.php?'. $QUERY_STRING.
+    $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'], 
+          set_url_var($Args[1]['attachment_common']['href'],
 	  'ent_id',$Args[5]);
 
     $Args[1]['attachment_common']['text'] = _("view");
@@ -147,23 +154,23 @@ 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;
 
-    
+    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?'. $QUERY_STRING;
+
+    $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'], 
+          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'];
 
 }
@@ -171,15 +178,15 @@ function attachment_common_link_image(&$Args)
 
 function attachment_common_link_vcard(&$Args)
 {
-    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
+    sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
 
-    $Args[1]['attachment_common']['href'] = '../src/vcard.php?'. $QUERY_STRING;
+    $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'], 
+          set_url_var($Args[1]['attachment_common']['href'],
 	  'ent_id',$Args[5]);
-  
+
     $Args[1]['attachment_common']['text'] = _("Business Card");
-  
+
     $Args[6] = $Args[1]['attachment_common']['href'];
 }
 
@@ -187,23 +194,23 @@ function attachment_common_link_vcard(&$Args)
 function attachment_common_octet_stream(&$Args)
 {
     global $FileExtensionToMimeType;
-   
+
     do_hook('attachment_common-load_mime_types');
-   
+
     ereg('\\.([^\\.]+)$', $Args[7], $Regs);
-  
+
     $Ext = strtolower($Regs[1]);
-   
+
     if ($Ext == '' || ! isset($FileExtensionToMimeType[$Ext]))
-        return;       
-   
-    $Ret = do_hook('attachment ' . $FileExtensionToMimeType[$Ext], 
-        $Args[1], $Args[2], $Args[3], $Args[4], $Args[5], $Args[6], 
+        return;
+
+    $Ret = do_hook('attachment ' . $FileExtensionToMimeType[$Ext],
+        $Args[1], $Args[2], $Args[3], $Args[4], $Args[5], $Args[6],
         $Args[7], $Args[8], $Args[9]);
-       
+
     foreach ($Ret as $a => $b) {
         $Args[$a] = $b;
     }
 }
 
-?>
+?>
\ No newline at end of file