- improved date parsing

- added file sizes in a number of places

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

diff --git a/ChangeLog b/ChangeLog
index 6adba3514697a812de9a6e2a175a60e26106382d..aa5bc57581dd80e0619e591d13be2516704c4298 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Version 0.6pre1 -- DEVELOPMENT
 ------------------------------
+- Updated attachment viewing, added plugin support (see plugins.txt)
+- Added file and message size in many locations
 - Made message index order customizable (from, subject, date) can be (date, from, subject)
 - Fixed some security problems with uploading attachments
 - Added Catalan translation from Josep Sanz <jsanz@fa.upc.es>

diff --git a/functions/date.php b/functions/date.php
index 695f61367ac1ca9c9652240cdfcb5d5cd1934ae7..6dfc4ba1b7c4af1a1f524f842d5ec8e0abf948e4 100644 (file)
--- a/functions/date.php
+++ b/functions/date.php
@@ -11,33 +11,6 @@
 
    $date_php = true;
 
-   function getMinutes($hour) {
-      $date = $hour;
-
-      if (($hour == 0) || ($hour == "00"))
-         $date = "00";
-      else if (($hour == 1) || ($hour == "01"))
-         $date = "01";
-      else if (($hour == 2) || ($hour == "02"))
-         $date = "02";
-      else if (($hour == 3) || ($hour == "03"))
-         $date = "03";
-      else if (($hour == 4) || ($hour == "04"))
-         $date = "04";
-      else if (($hour == 5) || ($hour == "05"))
-         $date = "05";
-      else if (($hour == 6) || ($hour == "06"))
-         $date = "06";
-      else if (($hour == 7) || ($hour == "07"))
-         $date = "07";
-      else if (($hour == 8) || ($hour == "08"))
-         $date = "08";
-      else if (($hour == 9) || ($hour == "09"))
-         $date = "09";
-
-      return $date;
-   }
-
    // corrects a time stamp to be the local time
    function getGMTSeconds($stamp, $gmt) {
       if (($gmt == "Pacific") || ($gmt == "PST"))
@@ -90,116 +63,13 @@
       return $stamp;
    }
 
