From 78509c544d86d8e4260ec93faed8d2a17362082b Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 5 Jan 2000 21:12:57 +0000
Subject: [PATCH] just cleaning up some stuff

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@105 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 AUTHORS               |   3 ++-
 ChangeLog             |   9 +++++++
 INSTALL               |   7 +----
 README                |   9 +++++--
 config/config.php     |   2 +-
 functions/mime.php    |   6 ++++-
 functions/smtp.php    |   2 ++
 functions/strings.php |   7 ++++-
 images/logo.gif       | Bin 5000 -> 0 bytes
 images/sm_logo.jpg    | Bin 0 -> 7448 bytes
 src/compose.php       |  60 ++++++++++++++++++++++++++++++++++++------
 src/compose_send.php  |   2 +-
 src/download.php      |   8 +++---
 src/login.php         |   2 +-
 14 files changed, 91 insertions(+), 26 deletions(-)
 delete mode 100644 images/logo.gif
 create mode 100644 images/sm_logo.jpg

diff --git a/AUTHORS b/AUTHORS
index 1ebe0685..82ab26ad 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,3 @@
-Nathan Ehresman
 Luke Ehresman
+Nathan Ehresman
+Sergiusz Pawlowicz
diff --git a/ChangeLog b/ChangeLog
index 739ed346..653a3142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Version 0.2.1 -- January 05, 2000
+---------------------------------
+- Rewrote how MULTIPART messages were handled and made it recursive
+- We now take into account the encoding type rather than guessing
+- Redesigned how attachments are displayed
+- Fixed the bug that wouldn't let you send messages (I hope)
+- Added a "download message" option
+- Added a plain text viewer for text messages
+
 Version 0.2 -- January 02, 2000
 -------------------------------
 - Attachment support (much better MIME support in general)
diff --git a/INSTALL b/INSTALL
index 72f3eae7..a10c4866 100644
--- a/INSTALL
+++ b/INSTALL
@@ -8,10 +8,5 @@ overview of how to install SquirrelMail.
 
 3.  Edit the config file, config/config.php
 
-4.  Change permissions of the "data/" directory so that the web server
-    can write to it.  Here is an example from Red Hat 6.0:
-       cd <SQUIRREMAIL DIRECTORY>
-       chown nobody data
-
-5.  Point your browser to the location you specified in step 2.
+4.  Point your browser to the location you specified in step 2.
     In this example, it's:  http://YOURHOST/squirrelmail-0.1/index.html
diff --git a/README b/README
index 5a21458a..853f64b5 100644
--- a/README
+++ b/README
@@ -15,7 +15,7 @@ FAQ ................................................................. 4.0
   Can SquirrelMail run with PHP3? ................................... 4.1
   Why PHP4 when it's only in BETA? .................................. 4.2
   Where did you get the name "SquirrelMail?" ........................ 4.3
-
+  Is SquirrelMail stable enough to actually use? .................... 4.4
 
 
 
@@ -108,4 +108,9 @@ FAQ ................................................................. 4.0
       this year. We were playing volleyball one day, and saw a squirrel
       try to jump between trees. He failed miserably and fell 40 feet to
       the ground. So, we had squirrels on our mind the next day when we
-      were coming up with a name.
\ No newline at end of file
+      were coming up with a name.
+      
+   Q: Is SquirrelMail stable enough to actually use?
+      SquirrelMail is stable, however, many of the features that are 
+      usually desired from an email client have not yet been implemented.
+
diff --git a/config/config.php b/config/config.php
index 28314a52..f90446d9 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,6 +1,6 @@
 <?
 //  Organization's logo picture (blank if none)
-    $org_logo = "../images/logo.gif";
+    $org_logo = "../images/sm_logo.jpg";
 
 //  Organization's name
     $org_name = "SquirrelMail";
diff --git a/functions/mime.php b/functions/mime.php
index 068c754a..f81d08f0 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -62,7 +62,7 @@
          /** If this isn't a multipart message **/
          $j = 0;
          $entity_body = "";
-         while ((substr(trim($body[$j]), 0, strlen("--$bound")) != "--$bound") && ($j < count($body))) {
+         while ($j < count($body)) {
             $entity_body .= $body[$j];
             $j++;
          }
@@ -144,6 +144,10 @@
          }
       }
 
+      /** If there are other types that shouldn't be formatted, add them here **/
+      if ($message["ENTITIES"][$ent_num]["TYPE1"] != "html")
+         $body = translateText($body);
+
       $body .= "<BR><SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox\">Download this as a file</A></CENTER><BR></SMALL>";
 
       /** Display the ATTACHMENTS: message if there's more than one part **/
diff --git a/functions/smtp.php b/functions/smtp.php
index 2274bc10..9d985d15 100644
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -75,5 +75,7 @@
       fputs($smtpConnection, ".\n"); // end the DATA part
       fputs($smtpConnection, "QUIT\n"); // log off
       echo "</FONT>";
+
+      fclose($smtpConnection);
    }
 ?>
\ No newline at end of file
diff --git a/functions/strings.php b/functions/strings.php
index dce7f1ae..5afc65f5 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -80,6 +80,11 @@
       return $to_line;
    }
 
+   function translateText($body) {
+      $body = ereg_replace(" ", "&nbsp;", $body);
+      return $body;
+   }
+
    /* SquirrelMail version number -- DO NOT CHANGE */
-   $version = "0.2";
+   $version = "0.2.1";
 ?>
diff --git a/images/logo.gif b/images/logo.gif
deleted file mode 100644
index 15f1c63bf7e36e2814037261c6472078163d7503..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5000
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

diff --git a/images/sm_logo.jpg b/images/sm_logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e0e400a7cdba829f18814443d8b8912973b23438
GIT binary patch
literal 7448
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

