Checked in a new popup system. Also added calname to calendar for popup reference.

11 files changed, 648 insertions, 84 deletions

diff --git a/calendars/Work2.ics b/calendars/Work2.ics
new file mode 100644
index 0000000..32f7d18
--- /dev/null
+++ b/calendars/Work2.ics
@@ -0,0 +1,540 @@
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+X-WR-TIMEZONE;VALUE=TEXT:US/Eastern
+PRODID:-//Apple Computer\, Inc//iCal 1.0//EN
+X-WR-CALNAME;VALUE=TEXT:Work
+X-WR-RELCALID;VALUE=TEXT:BC80E9CA-95E9-11D7-9E51-000393DC6D68-CALP
+VERSION:2.0
+BEGIN:VEVENT
+UID:7E65164C-9ABF-11D7-9114-000393DC6D68-RID
+EXDATE;TZID=US/Eastern:20030408T130000
+EXDATE;TZID=US/Eastern:20030513T130000
+EXDATE;TZID=US/Eastern:20030114T140000
+EXDATE;TZID=US/Eastern:20030121T140000
+EXDATE;TZID=US/Eastern:20030128T140000
+EXDATE;TZID=US/Eastern:20030204T140000
+EXDATE;TZID=US/Eastern:20030211T140000
+EXDATE;TZID=US/Eastern:20030218T140000
+EXDATE;TZID=US/Eastern:20030225T140000
+EXDATE;TZID=US/Eastern:20030304T140000
+EXDATE;TZID=US/Eastern:20030311T140000
+EXDATE;TZID=US/Eastern:20030318T140000
+EXDATE;TZID=US/Eastern:20030325T140000
+EXDATE;TZID=US/Eastern:20030401T140000
+EXDATE;TZID=US/Eastern:20030408T140000
+EXDATE;TZID=US/Eastern:20030415T140000
+EXDATE;TZID=US/Eastern:20030422T140000
+EXDATE;TZID=US/Eastern:20030429T140000
+EXDATE;TZID=US/Eastern:20030506T140000
+EXDATE;TZID=US/Eastern:20030513T140000
+EXDATE;TZID=US/Eastern:20030520T140000
+EXDATE;TZID=US/Eastern:20030527T140000
+EXDATE;TZID=US/Eastern:20030603T140000
+EXDATE;TZID=US/Eastern:20030610T140000
+EXDATE;TZID=US/Eastern:20030617T140000
+EXDATE;TZID=US/Eastern:20030624T130000
+EXDATE;TZID=US/Eastern:20030624T140000
+EXDATE;TZID=US/Eastern:20030701T140000
+EXDATE;TZID=US/Eastern:20030909T140000
+EXDATE;TZID=US/Eastern:20030819T140000
+EXDATE;TZID=US/Eastern:20030812T140000
+EXDATE;TZID=US/Eastern:20030916T140000
+EXDATE;TZID=US/Eastern:20030826T140000
+EXDATE;TZID=US/Eastern:20030923T140000
+EXDATE;TZID=US/Eastern:20030902T140000
+EXDATE;TZID=US/Eastern:20030805T140000
+EXDATE;TZID=US/Eastern:20030708T140000
+EXDATE;TZID=US/Eastern:20030715T140000
+EXDATE;TZID=US/Eastern:20030722T140000
+EXDATE;TZID=US/Eastern:20030729T140000
+SUMMARY:818 354-3434/ ext3344
+DTSTART;TZID=US/Eastern:20030114T140000
+DTSTAMP:20030905T165025Z
+DURATION:PT1H
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU
+END:VEVENT
+BEGIN:VEVENT
+UID:D9040425-RID
+EXDATE;TZID=US/Eastern:20030407T095000
+EXDATE;TZID=US/Eastern:20020107T095000
+EXDATE;TZID=US/Eastern:20020204T095000
+EXDATE;TZID=US/Eastern:20020304T095000
+EXDATE;TZID=US/Eastern:20020401T095000
+EXDATE;TZID=US/Eastern:20020506T095000
+EXDATE;TZID=US/Eastern:20020603T095000
+EXDATE;TZID=US/Eastern:20020701T095000
+EXDATE;TZID=US/Eastern:20020805T095000
+EXDATE;TZID=US/Eastern:20020902T095000
+EXDATE;TZID=US/Eastern:20021007T095000
+EXDATE;TZID=US/Eastern:20021104T095000
+EXDATE;TZID=US/Eastern:20021202T095000
+EXDATE;TZID=US/Eastern:20030106T095000
+EXDATE;TZID=US/Eastern:20030203T095000
+EXDATE;TZID=US/Eastern:20030303T095000
+EXDATE;TZID=US/Eastern:20030505T095000
+EXDATE;TZID=US/Eastern:20030602T095000
+EXDATE;TZID=US/Eastern:20030804T095000
+EXDATE;TZID=US/Eastern:20030901T095000
+EXDATE;TZID=US/Eastern:20030707T095000
+SUMMARY:Water Aloe Plant
+DTSTART;TZID=US/Eastern:20020107T095000
+DTSTAMP:20030819T222017Z
+DURATION:PT10M
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1MO
+END:VEVENT
+BEGIN:VEVENT
+UID:D9040746-RID
+EXDATE;TZID=US/Eastern:20030729T080000
+EXDATE;TZID=US/Eastern:20030730T080000
+EXDATE;TZID=US/Eastern:20030728T080000
+EXDATE;TZID=US/Eastern:20030730T184500
+EXDATE;TZID=US/Eastern:20030731T080000
+SUMMARY:12th US National Congress on Computational Mechanics
+DTSTART;TZID=US/Eastern:20030728T080000
+DTSTAMP:20030902T175630Z
+DURATION:PT10H
+RRULE:FREQ=DAILY;UNTIL=20030731T120000;INTERVAL=1
+END:VEVENT
+BEGIN:VEVENT
+EXDATE;TZID=US/Eastern:20010207T070000
+EXDATE;TZID=US/Eastern:20010807T070000
+EXDATE;TZID=US/Eastern:20020207T070000
+EXDATE;TZID=US/Eastern:20020807T070000
+EXDATE;TZID=US/Eastern:20030207T070000
+EXDATE;TZID=US/Eastern:20030807T070000
+UID:7E65035A-9ABF-11D7-9114-000393DC6D68-RID
+DTEND;TZID=US/Eastern:20010207T080000
+SUMMARY:NSF due
+DTSTART;TZID=US/Eastern:20010207T070000
+DTSTAMP:20030805T152708Z
+RRULE:FREQ=MONTHLY;INTERVAL=6
+END:VEVENT
+BEGIN:VEVENT
+UID:013F131E-B144-11D7-A8EA-000393DC6D68-RID
+DTSTAMP:20030819T222017Z
+SUMMARY:AIAA 100 Years conference
+EXDATE;TZID=US/Eastern:20030714T000000
+EXDATE;TZID=US/Eastern:20030715T000000
+EXDATE;TZID=US/Eastern:20030716T000000
+EXDATE;TZID=US/Eastern:20030717T000000
+RRULE:FREQ=DAILY;COUNT=4;INTERVAL=1
+DTSTART;VALUE=DATE:20030714
+DURATION:P1D
+END:VEVENT
+BEGIN:VEVENT
+EXDATE;TZID=US/Eastern:20030714T080000
+EXDATE;TZID=US/Eastern:20030713T080000
+EXDATE;TZID=US/Eastern:20030715T080000
+SUMMARY:DC
+UID:FBA3EE4E-AC16-11D7-9268-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030713T080000
+DURATION:PT9H
+RRULE:FREQ=DAILY;UNTIL=20030716T035959;INTERVAL=1
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Statics\, 154 Russ
+DTSTART;TZID=US/Eastern:20030909T141500
+UID:7C1EAF46-B3E0-11D7-B493-000393DC6D68-RID
+DURATION:PT1H40M
+RRULE:FREQ=WEEKLY;UNTIL=20031115T191500;INTERVAL=1;BYDAY=TU,TH
+END:VEVENT
+BEGIN:VEVENT
+DTSTART;TZID=US/Eastern:20031024T080000
+DTSTAMP:20030716T204820Z
+SUMMARY:Gossamer Spacecraft Program Committee Meeting
+UID:9EDCD000-B7CE-11D7-8737-000393DC6D68-RID
+DTEND;TZID=US/Eastern:20031024T110000
+DESCRIPTION:8AM-11AM
+END:VEVENT
+BEGIN:VEVENT
+EXDATE;TZID=US/Eastern:20030810T170000
+EXDATE;TZID=US/Eastern:20030807T170000
+EXDATE;TZID=US/Eastern:20030808T170000
+EXDATE;TZID=US/Eastern:20030809T170000
+EXDATE;TZID=US/Eastern:20030806T170000
+SUMMARY:Oleg Travel
+UID:3F0A272B-BC87-11D7-ACBE-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030806T170000
+DURATION:PT1H
+RRULE:FREQ=DAILY;UNTIL=20030827T035959;INTERVAL=1
+END:VEVENT
+BEGIN:VEVENT
+EXDATE;TZID=US/Eastern:20030905T163000
+EXDATE;TZID=US/Eastern:20030815T163000
+EXDATE;TZID=US/Eastern:20030912T163000
+EXDATE;TZID=US/Eastern:20030801T163000
+EXDATE;TZID=US/Eastern:20030808T163000
+EXDATE;TZID=US/Eastern:20030926T163000
+EXDATE;TZID=US/Eastern:20030919T163000
+EXDATE;TZID=US/Eastern:20030822T163000
+EXDATE;TZID=US/Eastern:20030829T163000
+EXDATE;TZID=US/Eastern:20030725T163000
+UID:ESN1123560043-R 76962752.24-RID
+SUMMARY:valevate
+DTSTART;TZID=US/Eastern:20030725T163000
+DTSTAMP:20030825T141748Z
+DURATION:PT1H
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR
+END:VEVENT
+BEGIN:VEVENT
+RECURRENCE-ID;TZID=US/Eastern:20031003T163000
+EXDATE;TZID=US/Eastern:20030905T163000
+EXDATE;TZID=US/Eastern:20030815T163000
+EXDATE;TZID=US/Eastern:20030912T163000
+EXDATE;TZID=US/Eastern:20030801T163000
+EXDATE;TZID=US/Eastern:20030808T163000
+EXDATE;TZID=US/Eastern:20030926T163000
+EXDATE;TZID=US/Eastern:20030919T163000
+EXDATE;TZID=US/Eastern:20030822T163000
+EXDATE;TZID=US/Eastern:20030829T163000
+SUMMARY:818 354-3434/ ext3344
+DTSTART;TZID=US/Eastern:20030812T140000
+UID:ESN1123560043-R 76962752.24-RID
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030819T222107Z
+SUMMARY:Deepika Gaddam
+DTEND;TZID=US/Eastern:20030821T110000
+DTSTART;TZID=US/Eastern:20030821T100000
+UID:54946590-D293-11D7-BDA6-000393DC6D68-RID
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030826T212052Z
+SUMMARY:Open house
+UID:CFA78440-C946-11D7-91ED-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030828T180000
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+ATTENDEE;CN=Oleg Shiryayev:mailto:shiryayev.2@wright.edu
+ATTENDEE;CN=Steven Page:mailto:spage@cs.wright.edu
+ATTENDEE;CN=Chris Pettit:mailto:chris.pettit@wpafb.af.mil
+ATTENDEE;CN=Nancy Lockwood:mailto:nancy.lockwood@wright.edu
+DTSTAMP:20030825T154324Z
+SUMMARY:Bolt Group Meeting
+DTSTART;TZID=US/Eastern:20030827T150000
+ORGANIZER;CN="Joseph C. Slater, PhD, PE":mailto:joseph.slater@wright.edu
+UID:50FF8E32-D711-11D7-A3F0-000393DC6D68-RID
+DURATION:PT1H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030825T193552Z
+SUMMARY:Hair
+UID:4EBA33E0-D733-11D7-A3F0-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030826T110000
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030826T180058Z
+SUMMARY:Dr. George\, dept. office
+UID:33D6B46E-D7E6-11D7-B4C9-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030828T090000
+DURATION:PT2H
+END:VEVENT
+BEGIN:VEVENT
+UID:ESN1123560043-R 82347586.51-RID
+DTSTART;TZID=US/Eastern:20030909T140000
+DTSTAMP:20030828T165328Z
+SUMMARY:818 354-3434/ ext3344
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030902T175733Z
+SUMMARY:818 354-3434/ ext3344
+DTEND;TZID=US/Eastern:20030902T153000
+DTSTART;TZID=US/Eastern:20030902T140000
+UID:ESN1123560043-R 82347586.49-RID
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030828T165336Z
+SUMMARY:Dept Meeting
+DTEND;TZID=US/Eastern:20030902T140000
+UID:E357CA48-D354-11D7-B925-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030902T130000
+END:VEVENT
+BEGIN:VEVENT
+DTSTART;TZID=US/Eastern:20030908T161000
+DTSTAMP:20030918T134239Z
+SUMMARY:Vibrations\, 341 Oelman
+UID:E8D361BF-D979-11D7-87AA-000393DC6D68-RID
+DTEND;TZID=US/Eastern:20030908T172500
+RRULE:FREQ=WEEKLY;UNTIL=20031117T045959;INTERVAL=1;BYDAY=MO,WE
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030828T191320Z
+SUMMARY:Reinhardt
+DTSTART;TZID=US/Eastern:20030829T093000
+UID:94A4C298-D98B-11D7-87AA-000393DC6D68-RID
+DURATION:PT1H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030902T193725Z
+SUMMARY:Deepeka
+DTSTART;TZID=US/Eastern:20030903T133000
+UID:BAD5A26C-DD7C-11D7-8097-000393DC6D68-RID
+DURATION:PT30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030902T193706Z
+SUMMARY:Valevate
+DTSTART;TZID=US/Eastern:20030903T143000
+UID:BE43763E-DD7C-11D7-8097-000393DC6D68-RID
+DURATION:PT1H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030908T135832Z
+SUMMARY:Valevate
+DTSTART;TZID=US/Eastern:20030908T133000
+UID:837AC284-E204-11D7-9C18-000393DC6D68-RID
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030909T124500Z
+SUMMARY:Reinhardt
+UID:0E1A05DE-E224-11D7-9C18-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030909T090000
+DURATION:PT1H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030909T202156Z
+SUMMARY:Office Hours
+UID:2599E8F0-E303-11D7-9B5D-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030908T144500
+DURATION:PT1H
+RRULE:FREQ=WEEKLY;UNTIL=20031123T045959;INTERVAL=1;BYDAY=MO,WE
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030910T011512Z
+SUMMARY:College Faculty Meeting
+DTSTART;TZID=US/Eastern:20031031T143000
+UID:2FEEF4F0-E32C-11D7-8D5F-000393DC6D68-RID
+DURATION:PT2H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030910T011559Z
+SUMMARY:College Faculty Meeting
+DTSTART;TZID=US/Eastern:20040227T143000
+UID:4C4F5DDA-E32C-11D7-8D5F-000393DC6D68-RID
+DURATION:PT2H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030910T011626Z
+SUMMARY:College Faculty Meeting
+DTSTART;TZID=US/Eastern:20040514T143000
+UID:5EC9BEF6-E32C-11D7-8D5F-000393DC6D68-RID
+DURATION:PT2H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030911T163937Z
+SUMMARY:Christine McGee
+UID:77837470-E476-11D7-AF09-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030915T143000
+DURATION:PT15M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030912T205221Z
+SUMMARY:Deily
+DTSTART;TZID=US/Eastern:20030912T160000
+UID:8F1973F0-E536-11D7-AF09-000393DC6D68-RID
+DURATION:PT30M
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030912T183342Z
+SUMMARY:Visitors
+DTSTART;TZID=US/Eastern:20030915T080000
+UID:9BDD697E-E54F-11D7-8580-000393DC6D68-RID
+DURATION:PT10H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030917T184748Z
+SUMMARY:Pettit
+DTEND;TZID=US/Eastern:20030919T093000
+UID:A9BDB7CE-E54F-11D7-8580-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030919T080000
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030912T183429Z
+SUMMARY:Young
+DTSTART;TZID=US/Eastern:20030916T080000
+UID:B7A56529-E54F-11D7-8580-000393DC6D68-RID
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+ATTENDEE;CN=Oleg Shiryayev:mailto:shiryayev.2@wright.edu
+ATTENDEE;CN=Steven Page:mailto:spage@cs.wright.edu
+ATTENDEE;CN=Michael Maddux:mailto:71bronco@voyager.net
+ATTENDEE;CN=Brian Deily:mailto:bdeily@cs.wright.edu
+ATTENDEE;CN=Charles Cross:mailto:charles.cross@wpafb.af.mil
+ATTENDEE;CN=George AFRL/PRTC:mailto:Tommy.George@wpafb.af.mil
+DTSTAMP:20030912T185100Z
+SUMMARY:Possibility of Active Cascade Flutter Control with Smart 
+ Structures in Transonic Flow Condition\n\nby\nToshinori 
+ Watanabe\nDepartment of Aeronautics & Astronautics\nUniversity of Tokyo
+DTSTART;TZID=US/Eastern:20030915T130000
+ORGANIZER;CN="Joseph C. Slater, PhD, PE":mailto:joseph.slater@wright.edu
+UID:5EC4D49A-E551-11D7-8580-000393DC6D68-RID
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+UID:2665C57E-E9DD-11D7-BAC2-000393DC6D68-RID
+DTSTAMP:20030918T133744Z
+SUMMARY:Quiz
+DTSTART;TZID=US/Eastern:20030918T141500
+DTEND;TZID=US/Eastern:20030918T151500
+RRULE:FREQ=WEEKLY;COUNT=5;INTERVAL=2;BYDAY=TH
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T150831Z
+SUMMARY:Exam 1
+DTEND;TZID=US/Eastern:20031001T173000
+UID:59E4D34C-E9DD-11D7-BAC2-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031001T161500
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030918T134113Z
+SUMMARY:Exam 2
+UID:84AD5A42-E9DD-11D7-BAC2-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031027T160000
+DURATION:PT1H15M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030918T141840Z
+SUMMARY:Vibration Final Exam
+UID:F95469BF-E9E2-11D7-BAC2-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031117T174500
+DURATION:PT2H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030918T142201Z
+SUMMARY:Statics Final
+UID:72C183C8-E9E3-11D7-BAC2-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031120T151500
+DURATION:PT2H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030923T202154Z
+SUMMARY:Reinhardt
+DTEND;TZID=US/Eastern:20030924T120000
+DTSTART;TZID=US/Eastern:20030924T090000
+UID:98719ECC-EA1E-11D7-92F1-000393DC6D68-RID
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030919T152252Z
+SUMMARY:Petitions Committee
+UID:1254918A-EAB5-11D7-BC54-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030930T100000
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030919T152340Z
+SUMMARY:NSF POD
+UID:3502799C-EAB5-11D7-BC54-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030929T130000
+DURATION:PT1H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T143717Z
+SUMMARY:P&T
+DTEND;TZID=US/Eastern:20030926T130000
+DTSTART;TZID=US/Eastern:20030926T120000
+UID:823D8825-EE03-11D7-9938-000393DC6D68-RID
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030924T180225Z
+SUMMARY:LA NRA Review Panel
+UID:2FFBB686-EEB9-11D7-9B43-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031117T080000
+DURATION:PT9H
+RRULE:FREQ=DAILY;COUNT=5;INTERVAL=1
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030924T215842Z
+SUMMARY:Page
+DTEND;TZID=US/Eastern:20030926T140000
+UID:36F27577-EEDA-11D7-9B43-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20030926T140000
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T203554Z
+SUMMARY:Valevate
+DTSTART;TZID=US/Eastern:20030926T163000
+UID:488E9FFC-EEDA-11D7-9B43-000393DC6D68-RID
+DURATION:PT30M
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T150322Z
+SUMMARY:American Airlines # 5697\, 15B
+UID:4E44C380-EF69-11D7-A150-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031001T101500
+DURATION:PT1H30M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T150418Z
+SUMMARY:American Airlines # 2355\, 27C
+UID:7DF7BE52-EF69-11D7-A150-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031001T121500
+DURATION:PT2H15M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T150901Z
+SUMMARY:American Airlines # 1526\, 20E
+DTEND;TZID=US/Eastern:20031003T131500
+UID:9438EA9E-EF69-11D7-A150-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031003T070000
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T203538Z
+SUMMARY:American Airlines # 4319\, 9B
+DTEND;TZID=US/Eastern:20031003T163000
+DTSTART;TZID=US/Eastern:20031003T141500
+UID:E864194A-EF69-11D7-A150-000393DC6D68-RID
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T150815Z
+SUMMARY:Preliminary Design Review of the ISAT Rigidizable/Inflatable 
+ Joint Technology Development (PDR)
+EXDATE;TZID=US/Eastern:20031003T080000
+EXDATE;TZID=US/Eastern:20031004T080000
+UID:1EA96EE2-E570-11D7-9CD2-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031002T080000
+DURATION:PT10H
+RRULE:FREQ=DAILY;COUNT=3;INTERVAL=1
+END:VEVENT
+BEGIN:VEVENT
+RECURRENCE-ID;TZID=US/Eastern:20031001T161000
+UID:E8D361BF-D979-11D7-87AA-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031001T161000
+DURATION:PT1H15M
+END:VEVENT
+BEGIN:VEVENT
+RECURRENCE-ID;TZID=US/Eastern:20031002T141500
+UID:7C1EAF46-B3E0-11D7-B493-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031002T141500
+DURATION:PT1H40M
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T204436Z
+SUMMARY:Trip (888) 656-4546 loc: MD6DX1IT  \n tic: 0011574300827\n
+DTEND;TZID=US/Eastern:20031001T090000
+UID:45B4A7C2-EF6A-11D7-A150-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031001T080000
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T204556Z
+SUMMARY:Best West Valencia 661-255-0555 C: 666596675\n27413 Wayne Mills 
+ Place\n
+UID:57B00A46-EF6A-11D7-A150-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031001T143000
+DURATION:PT1H
+END:VEVENT
+BEGIN:VEVENT
+DTSTAMP:20030925T204506Z
+SUMMARY:Dollar\, C# Y2234979\n866-434-2226\, 5630 W ARBOR VITAE ST\n
+UID:9AF9D0E2-EF6A-11D7-A150-000393DC6D68-RID
+DTSTART;TZID=US/Eastern:20031001T140000
+DURATION:PT1H
+END:VEVENT
+END:VCALENDAR
diff --git a/config.inc.php b/config.inc.php
index 6e34f9f..5319547 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -32,7 +32,7 @@ $cookie_uri				= ''; 				// The HTTP URL to the PHP iCalendar directory, ie. htt
 $download_uri			= ''; 				// The HTTP URL to your calendars directory, ie. http://www.example.com/phpicalendar/calendars
 
 // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