-   function getHour($hour) {
-      $time = explode(":", $hour);
-      return $time[0];
-   }
-
-   function getMinute($min) {
-      $time = explode(":", $min);
-      return $time[1];
-   }
-
-   function getSecond($sec) {
-      $time = explode(":", $sec);
-      return $time[2];
-   }
-
-   function getMonthNum($month) {
-      if (eregi("jan|january", $month, $tmp))
-         $date = "01";
-      else if (eregi("feb|february|febuary", $month, $tmp))
-         $date = "02";
-      else if (eregi("mar|march", $month, $tmp))
-         $date = "03";
-      else if (eregi("apr|april", $month, $tmp))
-         $date = "04";
-      else if (eregi("may", $month, $tmp))
-         $date = "05";
-      else if (eregi("jun|june", $month, $tmp))
-         $date = "06";
-      else if (eregi("jul|july", $month, $tmp))
-         $date = "07";
-      else if (eregi("aug|august", $month, $tmp))
-         $date = "08";
-      else if (eregi("sep|sept|september", $month, $tmp))
-         $date = "09";
-      else if (eregi("oct|october", $month, $tmp))
-         $date = "10";
-      else if (eregi("nov|november", $month, $tmp))
-         $date = "11";
-      else if (eregi("dec|december", $month, $tmp))
-         $date = "12";
-
-      return $date;
-   }
-
-   function getDayOfWeek($day) {
-      $date = "{WEEKDAY}";
-
-      if (eregi("(mon|monday)", $day, $tmp))
-         $date = "Mon";
-      else if (eregi("(tue|tuesday)", $day, $tmp))
-         $date = "Tue";
-      else if (eregi("(wed|wednesday)", $day, $tmp))
-         $date = "Wed";
-      else if (eregi("(thurs|thu|thursday)", $day, $tmp))
-         $date = "Thu";
-      else if (eregi("(fri|friday)", $day, $tmp))
-         $date = "Fri";
-      else if (eregi("(sat|saturday)", $day, $tmp))
-         $date = "Sat";
-      else if (eregi("(sun|sunday)", $day, $tmp))
-         $date = "Sun";
-
-      return $date;
-   }
-
-   function getDayOfMonth($day) {
-      return ereg_replace("^0", "", $day); /* remove a preceeding 0 */
-   }
-
-   function getMonth($month) {
-      $date = "{MONTH}";
-      if (eregi("jan|january", $month, $tmp))
-         $date = "Jan";
-      else if (eregi("feb|february|febuary", $month, $tmp))
-         $date = "Feb";
-      else if (eregi("mar|march", $month, $tmp))
-         $date = "Mar";
-      else if (eregi("apr|april", $month, $tmp))
-         $date = "Apr";
-      else if (eregi("may", $month, $tmp))
-         $date = "May";
-      else if (eregi("jun|june", $month, $tmp))
-         $date = "Jun";
-      else if (eregi("jul|july", $month, $tmp))
-         $date = "Jul";
-      else if (eregi("aug|august", $month, $tmp))
-         $date = "Aug";
-      else if (eregi("sep|sept|september", $month, $tmp))
-         $date = "Sep";
-      else if (eregi("oct|october", $month, $tmp))
-         $date = "Oct";
-      else if (eregi("nov|november", $month, $tmp))
-         $date = "Nov";
-      else if (eregi("dec|december", $month, $tmp))
-         $date = "Dec";
-
-      return $date;
-   }
-
-   function getYear($year) {
-      return $year;
-   }
-
    function getLongDateString($stamp) {
       return date("D, F j, Y g:i a", $stamp);
    }
 
    function getDateString($stamp) {
       $now = time();
-      $midnight = $now - ($now % 86400) - date("Z", $now);
+      $midnight = $now - ($now % 86400) - 86400 - date("Z", $now);
 
       if ($midnight < $stamp) {
          // Today
@@ -242,23 +112,11 @@
       //    getHour, getMinute, and getSecond.
       //
       if (intval(trim($dateParts[0])) > 0) {
-         $time = explode(":", $dateParts[3]);
-         $d[0] = $time[0];
-         $d[1] = $time[1];
-         $d[2] = $time[2];
-         $d[3] = getMonthNum(trim($dateParts[1]));
-         $d[4] = getDayOfMonth(trim($dateParts[0]));
-         $d[5] = getYear(trim($dateParts[2]));
-         return getGMTSeconds(mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]), $dateParts[4]);
+         $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3];
+         return getGMTSeconds(strtotime($string), $dateParts[4]);
       }
-      $time = explode(":", $dateParts[4]);
-      $d[0] = $time[0];
-      $d[1] = $time[1];
-      $d[2] = $time[2];
-      $d[3] = getMonthNum(trim($dateParts[2]));
-      $d[4] = getDayOfMonth(trim($dateParts[1]));
-      $d[5] = getYear(trim($dateParts[3]));
-      return getGMTSeconds(mktime($d[0], $d[1], $d[2], $d[3], $d[4], $d[5]), $dateParts[5]);
+      $string = $dateParts[0] . " " . $dateParts[1] . " " . $dateParts[2] . " " . $dateParts[3] . " " . $dateParts[4];
+      return getGMTSeconds(strtotime($string), $dateParts[5]);
    }
 
    // I use this function for profiling. Should never be called in

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 3d6c8f0bb97122f4de742dabf163a80c2a6afe17..9f147d2d233bd9a28b1e32134365b0afd57a9ff7 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -92,6 +92,12 @@
          $date = implode (" ", $date_ary);
       }
 
+      fputs ($imap_stream, "a003 FETCH $id RFC822.SIZE\r\n");
+      $read = sqimap_read_data($imap_stream, "a003", true, $r, $m);
+      preg_match("/([0-9]+)\)\s*$/i", $read[0], $regs);
+      $size = $regs[1] / 1024;
+      settype($size, "integer");
+      
       $header = new small_header;
       if ($sent == true)
          $header->from = $to;
@@ -104,6 +110,7 @@
       $header->priority = $priority;
       $header->message_id = $messageid;
       $header->cc = $cc;
+      $header->size = $size;
 
       return $header;
    }
@@ -179,6 +186,9 @@
       $hdr->type1 = "plain";
       $hdr->charset = "us-ascii";
 
