* "time(NULL) mod 60" doesn't work for some reason, so it has been removed.
authorArt Cancro <ajc@citadel.org>
Tue, 1 Feb 2005 02:28:33 +0000 (02:28 +0000)
committerArt Cancro <ajc@citadel.org>
Tue, 1 Feb 2005 02:28:33 +0000 (02:28 +0000)
  When defaulting a new event date/time to now, set the seconds to zero
  manually.

webcit/ChangeLog
webcit/event.c
webcit/iconbar.c

index e565b48c519e3a09e8f57bc737de741d041f8107..fb090845947703bdf753b5ee4e6f16472bea0e63 100644 (file)
@@ -1,4 +1,9 @@
 $Log$
+Revision 528.29  2005/02/01 02:28:32  ajc
+* "time(NULL) mod 60" doesn't work for some reason, so it has been removed.
+  When defaulting a new event date/time to now, set the seconds to zero
+  manually.
+
 Revision 528.28  2005/01/31 23:31:26  ajc
 * Initial attempt at GroupDAV PROPFIND for folder enumeration.  Hardcoded
   to only show the Calendar> room.  It kinda-sorta works with KOrganizer.
@@ -2261,3 +2266,4 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
+
index 444351f5dd29d43b644448bd75405d8e37bf067d..71232d7b761eaf6b8f739c7eb1dcef8ffe6c3547 100644 (file)
@@ -50,7 +50,7 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        int i;
        int sequence = 0;
 
-       now = time(NULL) % 60;          /* mod 60 to force :00 seconds */
+       now = time(NULL);
        strcpy(organizer_string, "");
        strcpy(attendee_string, "");
 
@@ -146,9 +146,12 @@ void display_edit_individual_event(icalcomponent *supplied_vevent, long msgnum)
        }
        else {
                localtime_r(&now, &tm_now);
-               tm_now.tm_year = atoi(bstr("year")) - 1900;
-               tm_now.tm_mon = atoi(bstr("month")) - 1;
-               tm_now.tm_mday = atoi(bstr("day"));
+               lprintf(9, "NOW NOW NOW!!!! %ld\n", now);
+               if (strlen(bstr("year")) > 0) {
+                       tm_now.tm_year = atoi(bstr("year")) - 1900;
+                       tm_now.tm_mon = atoi(bstr("month")) - 1;
+                       tm_now.tm_mday = atoi(bstr("day"));
+               }
                if (strlen(bstr("hour")) > 0) {
                        tm_now.tm_hour = atoi(bstr("hour"));
                        tm_now.tm_min = atoi(bstr("minute"));
index 363a47e798e95ad81749c623f83ca343ff2a0245..5cad259deb797231d49c1370ae8b33c63c1340f3 100644 (file)
@@ -268,11 +268,11 @@ void do_iconbar(void) {
        }
 
        wprintf(
-               "<li>"
+               "<li><div align=\"center\">"
                "<A HREF=\"/display_customize_iconbar\" "
                "TITLE=\"Customize this menu\" "
                ">customize this menu</A>"
-               "</A></li>\n"
+               "</A></div></li>\n"
        );
 
        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(