-$save_parsed_cals 		= 'yes';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
+$save_parsed_cals 		= 'no';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
 $use_sessions 			= 'no';				// This has not yet been implemented.
 $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
 $display_ical_list 		= 'yes';			// In the 'Jump To' box, display the pop-up menu with the list of all calendars in the $calendar_path directory.
diff --git a/day.php b/day.php
index 8d4352d..4fcfeae 100644
--- a/day.php
+++ b/day.php
@@ -90,10 +90,11 @@ include (BASE.'includes/header.inc.php');
 					   foreach($master_array[($getdate)]['-1'] as $allday) {
 						 echo "<tr>\n";
 						 $event_calno  = $allday['calnumber'];
+						 $event_calna  = $allday['calname'];
 						 if ($event_calno < 1) $event_calno=1;
 						 if ($event_calno > 7) $event_calno=7;
 						 echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
-						 openevent("$calendar_name",
+						 openevent("$event_calna",
 							   "",
 							   "",
 							   $allday,
@@ -252,9 +253,8 @@ include (BASE.'includes/header.inc.php');
 												  echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n";
 												  echo '<tr>'."\n";
 												  echo '<td class="eventbg_'.$event_calno.'">';
-												  // Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
-												  if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
-										  		  openevent("$calendar_name2",
+												  $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname'];
+										  		  openevent("$event_calna",
 												  "$event_start",
 												  "$event_end",
 												  $this_time_arr[($event_length[$i]['key'])],
diff --git a/functions/date_functions.php b/functions/date_functions.php
index f14147b..8745c1a 100644
--- a/functions/date_functions.php
+++ b/functions/date_functions.php
@@ -160,54 +160,63 @@ function chooseOffset($time) {
 	return $offset;
 }
 
-function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic, $class) { 
+function openevent($calendar_name, $start, $end, $arr, $lines, $wrap, $pre_text, $post_text, $link_class) { 
 	$event_text = stripslashes(urldecode($arr["event_text"]));
 	# for iCal pseudo tag <http> comptability
-	if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$reg)) { 
-		$ev = $reg[1] . $reg[2]; 
-		$event_text = $reg[2];
+	if (ereg("<([[:alpha:]]+://)([^<>[:space:]]+)>",$event_text,$matches)) { 
+		$full_event_text = $matches[1] . $matches[2]; 
+		$event_text = $matches[2];
 	} else { 
-		$ev = $arr["event_text"];
+		$full_event_text = $event_text;
 		$event_text = strip_tags($event_text, '<b><i><u>');
 	}
+
 	if (isset($arr["organizer"])) {
-		$organizer = urlencode(addslashes($arr["organizer"]));
-	} else {
-		$organizer = '';
+		$organizer = addslashes($arr["organizer"]);
 	}
+
 	if (isset($arr["attendee"])) {
-		$attendee = urlencode(addslashes($arr["attendee"]));
-	} else {
-		$attendee = '';
+		$attendee = addslashes($arr["attendee"]);
 	}
+
 	if (isset($arr["location"])) {
-		$location = $arr["location"];
-	} else {
-		$location = '';
+		$location = addslashes($arr["location"]);
 	}
+
 	if (isset($arr["status"])) {
-		$status = $arr["status"];
-	} else {
-		$status = '';
+		$status = addslashes($arr["status"]);
 	}
-	if ($event_text != "") {	
-		if ($lines) $event_text = word_wrap($event_text, $wrap, $lines);
-		$dsc  = urlencode(addslashes($arr["description"]));
-		echo '<a class="'.$class.'" href="';
-		if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $ev, $res))) || ($dsc)) {
-			echo "javascript:w=window.open('";
-			echo "includes/event.php?event=";
-			echo urlencode(addslashes($ev));
-			echo "&cal=";
-			echo urlencode(addslashes($cal));
-			echo "&start=$st&end=$end&description=$dsc&status=$status&location=$location&organizer=$organizer&attendee=$attendee";
-			echo "','Popup','";
-			echo "scrollbars=yes,width=460,height=275";
-			echo "');w.focus()";
+
+	if (isset($arr["description"])) {
+		$description  = addslashes(stripslashes(urldecode($arr["description"])));
+    }
+
+	if (!empty($event_text)) {	
+		if ($lines > 0) {
+			$event_text = word_wrap($event_text, $wrap, $lines);
+		}
+
+		if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $full_event_text, $res))) || ($description)) {
+			$escaped_event = addslashes($full_event_text);
+			$escaped_calendar = addslashes($calendar_name);
+			$escaped_start = addslashes($start);
+			$escaped_end = addslashes($end);
+			// fix for URL-length bug in IE: populate and submit a hidden form on click
+			static $popup_data_index = 0;
+echo <<<END
+
+    <script language="Javascript" type="text/javascript"><!--
+    var eventData = new EventData('$escaped_event', '$escaped_calendar', '$escaped_start', '$escaped_end', '$description', '$status', '$location', '$organizer', '$attendee');
+    document.popup_data[$popup_data_index] = eventData;
+    // --></script>
+
+END;
+			echo "<a class=\"$link_class\" href=\"#\" onclick=\"openEventWindow($popup_data_index);\">";
+			$popup_data_index++;
 		} else {
-			echo $res[1];
+			echo "<a class=\"$link_class\" href=\"{$res[1]}\">";
 		}
