From 069b4374494c35d8c68a8710841ed5180f1a8ba3 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 28 Jul 2000 09:54:12 +0000
Subject: [PATCH] fixed some bugs in date sorting.. It is now timezone
 independent

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@645 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog              |  1 +
 config/july4_theme.php | 31 -------------------------------
 functions/date.php     |  4 ++--
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 config/july4_theme.php

diff --git a/ChangeLog b/ChangeLog
index 9f6e2404..8bf55c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 0.5pre1 -- DEVELOPMENT
 ------------------------------
+- Searching folders functionality added 
 - Date display now is similar to Netscape Messenger
 - Many bugs have been reported to the list, and been squashed
 - Help system developed 
diff --git a/config/july4_theme.php b/config/july4_theme.php
deleted file mode 100644
index 33da0e47..00000000
--- a/config/july4_theme.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-   /** Author:       Luke Ehresman
-       Date:         January 2, 2000
-       Theme Name:   "July Fourth Theme"
-
-       This is the default theme that comes standard with SquirrelMail.
-       Most of the colors were taken from mail.yahoo.com's theme on their
-       site.
-
-       To create a new theme, just copy this file, and edit the colors.
-       Be sure to rename the file and keep the original, just in case.
-
-       NOTE:
-       Please email any themes you create to luke@usa.om.org for inclusion
-       in further releases of SquirrelMail and for download from the web
-       page.
-    **/
-
-    $color[0]   = "#6495ED"; // (cornflower blue)TitleBar
-    $color[1]   = "#800000"; // (red)
-    $color[2]   = "#8B0000"; // (dark red)       Warning/Error Messages
-    $color[3]   = "#FF0000"; // (bright red)     Left Bar Background
-    $color[4]   = "#FFFFFF"; // (white)          Normal Background
-    $color[5]   = "#FFFFCC"; // (light yellow)   Table Headers
-    $color[6]   = "#0000FF"; // (blue)           Text on left bar
-    $color[7]   = "#1E90FF"; // (blue)           Links
-    $color[8]   = "#000000"; // (black)          Normal text
-    $color[9]   = "#00008B"; // (blue)       	 
-    $color[10]  = "#0000FF"; // (blue ??)      
-    $color[11]  = "#FFFF00"; // (yellow)         Special Folders color
-?>
diff --git a/functions/date.php b/functions/date.php
index 9d153baf..bdc0ad58 100644
--- a/functions/date.php
+++ b/functions/date.php
@@ -200,12 +200,12 @@
 
    function getDateString($stamp) {
       $now = time();
-      $midnight = $now - ($now % 86400) + 14400;
+      $midnight = $now - ($now % 86400) - date("Z", $now);
 
       if ($midnight < $stamp) {
          // Today
          return date("g:i a", $stamp);
-      } else if ($midnight - 604800 < $stamp) {
+      } else if ($midnight - (60 * 60 * 24 * 6) < $stamp) {
          // This week
          return date("D, g:i a", $stamp);
       } else {
-- 
2.25.1