+      preg_match("/\{([0-9]+)\}/", $read[$i], $regs);
+      preg_match("/[0-9]+/", $regs[0], $regs);
+
       while ($i < count($read)) {
          if (substr($read[$i], 0, 17) == "MIME-Version: 1.0") {
             $hdr->mime = true;

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 77b3c526957d81b871cbebb8ed0fe6f831d96f4e..e23eff6a52e1e70c5801a544464f4a8ff4f0fc39 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -71,6 +71,7 @@
                else    echo "   <td bgcolor=$hlt_color width=1%>&nbsp;</td>\n";
                break;
             case 6: # size   
+               echo "   <td bgcolor=$hlt_color width=1%>$bold".$msg["SIZE"]."k$bold_end</td>\n";
                break;
          }
       }
@@ -107,6 +108,7 @@
                $to[$q] = $hdr->to;
                $priority[$q] = $hdr->priority;
                $cc[$q] = $hdr->cc;
+               $size[$q] = $hdr->size;
 
                $flags[$q] = sqimap_get_flags ($imapConnection, $q+1);
             }
@@ -127,6 +129,7 @@
             $messages[$j]["TO"] = decodeHeader($to[$j]);
                                $messages[$j]["PRIORITY"] = $priority[$j];
             $messages[$j]["CC"] = $cc[$j];
+            $messages[$j]["SIZE"] = $size[$j];
 
             # fix SUBJECT-SORT to remove Re:
             if (substr($messages[$j]["SUBJECT-SORT"], 0, 3) == "re:" ||
@@ -327,7 +330,7 @@
                echo "   <TD WIDTH=1%>&nbsp;</TD>\n";
                break;
             case 6: # size   
-               echo "   <TD WIDTH=1%>Size</TD>\n";
+               echo "   <TD WIDTH=1%><b>" . _("Size")."</b></TD>\n";
                break;
          }
       }

diff --git a/functions/mime.php b/functions/mime.php
index 82f239e98390fc26ea922e7c38c102a0a3dee668..652b5b90366868b195691422c91b3572c6af77a9 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -23,7 +23,7 @@
       /** msg_header contains generic variables for values that **/
       /** could be in a header.                                 **/
       
-      var $type0, $type1, $boundary, $charset, $encoding;
+      var $type0, $type1, $boundary, $charset, $encoding, $size;
       var $to, $from, $date, $cc, $bcc, $reply_to, $subject;
       var $id, $mailbox, $description;
       var $entity_id, $message_id, $charset;
@@ -526,13 +526,16 @@
                $Links = $HookResults[1];
                $DefaultLink = $HookResults[6];
 
-               $body .= '<TR><TD>&nbsp;&nbsp;</TD><TD><FONT SIZE="-1">';
-               $body .= "<A HREF=\"$DefaultLink\">$display_filename</A>&nbsp;</FONT></TD>";
-               $body .= "<TD><FONT SIZE=\"-1\">($type0/$type1)&nbsp;</FONT></TD>";
-               $body .= '<TD><FONT SIZE="-1">';
+               $body .= '<TR><TD>&nbsp;&nbsp;</TD><TD>';
+               $body .= "<A HREF=\"$DefaultLink\">$display_filename</A>&nbsp;</TD>";
+               $size = $message->header->size / 1024;
+               settype($size, "integer");
+               $body .= "<TD><SMALL><b>" . $size . "k</b>&nbsp;&nbsp;</small></TD>";
+               $body .= "<TD><SMALL>[ $type0/$type1 ]&nbsp;</SMALL></TD>";
+               $body .= '<TD><SMALL>';
                if ($message->header->description)
                   $body .= '<b>' . htmlspecialchars($message->header->description) . '</b>';
-               $body .= '</FONT></TD><TD><FONT SIZE="-1">&nbsp;';
+               $body .= '</SMALL></TD><TD><SMALL>&nbsp;';
                
                
                $SkipSpaces = 1;
@@ -544,15 +547,14 @@
                   }
                   else
                   {
-                     $body .= '&nbsp;&nbsp;';
+                     $body .= '&nbsp;&nbsp;|&nbsp;&nbsp;';
                   }
-                  $body .= '(<a href="' . $Val['href'] . '">' . 
-                     $Val['text'] . '</a>)';
+                  $body .= '<a href="' . $Val['href'] . '">' .  $Val['text'] . '</a>';
                }
                
                unset($Links);
                
-               $body .= "</FONT></TD></TR>\n";
+               $body .= "</SMALL></TD></TR>\n";
             }
             return $body;
          } else {