-	echo '">'.$clic.$event_text.$fclic.'</a>';
+		echo "{$pre_text}{$event_text}{$post_text}</a>\n";
 	}
 }
 
diff --git a/functions/ical_parser.php b/functions/ical_parser.php
index 2928263..1383a21 100644
--- a/functions/ical_parser.php
+++ b/functions/ical_parser.php
@@ -51,20 +51,18 @@ if (($is_webcal == false) && ($save_parsed_cals == 'yes') && ($cal != $ALL_CALEN
 }
 
 if ($parse_file) {	
-// some initializations, that have to be outside the calnumber loop
-	// auxiliary array for determining overlaps of events
 	$overlap_array = array ();
-		
-	// using $uid to set specific points in array, if $uid is not in the 
-	// .ics file, we need to have some unique place in the array
 	$uid_counter = 0;
 }
 
 $calnumber = 1;
 foreach ($cal_filelist as $filename) {
-
+	
+	// Find the real name of the calendar.
+	$actual_calname = str_replace($calendar_path, '', $filename);
+	$actual_calname = str_replace('/', '', str_replace('.ics', '', $actual_calname));
+	
 	if ($parse_file) {	
-		// patch to speed up parser
 		
 		$ifile = fopen($filename, "r");
 		if ($ifile == FALSE) exit(error($error_invalidcal_lang, $filename));
@@ -231,7 +229,7 @@ foreach ($cal_filelist as $filename) {
 					if (($end > $mArray_begin) && ($end < $mArray_end)) {
 						while ($start != $end) {
 							$start_date2 = date('Ymd', $start);
-							$master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber);
+							$master_array[($start_date2)][('-1')][$uid]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber, 'calname' => $actual_calname );
 							$start = strtotime('+1 day', $start);
 						}
 						if (!$write_processed) $master_array[($start_date)]['-1'][$uid]['exception'] = true;
@@ -258,7 +256,7 @@ foreach ($cal_filelist as $filename) {
 								$end_time_tmp = '0000';
 							}
 							$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
-							$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee) );
+							$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname );
 							$start_tmp = strtotime('+1 day',$start_tmp);
 						}
 						if (!$write_processed) $master_array[$start_date][($hour.$minute)][$uid]['exception'] = true;
