[SM-CVS] CVS: squirrelmail/functions attachment_common.php,1.7,1.8

[Thijs K. <ki...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/functions
In directory usw-pr-cvs1:/tmp/cvs-serv1644

Modified Files:
	attachment_common.php 
Log Message:
Fixed formatting.


Index: attachment_common.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/functions/attachment_common.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- attachment_common.php	2002/01/18 12:07:21	1.7
+++ attachment_common.php	2002/01/27 18:03:30	1.8
@@ -11,22 +11,6 @@
  * $Id$
  */
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the $attachment_common_show_images_list stuff below. ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
 global $attachment_common_show_images_list;
 $attachment_common_show_images_list = array();
 
@@ -43,10 +27,10 @@
                                    'txt'  => 'text/plain',
                                    'vcf'  => 'text/x-vcard');
 
-  // Register browser-supported image types
+/* Register browser-supported image types */
   if (isset($attachment_common_types)) {
-     // Don't run this before being logged in. That may happen
-     // when plugins include mime.php
+    /* Don't run this before being logged in. That may happen
+       when plugins include mime.php */
      foreach ($attachment_common_types as $val => $v) {
         if ($val == 'image/gif')
            register_attachment_common('image/gif',       'link_image');
@@ -64,18 +48,18 @@
      unset($jpeg_done);
   }
 
-  // Register text-type attachments
+/* Register text-type attachments */
   register_attachment_common('message/rfc822', 'link_text');
   register_attachment_common('text/plain',     'link_text');
   register_attachment_common('text/richtext',  'link_text');
 
-  // Register HTML
+/* Register HTML */
   register_attachment_common('text/html',      'link_html');
 
-  // Register vcards
+/* Register vcards */
   register_attachment_common('text/x-vcard',   'link_vcard');
 
-  // Register "unknown" attachments
+/* Register "unknown" attachments */
   register_attachment_common('application/octet-stream', 'octet_stream');
 
 
@@ -90,39 +74,39 @@
 
 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.
+    /* 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. */
   $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=plain';
   
-  // If we got here from a search, we should preserve these variables
+    /* If we got here from a search, we should preserve these variables */
   if ($Args[8] && $Args[9])
      $Args[1]['attachment_common']['href'] .= '&where=' . 
      urlencode($Args[8]) . '&what=' . urlencode($Args[9]);
 
-  // The link that we created needs a name.  "view" will be displayed for
-  // all text attachments handled by this plugin.
+    /* 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");
   
-  // Each attachment has a filename on the left, which is a link.
-  // 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)
+    /* Each attachment has a filename on the left, which is a link.
+       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) */
   $Args[6] = $Args[1]['attachment_common']['href'];
 }