From: lkehresman Date: Tue, 10 Oct 2000 00:59:05 +0000 (+0000) Subject: - improved date parsing X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fde32e3fc4afc7038da1ccfc9bea91be85efdb17;p=squirrelmail.git - 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 6adba351..aa5bc575 100644 --- 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 diff --git a/functions/date.php b/functions/date.php index 695f6136..6dfc4ba1 100644 --- 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 3d6c8f0b..9f147d2d 100755 --- 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 77b3c526..e23eff6a 100644 --- a/functions/mailbox_display.php +++ b/functions/mailbox_display.php @@ -71,6 +71,7 @@ else echo "  \n"; break; case 6: # size + echo " $bold".$msg["SIZE"]."k$bold_end\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 "  \n"; break; case 6: # size - echo " Size\n"; + echo " " . _("Size")."\n"; break; } } diff --git a/functions/mime.php b/functions/mime.php index 82f239e9..652b5b90 100644 --- 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 .= '  '; - $body .= "$display_filename "; - $body .= "($type0/$type1) "; - $body .= ''; + $body .= '  '; + $body .= "$display_filename "; + $size = $message->header->size / 1024; + settype($size, "integer"); + $body .= "" . $size . "k  "; + $body .= "[ $type0/$type1 ] "; + $body .= ''; if ($message->header->description) $body .= '' . htmlspecialchars($message->header->description) . ''; - $body .= ' '; + $body .= ' '; $SkipSpaces = 1; @@ -544,15 +547,14 @@ } else { - $body .= '  '; + $body .= '  |  '; } - $body .= '(' . - $Val['text'] . ')'; + $body .= '' . $Val['text'] . ''; } unset($Links); - $body .= "\n"; + $body .= "\n"; } return $body; } else {