literal 0
HcmV?d00001

diff --git a/src/compose.php b/src/compose.php
index 41db1b7c..1f26644b 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -16,12 +16,34 @@
       selectMailbox($imapConnection, $mailbox, $numMessages);
       $msg = fetchMessage($imapConnection, $forward_id, $mailbox);
 
-      $body_ary = formatBody($msg);
+      if (containsType($msg, "text", "html", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+      } else if (containsType($msg, "text", "plain", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+      }
+      // add other primary displaying msg types here
+      else {
+         // find any type that's displayable
+         if (containsType($msg, "text", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+         } else if (containsType($msg, "msg", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"]);
+         } else {
+            $body = "No Message";
+         }
+      }
+
+      $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
+
       $tmp = "-------- Original Message ---------\n";
+      $body_ary = explode("\n", $body);
+      $body = "";
       for ($i=0;$i < count($body_ary);$i++) {
-         $tmp .= strip_tags($body_ary[$i]);
-         $tmp = substr($tmp, 0, strlen($tmp) -1);
-         $body = "$body$tmp";
+         if ($type1 == "html")
+            $tmp .= strip_tags($body_ary[$i]);
+         else
+            $tmp .= $body_ary[$i];
+         $body = "$body$tmp\n";
          $tmp = "";
       }
    }
@@ -30,11 +52,33 @@
       selectMailbox($imapConnection, $mailbox, $numMessages);
       $msg = fetchMessage($imapConnection, $reply_id, $mailbox);
 
-      $body_ary = formatBody($msg);
+      if (containsType($msg, "text", "html", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+      } else if (containsType($msg, "text", "plain", $ent_num)) {
+         $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+      }
+      // add other primary displaying msg types here
+      else {
+         // find any type that's displayable
+         if (containsType($msg, "text", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+         } else if (containsType($msg, "msg", "any_type", $ent_num)) {
+            $body = decodeBody($msg["ENTITIES"][$ent_num]["BODY"], $msg["ENTITIES"][$ent_num]["ENCODING"], false);
+         } else {
+            $body = "No Message";
+         }
+      }
+
+      $type1 = $msg["ENTITIES"][$ent_num]["TYPE1"];
+
+      $body_ary = explode("\n", $body);
+      $body = "";
       for ($i=0;$i < count($body_ary);$i++) {
-         $tmp = strip_tags($body_ary[$i]);
-         $tmp = substr($tmp, 0, strlen($tmp) -1);
-         $body = "$body> $tmp";
+         if ($type1 == "html")
+            $tmp = strip_tags($body_ary[$i]);
+         else
+            $tmp = $body_ary[$i];
+         $body = "$body> $tmp\n";
       }
    }
 
diff --git a/src/compose_send.php b/src/compose_send.php
index a0cdabde..9bbc254b 100644
--- a/src/compose_send.php
+++ b/src/compose_send.php
@@ -45,7 +45,7 @@
 
    sendMessage($smtpServerAddress, $smtpPort, $username, $domain, $passed_to, $passed_cc, $passed_bcc, $passed_subject, $passed_body, $version);
 
-   if ($auto_forwarding == true)
+   if ($auto_forward == true)
       echo "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"0;URL=right_main.php\">";
    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
 
diff --git a/src/download.php b/src/download.php
index 56c57335..094dc04e 100644
--- a/src/download.php
+++ b/src/download.php
@@ -15,7 +15,7 @@
       echo "<B><CENTER>Viewing a plain text attachment</CENTER></B>";
       echo "</TD></TR><TR><TD BGCOLOR=\"$color[4]\">";
       $urlmailbox = urlencode($mailbox);
-      echo "<FONT FACE=\"Arial, Helvetica\"><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">Download this as a file</A><BR><BR></FONT><TT>";
+      echo "<FONT FACE=\"Arial, Helvetica\"><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">Download this as a file</A></CENTER><BR><BR></FONT><TT>";
       echo nl2br($body);
       echo "</TT></TD></TR></TABLE>";
    }
@@ -39,13 +39,13 @@
       switch($type0) {
          case "text":
             $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            header("Content-type: $type0/$type1");
+            header("Content-type: $type0/$type1; name=\"$filename\"");
             header("Content-Disposition: attachment; filename=\"$filename\"");
             echo $body;
             break;
          default:
             $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            header("Content-type: $type0/$type1");
+            header("Content-type: $type0/$type1; name=\"$filename\"");
             header("Content-Disposition: attachment; filename=\"$filename\"");
             echo $body;
             break;
@@ -62,7 +62,7 @@
             break;
          default:
             $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            header("Content-type: $type0/$type1");
+            header("Content-type: $type0/$type1; name=\"$filename\"");
             header("Content-Disposition: attachment; filename=\"$filename\"");
             echo $body;
             break;
diff --git a/src/login.php b/src/login.php
index 714c1445..7e0b4983 100644
--- a/src/login.php
+++ b/src/login.php
@@ -18,7 +18,7 @@
    echo "<BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    echo "<FORM ACTION=webmail.php METHOD=\"POST\" NAME=f>\n";
    echo "<CENTER><IMG SRC=\"$org_logo\"</CENTER>\n";
-   echo "<CENTER><FONT FACE=\"Arial,Helvetica\" SIZE=-2>SquirrelMail version $version<BR>By Nathan and Luke Ehresman<BR></FONT><CENTER>\n";
+   echo "<CENTER><FONT FACE=\"Arial,Helvetica\" SIZE=-2>SquirrelMail version $version<BR>By the SquirrelMail Development Team<BR></FONT><CENTER>\n";
    echo "<TABLE COLS=1 WIDTH=350>\n";
    echo "   <TR>\n";
    echo "      <TD BGCOLOR=\"$color[0]\">\n";
-- 
2.25.1