* Created IsEmptyStr define to be used rather then using some weird strlen constructs

[citadel.git] / webcit / calendar_view.c

diff --git a/webcit/calendar_view.c b/webcit/calendar_view.c
index a783a45bd14533b5f149abb6066d3415d4ea7805..54ebc2be1432340600fb1202575a3e69da6bdeb1 100644 (file)
--- a/webcit/calendar_view.c
+++ b/webcit/calendar_view.c
@@ -139,18 +139,23 @@ void calendar_month_view_display_events(time_t thetime) {
                                                                fmt_date(buf, tt, 1);
                                                                wprintf("<i>%s</i> %s<br>",
                                                                        _("Starting date/time:"), buf);
+
+                                                               /* Embed the 'show end date/time' loop inside here so it
+                                                                * only executes if this is NOT an all day event.
+                                                                */
+                                                               q = icalcomponent_get_first_property(WC->disp_cal[i].cal,
+                                                                                                       ICAL_DTEND_PROPERTY);
+                                                               if (q != NULL) {
+                                                                       t = icalproperty_get_dtend(q);
+                                                                       tt = icaltime_as_timet(t);
+                                                                       fmt_date(buf, tt, 1);
+                                                                       wprintf("<i>%s</i> %s<br>",
+                                                                               _("Ending date/time:"), buf);
+                                                               }
+
                                                        }
                                                }
                                        
-                                               q = icalcomponent_get_first_property(WC->disp_cal[i].cal,
-                                                                                       ICAL_DTEND_PROPERTY);
-                                               if (q != NULL) {
-                                                       t = icalproperty_get_dtend(q);
-                                                       tt = icaltime_as_timet(t);
-                                                       fmt_date(buf, tt, 1);
-                                                       wprintf("<i>%s</i> %s<br>",
-                                                               _("Ending date/time:"), buf);
-                                               }
                                        }
 
                                        q = icalcomponent_get_first_property(
@@ -670,9 +675,9 @@ void calendar_day_view(int year, int month, int day) {
 
        get_preference("calhourformat", calhourformat, sizeof calhourformat);
        get_preference("daystart", daystart_str, sizeof daystart_str);
-       if (strlen(daystart_str) > 0) daystart = atoi(daystart_str);
+       if (!IsEmptyStr(daystart_str)) daystart = atoi(daystart_str);
        get_preference("dayend", dayend_str, sizeof dayend_str);
-       if (strlen(dayend_str) > 0) dayend = atoi(dayend_str);
+       if (!IsEmptyStr(dayend_str)) dayend = atoi(dayend_str);
        
 
        /** Figure out the dates for "yesterday" and "tomorrow" links */
@@ -910,12 +915,12 @@ void do_calendar_view(void) {
        day = tm.tm_mday;
 
        /** Now see if a date was specified */
-       if (strlen(bstr("year")) > 0) year = atoi(bstr("year"));
-       if (strlen(bstr("month")) > 0) month = atoi(bstr("month"));
-       if (strlen(bstr("day")) > 0) day = atoi(bstr("day"));
+       if (!IsEmptyStr(bstr("year"))) year = atoi(bstr("year"));
+       if (!IsEmptyStr(bstr("month"))) month = atoi(bstr("month"));
+       if (!IsEmptyStr(bstr("day"))) day = atoi(bstr("day"));
 
        /** How would you like that cooked? */
-       if (strlen(bstr("calview")) > 0) {
+       if (!IsEmptyStr(bstr("calview"))) {
                strcpy(calview, bstr("calview"));
        }
        else {