Moving HTML out of strings and updating some tags to XHTML

[squirrelmail.git] / functions / attachment_common.php

diff --git a/functions/attachment_common.php b/functions/attachment_common.php
index 4033468b3e1c4ee261055bcb67c0bb9cbd3fddef..3f415a217953a7b9cde471d161a3b32d7534ddb0 100644 (file)
--- 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$
+ * @package squirrelmail
  */
 
+/**
+ * Needs documentation
+ */
+require_once(SM_PATH . 'functions/global.php');
+
 global $attachment_common_show_images_list;
 $attachment_common_show_images_list = array();
 
@@ -27,8 +33,8 @@ $FileExtensionToMimeType = array('bmp'  => 'image/x-bitmap',
                                  'txt'  => 'text/plain',
                                  '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 */
@@ -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. */
@@ -94,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. */
-    $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'], 
          'ent_id',$Args[5]);
@@ -118,7 +125,7 @@ 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
@@ -131,9 +138,9 @@ function attachment_common_link_message(&$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'] =
@@ -147,17 +154,17 @@ 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'], 
          'ent_id',$Args[5]);
@@ -171,9 +178,9 @@ function attachment_common_link_image(&$Args)
 
 function attachment_common_link_vcard(&$Args)
 {
-    $QUERY_STRING = $_SERVER['QUERY_STRING'];;   
-
-    $Args[1]['attachment_common']['href'] = '../src/vcard.php?'. $QUERY_STRING;
+    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]);