@@ -273,7 +271,7 @@ foreach ($cal_filelist as $filename) {
 						// This if statement should prevent writing of an excluded date if its the first recurrance - CL
 						if (!in_array($start_date, $except_dates)) {
 							$nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time_tmp1, $uid);
-							$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber );
+							$master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime, 'end_unixtime' => $end_unixtime, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname );
 							if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true;
 						}
 					}
@@ -575,7 +573,7 @@ foreach ($cal_filelist as $filename) {
 													$end_time2 = strtotime('+'.$diff_allday_days.' days', $recur_data_time);
 													while ($start_time2 < $end_time2) {
 														$start_date2 = date('Ymd', $start_time2);
-														$master_array[($start_date2)][('-1')][]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber);
+														$master_array[($start_date2)][('-1')][]= array ('event_text' => $summary, 'description' => $description, 'calnumber' => $calnumber, 'calname' => $actual_calname );
 														$start_time2 = strtotime('+1 day', $start_time2);
 													}
 												} else {
@@ -600,7 +598,7 @@ foreach ($cal_filelist as $filename) {
 																$end_time_tmp = '0000';
 															}
 															$nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid);
-															$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
+															$master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname);
 															$start_tmp = strtotime('+1 day',$start_tmp);
 														}
 													} else {
@@ -615,7 +613,7 @@ foreach ($cal_filelist as $filename) {
 														$until_check = $recur_data_date.$hour.$minute.'00';
 														if ($abs_until > $until_check) {
 															$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time_tmp1, $uid);
-															$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber);
+															$master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time_tmp1, 'display_end' => $display_end_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber, 'calname' => $actual_calname);
 														}
 													}
 												}
