projects / squirrelmail.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: e237022)
reconstructed the left folder list
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Wed, 8 Dec 1999 20:13:14 +0000 (20:13 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Wed, 8 Dec 1999 20:13:14 +0000 (20:13 +0000)
bugfixed:
  reply and forward work again
  beautified many things

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@71 7612ce4b-ef26-0410-bec9-ea0150e637f0

functions/mailbox.php patch | blob | blame | history
functions/mailbox_display.php patch | blob | blame | history
src/compose.php patch | blob | blame | history
src/compose_send.php patch | blob | blame | history
src/left_main.php patch | blob | blame | history

diff --git a/functions/mailbox.php b/functions/mailbox.php
index b5fa548d97dc81e213b64158b1aed165f6ac38e8..eb7607a27fd6cbda5d46b195181372d7f69bd44b 100644 (file)
--- a/functions/mailbox.php
+++ b/functions/mailbox.php
@@ -11,6 +11,7 @@
       // select mailbox
       fputs($imapConnection, "mailboxSelect SELECT \"$mailbox\"\n");
       $read = fgets($imapConnection, 1024);
+      $unseen = false;
       while ((substr($read, 0, 16) != "mailboxSelect OK") && (substr($read, 0, 17) != "mailboxSelect BAD")) {
          if (substr(Chop($read), -6) == "EXISTS") {
             $array = explode(" ", $read);
@@ -20,6 +21,25 @@
       }
    }
 
+   function unseenMessages($imapConnection, &$numUnseen) {
+      fputs($imapConnection, "1 SEARCH UNSEEN NOT DELETED\n");
+      $read = fgets($imapConnection, 1024);
+      $unseen = false;
+
+      if (strlen($read) > 10) {
+         $unseen = true;
+         $ary = explode(" ", $read);
+         $numUnseen = count($ary) - 2;
+      }
+      else {
+         $unseen = false;
+         $numUnseen = 0;
+      }
+
+      $read = fgets($imapConnection, 1024);
+      return $unseen;
+   }
+
    /**  This function sends a request to the IMAP server for headers, 50 at a time
     **  until $end is reached.  I originally had it do them all at one time, but found
     **  it slightly faster to do it this way.
@@ -183,10 +203,8 @@
    function copyMessages($imapConnection, $from_id, $to_id, $folder) {
       fputs($imapConnection, "mailboxStore COPY $from_id:$to_id \"$folder\"\n");
       $read = fgets($imapConnection, 1024);
-      echo ">>> $read<BR>";
       while ((substr($read, 0, 15) != "mailboxStore OK") && (substr($read, 0, 15) != "mailboxStore NO")) {
          $read = fgets($imapConnection, 1024);
-         echo ">>> $read<BR>";
       }
 
       if (substr($read, 0, 15) == "mailboxStore NO") {
@@ -244,7 +262,7 @@
       while ($count < count($read)) {
          $read[$count] = "^^$read[$count]";
 
-         if (strpos(strtolower($read[$count]), "<html>") == true) {
+         if (strpos(strtolower($read[$count]), "<html") == true) {
             $useHTML = true;
          } else if (strpos(strtolower($read[$count]), "</html>") == true) {
             $useHTML = false;
@@ -277,14 +295,12 @@
          $line = str_replace(">", "&gt;", $line);
       }
 
-      $wrap_at = 80; // Make this configurable int the config file some time
+      $wrap_at = 86; // Make this configurable int the config file some time
       if (strlen($line) - 2 >= $wrap_at) // -2 because of the ^^ at the beginning
          $line = wordWrap($line, $wrap_at);
 
       $line = str_replace(" ", "&nbsp;", $line);
       $line = str_replace("\t", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", $line);
-      $line = str_replace("\n", "", $line);
-      $line = str_replace("\r", "", $line);
 
       /** if >> or > are found at the beginning of a line, I'll assume that was
           replied text, so make it different colors **/
diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 9d40e699dc8a5c2392040ba479544b832ad178d4..9b069dcd1c97a54b14960032d582d8e1c8d857cf 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -11,6 +11,7 @@
    function printMessageInfo($imapConnection, $t, $i, $from, $subject, $dateString, $answered, $seen, $mailbox, $sort, $startMessage) {
       $senderName = getSenderName($from);
       $urlMailbox = urlencode($mailbox);
+      $subject = trim($subject);
       echo "<TR>\n";
       if ($seen == false) {
          echo "   <TD><FONT FACE=\"Arial,Helvetica\"><nobr><B><input type=checkbox name=\"msg[$t]\" value=$i></B></nobr></FONT></TD>\n";
diff --git a/src/compose.php b/src/compose.php
index 4ac944e884675e8ffbf583374c30531876a9eacf..db405d08c10ec41d8ae7898fb0dc93665513aeab 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -29,8 +29,7 @@
    }
 
    echo "<FORM action=\"compose_send.php\" METHOD=POST>\n";
-   echo "<CENTER>";
-   echo "<TABLE COLS=2 WIDTH=100% ALIGN=CENTER>\n";
+   echo "<TABLE COLS=2 WIDTH=100% ALIGN=CENTER CELLSPACING=0>\n";
    echo "   <TR>\n";
    echo "      <TD WIDTH=15% BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
    echo "         <FONT FACE=\"Arial,Helvetica\">To: </FONT>\n";
@@ -55,6 +54,7 @@
    echo "         <INPUT TYPE=TEXT NAME=passed_bcc SIZE=60><BR>";
    echo "      </TD>\n";
    echo "   </TR>\n";
+
    echo "   <TR>\n";
    echo "      <TD WIDTH=15% BGCOLOR=FFFFFF ALIGN=RIGHT>\n";
    echo "         <FONT FACE=\"Arial,Helvetica\">Subject:</FONT>\n";
@@ -64,13 +64,18 @@
    else if ($forward_subj)
       echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"[Fwd: $forward_subj]\"><BR>";
    else
-      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60><BR>";
+      echo "         <INPUT TYPE=TEXT NAME=passed_subject SIZE=60>";
+   echo "&nbsp;&nbsp;<INPUT TYPE=SUBMIT VALUE=\"Send\"><BR>";
    echo "      </TD>\n";
    echo "   </TR>\n";
+   echo "   <TR>\n";
+   echo "      <TD BGCOLOR=FFFFFF ALIGN=RIGHT VALIGN=TOP>\n";
+   echo "      </TD>";
+   echo "      <TD BGCOLOR=FFFFFF>\n";
+   echo "         <TEXTAREA NAME=passed_body ROWS=20 COLS=76 WRAP=HARD>$body</TEXTAREA><BR>";
+   echo "      </TD>";
+   echo "   </TR>\n";
    echo "</TABLE>\n";
-
-   echo "<TEXTAREA NAME=passed_body ROWS=20 COLS=76 WRAP=HARD>$body</TEXTAREA><BR>";
-   echo "<INPUT TYPE=SUBMIT VALUE=\"Send\">";
-   echo "</CENTER>";
+   echo "<CENTER><INPUT TYPE=SUBMIT VALUE=\"Send\"></CENTER>";
    echo "</FORM>";
 ?>
\ No newline at end of file
diff --git a/src/compose_send.php b/src/compose_send.php
index b5057d665d0b80414ecf7fa5fe599234649cf350..016ef3c740ce740705776d241481fdfc6ad5032a 100644 (file)
--- a/src/compose_send.php
+++ b/src/compose_send.php
@@ -32,6 +32,7 @@
       displayPageHeader("None");
       plain_error_message("You have not entered a subject.");
       echo "<FORM action=\"compose_send.php\" METHOD=POST>\n";
+      echo "<INPUT TYPE=HIDDEN VALUE=\"$passed_to\" NAME=passed_to><BR>";
       echo "<INPUT TYPE=HIDDEN VALUE=\"$passed_cc\" NAME=passed_cc><BR>";
       echo "<INPUT TYPE=HIDDEN VALUE=\"$passed_bcc\" NAME=passed_bcc><BR>";
       echo "<CENTER><FONT FACE=\"Arial,Helvetica\">Subject: </FONT><INPUT TYPE=TEXT NAME=passed_subject SIZE=60 VALUE=\"(no subject)\"><BR>";
diff --git a/src/left_main.php b/src/left_main.php
index 2c13f745d6624b3be25b35e4dcb757cd65710a02..3b2929e230e602deb6bcc1a5fb54961bd8cd09ec 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -31,7 +31,7 @@
       }
    </SCRIPT>
 </HEAD>
-<BODY BGCOLOR=A0B8C8 TEXT="#0000EE" LINK="#0000EE" VLINK="#0000EE" ALINK="#0000EE" onUnLoad="unSetCookies()">
+<BODY BGCOLOR=A0B8C8 TEXT="#000000" LINK="#000000" VLINK="#000000" ALINK="#000000" onUnLoad="unSetCookies()">
 <FONT FACE="Arial,Helvetica">
 <?
    include("../config/config.php");
@@ -45,11 +45,10 @@
    fputs($imapConnection, "1 list \"\" *\n");
    $str = imapReadData($imapConnection);
 
-   echo "<FONT FACE=\"Arial,Helvetica\" COLOR=000000><B>";
-   echo "<CENTER>$org_name</B><BR>";
-   echo "Folders</CENTER>";
-   echo "</B><BR></FONT>";
-   echo "<code><FONT FACE=\"Arial,Helvetica\">\n";
+   echo "<FONT FACE=\"Arial,Helvetica\" COLOR=000000 SIZE=4><B><CENTER>";
+   echo "Folders</B><BR></FONT>";
+   echo "<FONT FACE=\"Arial,Helvetica\" COLOR=000000 SIZE=2>(<A HREF=\"../src/left_main.php\" TARGET=left>refresh folder list</A>)</FONT></CENTER><BR>";
+   echo "<FONT FACE=\"Arial,Helvetica\">\n";
    for ($i = 0;$i < count($str); $i++) {
       $mailbox = Chop($str[$i]);
       $mailbox = findMailboxName($mailbox);
@@ -63,16 +62,23 @@
          echo "&nbsp;&nbsp;";
       
       $mailboxURL = urlencode($mailbox);
+      selectMailbox($imapConnection, $mailbox, $numNessages);
+      $unseen = unseenMessages($imapConnection, $numUnseen);
+      if ($unseen)
+         echo "<B>";
       echo "<a href=\"right_main.php?sort=0&startMessage=1&mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\"><FONT FACE=\"Arial,Helvetica\">";
       echo readShortMailboxName($mailbox, ".");
       if (($move_to_trash == true) && ($mailbox == $trash_folder)) {
          $urlMailbox = urlencode($mailbox);
-         selectMailbox($imapConnection, $mailbox, $numNessages);
          echo "</A>&nbsp;&nbsp;&nbsp;&nbsp;(<B><A HREF=\"empty_trash.php?numMessages=$numMessages&mailbox=$urlMailbox\" TARGET=right style=\"text-decoration:none\">empty</A></B>)";
       }
-      echo "</FONT></a><br>\n";
+      echo "</FONT></a>\n";
+      if ($numUnseen > 0) {
+         echo "</B>&nbsp;</FONT><FONT FACE=\"Arial,Helvetica\" SIZE=2>($numUnseen)</FONT>";
+      }
+      echo "<BR>\n";
    }
-   echo "</code></FONT>";
+   echo "</FONT>";
 
    fclose($imapConnection);
                                   
Unnamed repository; edit this file 'description' to name the repository.