@@ -657,7 +655,7 @@ foreach ($cal_filelist as $filename) {
 				} else {
 					$vtodo_sort = $vtodo_priority;
 				}
-				$master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description);
+				$master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description, 'calname' => $actual_calname);
 				unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description);
 				$vtodo_set = FALSE;
 			} elseif ($line == 'BEGIN:VTODO') {
diff --git a/functions/init.inc.php b/functions/init.inc.php
index 5bae3c7..3be7abb 100644
--- a/functions/init.inc.php
+++ b/functions/init.inc.php
@@ -6,7 +6,7 @@
 //chmod(BASE.'calendars/School.ics',0666);
 
 // uncomment when developing, comment for shipping version
-error_reporting (0);
+error_reporting (E_ALL);
 
 $ALL_CALENDARS_COMBINED = 'all_calendars_combined971';
 if (!defined('BASE')) define('BASE', './');
diff --git a/includes/event.php b/includes/event.php
index c8492f0..b847c5b 100644
--- a/includes/event.php
+++ b/includes/event.php
@@ -3,48 +3,48 @@ define('BASE', '../');
 include (BASE.'functions/init.inc.php'); 
 
 // Load vars
-if (isset($HTTP_GET_VARS['event']) && ($HTTP_GET_VARS['event'] !== '') ) {
-	$event=$HTTP_GET_VARS['event'];
+if (isset($HTTP_POST_VARS['event']) && ($HTTP_POST_VARS['event'] !== '') ) {
+	$event=$HTTP_POST_VARS['event'];
 } else {
 	$event='';
 }
-if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== '') ) {
-	$description=$HTTP_GET_VARS['description'];
+if (isset($HTTP_POST_VARS['description']) && ($HTTP_POST_VARS['description'] !== '') ) {
+	$description=$HTTP_POST_VARS['description'];
 } else {
 	$description='';
 }
-if (isset($HTTP_GET_VARS['cal']) && ($HTTP_GET_VARS['cal'] !== '') ) {
-	$calendar_name=$HTTP_GET_VARS['cal'];
+if (isset($HTTP_POST_VARS['cal']) && ($HTTP_POST_VARS['cal'] !== '') ) {
+	$calendar_name=$HTTP_POST_VARS['cal'];
 } else {
 	$calendar_name='';
 }
-if (isset($HTTP_GET_VARS['start']) && ($HTTP_GET_VARS['start'] !== '') ) {
-	$start=$HTTP_GET_VARS['start'];
+if (isset($HTTP_POST_VARS['start']) && ($HTTP_POST_VARS['start'] !== '') ) {
+	$start=$HTTP_POST_VARS['start'];
 } else {
 	$start='';
 }
-if (isset($HTTP_GET_VARS['end']) && ($HTTP_GET_VARS['end'] !== '') ) {
-	$end=$HTTP_GET_VARS['end'];
+if (isset($HTTP_POST_VARS['end']) && ($HTTP_POST_VARS['end'] !== '') ) {
+	$end=$HTTP_POST_VARS['end'];
 } else {
 	$end='';
 }
-if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {
-	$status=$HTTP_GET_VARS['status'];
+if (isset($HTTP_POST_VARS['status']) && ($HTTP_POST_VARS['status'] !== '') ) {
+	$status=$HTTP_POST_VARS['status'];
 } else {
 	$status='';
 }
-if (isset($HTTP_GET_VARS['location']) && ($HTTP_GET_VARS['location'] !== '') ) {
-	$location=$HTTP_GET_VARS['location'];
+if (isset($HTTP_POST_VARS['location']) && ($HTTP_POST_VARS['location'] !== '') ) {
+	$location=$HTTP_POST_VARS['location'];
 } else {
 	$location='';
 }
-if (isset($HTTP_GET_VARS['organizer']) && ($HTTP_GET_VARS['organizer'] !== '') ) {
-	$organizer=$HTTP_GET_VARS['organizer'];
+if (isset($HTTP_POST_VARS['organizer']) && ($HTTP_POST_VARS['organizer'] !== '') ) {
+	$organizer=$HTTP_POST_VARS['organizer'];
 } else {
 	$organizer='';
 }
-if (isset($HTTP_GET_VARS['attendee']) && ($HTTP_GET_VARS['attendee'] !== '') ) {
-	$attendee=$HTTP_GET_VARS['attendee'];
+if (isset($HTTP_POST_VARS['attendee']) && ($HTTP_POST_VARS['attendee'] !== '') ) {
+	$attendee=$HTTP_POST_VARS['attendee'];
 } else {
 	$attendee='';
 }
@@ -179,4 +179,4 @@ if ($location) {
 </body>
 <!-- End PAGE -->
 
-</html>
\ No newline at end of file
+</html>
diff --git a/includes/header.inc.php b/includes/header.inc.php
index 6c35d0d..3c15bc5 100644
--- a/includes/header.inc.php
+++ b/includes/header.inc.php
@@ -12,7 +12,19 @@
 			echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&amp;rssview=week\">";
 		} 
 		if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); 
+		include (BASE.'functions/event.js'); 
 		
 	?>
 </head>
-<body bgcolor="#FFFFFF">
\ No newline at end of file
+<body bgcolor="#FFFFFF">
+<form name="eventPopupForm" id="eventPopupForm" method="post" action="includes/event.php" style="display: none;">
+  <input type="hidden" name="event" id="event" value="">
+  <input type="hidden" name="cal" id="cal" value="">
+  <input type="hidden" name="start" id="start" value="">
+  <input type="hidden" name="end" id="end" value="">
+  <input type="hidden" name="description" id="description" value="">
+  <input type="hidden" name="status" id="status" value="">
+  <input type="hidden" name="location" id="location" value="">
+  <input type="hidden" name="organizer" id="organizer" value="">
+  <input type="hidden" name="attendee" id="attendee" value="">
+</form>
diff --git a/includes/sidebar.php b/includes/sidebar.php
index 4b7d5b8..0a08412 100644
--- a/includes/sidebar.php
+++ b/includes/sidebar.php
@@ -102,20 +102,19 @@ $search_box = '<form style="margin-bottom:0;" action="search.php" method="GET"><
 								$description 	= addslashes(urlencode($val["description"]));
 								$event_start 	= @$val["event_start"];
 								$event_end 		= @$val["event_end"];
+								$event_calna 	= @$val["calname"];
 								$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
 								$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
-								$calendar_name2	= addslashes($calendar_name);
-								$calendar_name2 = urlencode($calendar_name2);
 								$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
 								
 								if (!isset($val["event_start"])) { 
 									$event_start = $all_day_lang; 
 									$event_end = ''; 
-									openevent($calendar_name2, $event_start, 
+									openevent($event_calna, $event_start, 
 									$event_end, $val, $tomorrows_events_lines, 21, '<i>', '</i>', 'psf'); 
 									echo "<br>\n"; 
 								} else { 
-									openevent($calendar_name2, $event_start, 
+									openevent($event_calna, $event_start, 
 									$event_end, $val, $tomorrows_events_lines, 21, '<font class="G10B">&#149; ', '</font>', 'psf'); 
 									echo "<br>\n"; 
 								}
diff --git a/month.php b/month.php
index bc4d9d1..8f71aab 100644
--- a/month.php
+++ b/month.php
@@ -114,9 +114,11 @@ include (BASE.'includes/header.inc.php');
 								foreach ($master_array[("$daylink")] as $event_times) {
 									foreach ($event_times as $val) {
 										$num_of_events2++;
+										$event_calno = $val['calnumber'];
+										$event_calna = $val['calname'];
 										if (!isset($val["event_start"])) {
 											echo '<div align="center" class="V10">';
-											openevent("$calendar_name", "", "", $val, $month_event_lines,
+											openevent("$event_calna", "", "", $val, $month_event_lines,
 											15,
 											"<i>",
 											"</i>",
@@ -130,7 +132,7 @@ include (BASE.'includes/header.inc.php');
 											$event_start = date($timeFormat, @strtotime ("$event_start"));
 											$start2		 = date($timeFormat_small,@strtotime("$event_start"));
 											$event_end   = date($timeFormat, @strtotime ("$event_end"));
-											@openevent("$calendar_name",
+											@openevent("$event_calna",
 											"$event_start",
 											"$event_end",
 											$val,
@@ -194,6 +196,9 @@ include (BASE.'includes/header.inc.php');
 								
 								// Pull out each time
 								foreach ($new_val as $new_key2 => $new_val2) {
+								$event_calno = $new_val2['calnumber'];
+								$event_calna = $new_val2['calname'];
+
 								if ($new_val2["event_text"]) {	
 									if (isset($new_val2["event_start"])) {
 										$event_start 	= $new_val2["event_start"];
@@ -215,7 +220,7 @@ include (BASE.'includes/header.inc.php');
 										$first_time = FALSE;
 									}
 									echo "<td>\n";
-									openevent("$calendar_name",
+									openevent("$event_calna",
 									"$event_start",
 									"$event_end",
 									$new_val2,
diff --git a/week.php b/week.php
index 488d707..81dbf76 100644
--- a/week.php
+++ b/week.php
@@ -163,10 +163,11 @@ include (BASE.'includes/header.inc.php');
 												  	foreach($master_array[($thisday)]["-1"] as $allday) {
 														echo "<tr>\n";
 														$event_calno  = $allday['calnumber'];
+														$event_calna  = $allday['calname'];
 						 								if ($event_calno < 1) $event_calno=1;
 														if ($event_calno > 7) $event_calno=7;
 						 								echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
-														openevent("$calendar_name",
+														openevent("$event_calna",
 														"",
 													  	"",
 													  	$allday,
@@ -306,9 +307,9 @@ include (BASE.'includes/header.inc.php');
 																	$event_end	= $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"];
 																	 if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']);
 																	$event_end 	= date ($timeFormat, $event_end);
-																	// Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
-																	if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
-																	openevent("$calendar_name2",
+
+																	$event_calna = $this_time_arr[($event_length[$thisday][$i]["key"])]['calname'];
+																	openevent("$event_calna",
 																		  "$event_start",
 																		  "$event_end",
 																		  $this_time_arr[($event_length[$thisday][$i]["key"])],