You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv11563/calendars Modified Files: Home.ics Removed Files: School.ics alldays.ics birthdays.ics greg.ics recur.ics vtodo.ics Log Message: Cleanup for 0.9.2, removed old calendars, provided new demo calendar. Index: Home.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/Home.ics,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Home.ics 18 Oct 2002 23:07:37 -0000 1.7 --- Home.ics 30 May 2003 17:58:55 -0000 1.8 *************** *** 2,153 **** CALSCALE:GREGORIAN X-WR-TIMEZONE;VALUE=TEXT:US/Pacific ! PRODID:iCal X-WR-CALNAME;VALUE=TEXT:Home ! X-WR-RELCALID;VALUE=TEXT:BB9B43C2-C373-11D6-BB9D-003065C59510 VERSION:2.0 BEGIN:VEVENT ! DTSTAMP:20020816T035857Z ! SUMMARY:Moby Area2 all day concert & shoreline ! DTEND;TZID=US/Pacific:20020814T233000 ! UID:BB9ADBD4-C373-11D6-BB9D-003065C59510 ! DTSTART;TZID=US/Pacific:20020814T153000 ! END:VEVENT ! BEGIN:VEVENT ! DTSTAMP:20020816T035941Z ! SUMMARY:Motorcycle service #147 ! DESCRIPTION:Motorcycle service #147 ! DTEND;TZID=US/Pacific:20020814T093000 ! UID:BB9AE200-C373-11D6-BB9D-003065C59510 ! DTSTART;TZID=US/Pacific:20020814T090000 ! END:VEVENT ! BEGIN:VEVENT ! DTSTAMP:20020908T213204Z ! SUMMARY:Pick up Stef @ airport ! DTEND;TZID=US/Pacific:20020822T202500 ! UID:BB9AE6EB-C373-11D6-BB9D-003065C59510 ! DTSTART;TZID=US/Pacific:20020822T192000 ! END:VEVENT ! BEGIN:VEVENT ! UID:BB9AEBB2-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T040451Z SUMMARY:Stef in town ! DTSTART;VALUE=DATE:20020822 ! DTEND;VALUE=DATE:20020921 ! END:VEVENT ! BEGIN:VEVENT ! UID:BB9AF091-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T043643Z ! SUMMARY:My birthday ! RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=9 ! DTSTART;VALUE=DATE:20010917 ! DTEND;VALUE=DATE:20010918 ! END:VEVENT ! BEGIN:VEVENT ! UID:BB9AF562-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T043621Z ! SUMMARY:Mom's birthday ! RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=9 ! DTSTART;VALUE=DATE:20020921 ! DTEND;VALUE=DATE:20020922 END:VEVENT BEGIN:VEVENT ! UID:BB9AFB57-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T043702Z ! SUMMARY:Mark's birthday ! RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=9 ! DTSTART;VALUE=DATE:20020921 ! DTEND;VALUE=DATE:20020922 END:VEVENT BEGIN:VEVENT ! UID:BB9B02DA-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T040809Z ! SUMMARY:Heather's wedding ! DTSTART;VALUE=DATE:20021011 ! DTEND;VALUE=DATE:20021012 END:VEVENT BEGIN:VEVENT ! UID:BB9B07D4-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T040827Z ! SUMMARY:Flying home ! DTSTART;VALUE=DATE:20021010 ! DTEND;VALUE=DATE:20021014 END:VEVENT BEGIN:VEVENT ! UID:BB9B0CA7-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T041030Z ! SUMMARY:Track day ! DTSTART;VALUE=DATE:20020827 ! DTEND;VALUE=DATE:20020828 END:VEVENT BEGIN:VEVENT ! DTSTAMP:20020816T041630Z ! SUMMARY:Lunch with Stef's mom and sis ! UID:BB9B1171-C373-11D6-BB9D-003065C59510 ! DTSTART;TZID=US/Pacific:20020824T120000 ! DURATION:PT1H END:VEVENT BEGIN:VEVENT ! DTSTAMP:20020816T041649Z ! SUMMARY:Lunch with Stef and Tam ! UID:BB9B162C-C373-11D6-BB9D-003065C59510 ! DTSTART;TZID=US/Pacific:20020825T120000 ! DURATION:PT1H END:VEVENT BEGIN:VEVENT ! UID:BB9B1AE6-C373-11D6-BB9D-003065C59510 ! DTSTAMP:20020816T043937Z ! SUMMARY:Penny's birthday ! RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=6 ! DTSTART;VALUE=DATE:20030608 ! DTEND;VALUE=DATE:20030609 END:VEVENT BEGIN:VEVENT ! ATTENDEE;DIR="addressbook://48D0FB0B-B0D0-11D6-8A2A-003065C59510: ! ABPerson";CN=Kate Wormington:mailto:ka...@ka... ! ATTENDEE;DIR="addressbook://779160A4-B0CB-11D6-9048-003065C59510: ! ABPerson";CN=Stefanie W.:mailto:ste...@dr... ! ATTENDEE;DIR="addressbook://5D7F79DA-B30C-11D6-9024-003065C59510: ! ABPerson";CN=Dan Marusich:mailto:un...@ma... ! DTSTART;TZID=US/Pacific:20020824T200000 ! DTSTAMP:20020819T032905Z ! SUMMARY:Evita ! UID:BB9B1FC2-C373-11D6-BB9D-003065C59510 ! ORGANIZER;CN=Chad Little:mailto:cha...@ma... ! DTEND;TZID=US/Pacific:20020824T230000 END:VEVENT BEGIN:VEVENT ! DTSTAMP:20020908T055109Z ! SUMMARY:My new evetn ! DTEND;TZID=US/Pacific:20020907T210900 ! DTSTART;TZID=US/Pacific:20020907T191300 ! UID:BB9B247E-C373-11D6-BB9D-003065C59510 END:VEVENT BEGIN:VEVENT ! DTSTAMP:20020908T061613Z SUMMARY:New Event ! DTEND;TZID=US/Pacific:20020907T211600 ! DTSTART;TZID=US/Pacific:20020907T200100 ! UID:BB9B2915-C373-11D6-BB9D-003065C59510 ! END:VEVENT ! BEGIN:VEVENT ! DTSTAMP:20020908T214000Z ! SUMMARY:New Event2 ! UID:BB9B2DB9-C373-11D6-BB9D-003065C59510 ! DTSTART;TZID=US/Pacific:20020907T193000 DURATION:PT1H - END:VEVENT - BEGIN:VEVENT - DTSTAMP:20020908T214057Z - SUMMARY:New Event - DTSTART;TZID=US/Pacific:20020907T134500 - UID:BB9B326F-C373-11D6-BB9D-003065C59510 - DURATION:PT1H15M - END:VEVENT - BEGIN:VEVENT - DTSTAMP:20020908T214058Z - SUMMARY:New Event - DTSTART;TZID=US/Pacific:20020907T160000 - UID:BB9B3732-C373-11D6-BB9D-003065C59510 - DURATION:PT1H15M END:VEVENT END:VCALENDAR --- 2,130 ---- CALSCALE:GREGORIAN X-WR-TIMEZONE;VALUE=TEXT:US/Pacific ! METHOD:PUBLISH ! PRODID:-//Apple Computer\, Inc//iCal 1.0//EN X-WR-CALNAME;VALUE=TEXT:Home ! X-WR-RELCALID;VALUE=TEXT:99732F9A-92C7-11D7-A4A2-000A95690022 VERSION:2.0 BEGIN:VEVENT ! SEQUENCE:3 ! DTSTAMP:20020813T175619Z SUMMARY:Stef in town ! DTEND;TZID=US/Pacific:20020822T200000 ! UID:99730450-92C7-11D7-A4A2-000A95690022 ! DTSTART;TZID=US/Pacific:20020822T170000 END:VEVENT BEGIN:VEVENT ! SEQUENCE:1 ! DTSTAMP:20020918T221458Z ! SUMMARY:This is a space \n\n\nOption return and a really long line of ! text that will be inserted into the event text box. Let's all see what ! really happens when iCals start being real. ! UID:99730748-92C7-11D7-A4A2-000A95690022 ! DTSTART;TZID=US/Pacific:20020918T121500 ! DURATION:PT2H END:VEVENT BEGIN:VEVENT ! SEQUENCE:3 ! DTSTART;TZID=US/Pacific:20020919T120000 ! DTSTAMP:20020918T223915Z ! SUMMARY:Recurring Monthly ! UID:9973090E-92C7-11D7-A4A2-000A95690022 ! DTEND;TZID=US/Pacific:20020919T133000 ! RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=19 END:VEVENT BEGIN:VEVENT ! SEQUENCE:2 ! DTSTAMP:20020918T223933Z ! SUMMARY:Recurring Weekly ! DTSTART;TZID=US/Pacific:20020920T120000 ! UID:99730AB4-92C7-11D7-A4A2-000A95690022 ! DURATION:PT1H30M ! RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=FR END:VEVENT BEGIN:VEVENT ! SEQUENCE:3 ! DTSTAMP:20020918T223954Z ! SUMMARY:Recurring Daily ! DTSTART;TZID=US/Pacific:20020921T100000 ! UID:99730E40-92C7-11D7-A4A2-000A95690022 ! DURATION:PT1H30M ! RRULE:FREQ=DAILY;INTERVAL=1 END:VEVENT BEGIN:VEVENT ! SEQUENCE:4 ! DTSTAMP:20020918T224352Z ! SUMMARY:Monthly UNTIL 5 times ! UID:99730FF6-92C7-11D7-A4A2-000A95690022 ! DTSTART;TZID=US/Pacific:20020919T140000 ! DURATION:PT1H30M ! RRULE:FREQ=MONTHLY;COUNT=5;INTERVAL=1;BYMONTHDAY=19 END:VEVENT BEGIN:VEVENT ! SEQUENCE:11 ! UID:997311A2-92C7-11D7-A4A2-000A95690022 ! DTSTAMP:20020918T224449Z ! SUMMARY:Monthly UNTiL date ! DTSTART;TZID=US/Pacific:20020919T160000 ! DTEND;TZID=US/Pacific:20020919T180000 ! RRULE:FREQ=MONTHLY;UNTIL=20021223T075959;INTERVAL=1;BYMONTHDAY=19 END:VEVENT BEGIN:VEVENT ! SEQUENCE:7 ! DTSTAMP:20020918T224617Z ! SUMMARY:Every two weeks on certain days ! UID:99731350-92C7-11D7-A4A2-000A95690022 ! STATUS:CONFIRMED ! DTSTART;TZID=US/Pacific:20020920T150000 ! DURATION:PT1H30M ! RRULE:FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR END:VEVENT + BEGIN:VTODO + SUMMARY:This is a todo item + SEQUENCE:1 + UID:997316C8-92C7-11D7-A4A2-000A95690022 + DTSTAMP:20021015T173308Z + DTSTART;TZID=US/Pacific:20021015T103220 + END:VTODO + BEGIN:VTODO + SEQUENCE:2 + DTSTAMP:20021016T174840Z + SUMMARY:abc + COMPLETED;TZID=US/Pacific:20021016T104840 + UID:997318C6-92C7-11D7-A4A2-000A95690022 + STATUS:COMPLETED + DTSTART;TZID=US/Pacific:20021015T103220 + END:VTODO + BEGIN:VTODO + SEQUENCE:2 + DTSTAMP:20021016T174842Z + SUMMARY:zzz + COMPLETED;TZID=US/Pacific:20021016T104842 + UID:99731AB0-92C7-11D7-A4A2-000A95690022 + STATUS:COMPLETED + DTSTART;TZID=US/Pacific:20021015T103220 + END:VTODO BEGIN:VEVENT ! SEQUENCE:9 ! DTSTAMP:20021016T175751Z ! RECURRENCE-ID;TZID=US/Pacific:20021115T150000 ! DTSTART;TZID=US/Pacific:20021115T150000 ! STATUS:CONFIRMED ! UID:99731350-92C7-11D7-A4A2-000A95690022 ! DURATION:PT1H30M END:VEVENT BEGIN:VEVENT ! UID:99730AB4-92C7-11D7-A4A2-000A95690022 ! RECURRENCE-ID;TZID=US/Pacific:20021122T120000 ! DTSTART;TZID=US/Pacific:20021122T104500 ! DURATION:PT1H30M END:VEVENT BEGIN:VEVENT ! SEQUENCE:1 ! DTSTAMP:20030108T205712Z SUMMARY:New Event ! UID:99731CF6-92C7-11D7-A4A2-000A95690022 ! DTSTART;TZID=US/Pacific:20030107T130000 DURATION:PT1H END:VEVENT END:VCALENDAR --- School.ics DELETED --- --- alldays.ics DELETED --- --- birthdays.ics DELETED --- --- greg.ics DELETED --- --- recur.ics DELETED --- --- vtodo.ics DELETED --- |
From: <cl...@us...> - 2003-05-30 00:45:23
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv15712/functions Modified Files: admin_functions.php ical_parser.php init.inc.php Log Message: Cleaned up look and feel of admin pages, corrected some error_reporting. Index: admin_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/admin_functions.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin_functions.php 29 May 2003 05:08:34 -0000 1.1 --- admin_functions.php 30 May 2003 00:45:20 -0000 1.2 *************** *** 51,58 **** // set up basic connection ! $conn_id = ftp_connect($ftp_server); // login with username and password ! $login_result = ftp_login($conn_id, $username, $password); // check connection --- 51,58 ---- // set up basic connection ! $conn_id = @ftp_connect($ftp_server); // login with username and password ! $login_result = @ftp_login($conn_id, $username, $password); // check connection *************** *** 62,66 **** // close the FTP stream ! ftp_close($conn_id); return TRUE; --- 62,66 ---- // close the FTP stream ! @ftp_close($conn_id); return TRUE; *************** *** 97,104 **** // set up basic connection ! $conn_id = ftp_connect($ftp_server); // login with username and password ! $login_result = ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']); // check connection --- 97,104 ---- // set up basic connection ! $conn_id = @ftp_connect($ftp_server); // login with username and password ! $login_result = @ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']); // check connection *************** *** 107,111 **** // delete the file ! $delete = ftp_delete($conn_id, $filename); // check delete status --- 107,111 ---- // delete the file ! $delete = @ftp_delete($conn_id, $filename); // check delete status *************** *** 114,118 **** // close the FTP stream ! ftp_close($conn_id); return TRUE; --- 114,118 ---- // close the FTP stream ! @ftp_close($conn_id); return TRUE; Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** ical_parser.php 29 May 2003 18:28:00 -0000 1.90 --- ical_parser.php 30 May 2003 00:45:20 -0000 1.91 *************** *** 459,463 **** foreach($bymonth as $month) { $year = date('Y', $next_range_time); ! if (is_array($byday)) { $checkdate_time = mktime(0,0,0,$month,1,$year); foreach($byday as $day) { --- 459,463 ---- foreach($bymonth as $month) { $year = date('Y', $next_range_time); ! if ((isset($byday)) && (is_array($byday))) { $checkdate_time = mktime(0,0,0,$month,1,$year); foreach($byday as $day) { Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** init.inc.php 29 May 2003 18:28:00 -0000 1.31 --- init.inc.php 30 May 2003 00:45:20 -0000 1.32 *************** *** 7,11 **** // uncomment when developing, comment for shipping version ! error_reporting (E_ALL); if (!defined('BASE')) define('BASE', './'); --- 7,11 ---- // uncomment when developing, comment for shipping version ! //error_reporting (E_ALL); if (!defined('BASE')) define('BASE', './'); |
From: <cl...@us...> - 2003-05-30 00:45:23
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv15712 Modified Files: admin.php preferences.php Log Message: Cleaned up look and feel of admin pages, corrected some error_reporting. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** admin.php 29 May 2003 18:28:00 -0000 1.3 --- admin.php 30 May 2003 00:45:20 -0000 1.4 *************** *** 16,19 **** --- 16,21 ---- if($HTTP_GET_VARS) {extract($HTTP_GET_VARS, EXTR_PREFIX_SAME, "get_");} + if (!isset($action)) $action = ''; + // Logout by clearing session variables if ((isset($action)) && ($action == "logout")) { *************** *** 58,75 **** <tr> <td align="center" valign="middle"> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="left" width="20" class="navback"> </td> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td> ! <td align="right" width="20" class="navback" nowrap valign="middle"><font class="G10"><?php if ($auth_method != "none" && $is_loged_in == TRUE) { echo "<a href=\"{$HTTP_SERVER_VARS['PHP_SELF']}?action=logout\">{$logout_lang}</a>"; } ?></font> </td> ! </tr> ! <tr> ! <td colspan="3" class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> ! <td align="left" width="20"> </td> ! <td colspan="2"> ! <?php --- 60,99 ---- <tr> <td align="center" valign="middle"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> ! <td align="left" width="120" class="navback"><?php echo '<a href="'.BASE.'"><img src="'.BASE.'styles/'.$style_sheet.'/back.gif" alt=" " border="0" align="left"></a>'; ?></td> ! <td class="navback"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td> ! </tr> ! </table> ! </td> ! <td align="right" width="120" class="navback"> ! <table width="120" border="0" cellpadding="0" cellspacing="0"> ! <tr> ! <td><?php echo '<a class="psf" href="'.BASE.'day.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/day_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'week.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/week_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'month.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/month_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'year.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/year_on.gif" alt=" " border="0"></a></td>'; ?> ! </tr> ! </table> ! </td> </tr> + </table> + </td> + </tr> + <tr> + <td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> + </tr> + <tr> + <td class="G10" align="right"><?php if ($auth_method != "none" && $is_loged_in == TRUE) { echo "<a href=\"{$HTTP_SERVER_VARS['PHP_SELF']}?action=logout\">{$logout_lang}</a>"; } ?> </td> + </tr> + <tr> + <td> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B"> <tr> ! <td width="2%"></td> ! <td width="98%" valign="top" align="left"> <?php *************** *** 131,135 **** // Add or Update a calendar ! if ($action == "addupdate") { $addupdate_msg = ""; --- 155,161 ---- // Add or Update a calendar ! $addupdate_msg = ''; ! $delete_msg = ''; ! if ((isset($action)) && ($action == "addupdate")) { $addupdate_msg = ""; Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** preferences.php 29 May 2003 18:33:44 -0000 1.27 --- preferences.php 30 May 2003 00:45:20 -0000 1.28 *************** *** 97,104 **** <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td><?php echo '<a class="psf" href="'.BASE.'day.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/day_on.gif" alt=" " border="0"></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'week.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/week_on.gif" alt=" " border="0"></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'month.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/month_on.gif" alt=" " border="0"></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'year.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/year_on.gif" alt=" " border="0"></td>'; ?> </tr> </table> --- 97,104 ---- <table width="120" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td><?php echo '<a class="psf" href="'.BASE.'day.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/day_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'week.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/week_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'month.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/month_on.gif" alt=" " border="0"></a></td>'; ?> ! <td><?php echo '<a class="psf" href="'.BASE.'year.php?cal='.$cal.'&getdate='.$getdate.'"><img src="'.BASE.'styles/'.$style_sheet.'/year_on.gif" alt=" " border="0"></a></td>'; ?> </tr> </table> |
From: <cl...@us...> - 2003-05-29 18:33:48
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv26270 Modified Files: preferences.php Log Message: more error_reporting Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** preferences.php 25 Feb 2003 17:35:22 -0000 1.26 --- preferences.php 29 May 2003 18:33:44 -0000 1.27 *************** *** 12,16 **** if ($allow_preferences == 'no') header("Location: $back_page"); ! $action = $HTTP_GET_VARS['action']; $startdays = array ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'); --- 12,21 ---- if ($allow_preferences == 'no') header("Location: $back_page"); ! if (isset($HTTP_GET_VARS['action'])) { ! $action = $HTTP_GET_VARS['action']; ! } else { ! $action = ''; ! } ! $startdays = array ('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'); *************** *** 33,37 **** } ! if ($HTTP_COOKIE_VARS['phpicalendar']) { $phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar'])); $cookie_language = $phpicalendar['cookie_language']; --- 38,42 ---- } ! if (isset($HTTP_COOKIE_VARS['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar'])); $cookie_language = $phpicalendar['cookie_language']; *************** *** 294,298 **** </td> </tr> ! <?php if ($HTTP_COOKIE_VARS['phpicalendar']) { ?> <tr> <td align="left" valign="top" nowrap><?php echo "$unset_prefs_lang"; ?></td> --- 299,303 ---- </td> </tr> ! <?php if (isset($HTTP_COOKIE_VARS['phpicalendar'])) { ?> <tr> <td align="left" valign="top" nowrap><?php echo "$unset_prefs_lang"; ?></td> |
From: <cl...@us...> - 2003-05-29 18:28:04
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv24363/functions Modified Files: ical_parser.php init.inc.php overlapping_events.php Log Message: More error_reporting cleanup. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** ical_parser.php 29 May 2003 06:27:15 -0000 1.89 --- ical_parser.php 29 May 2003 18:28:00 -0000 1.90 *************** *** 92,96 **** $beginning, $rrule_array, $start_of_vevent, $description, $valarm_description, $start_unixtime, $end_unixtime, ! $recurrence_id, $uid, $class, $attendee, $location, $organizer ); --- 92,96 ---- $beginning, $rrule_array, $start_of_vevent, $description, $valarm_description, $start_unixtime, $end_unixtime, ! $recurrence_id, $uid, $class, $location ); *************** *** 100,103 **** --- 100,105 ---- $count = 1000000; $valarm_set = FALSE; + $attendee = array(); + $organizer = array(); unset( *************** *** 142,146 **** if (!isset($description)) $description = $master_array[$old_start_date][$old_start_time][$uid]['description']; removeOverlap($start_date_tmp, $old_start_time, $uid); ! unset($master_array[$start_date_tmp][$old_start_time]); $write_processed = false; } else { --- 144,148 ---- if (!isset($description)) $description = $master_array[$old_start_date][$old_start_time][$uid]['description']; removeOverlap($start_date_tmp, $old_start_time, $uid); ! if (isset($master_array[$start_date_tmp][$old_start_time])) unset($master_array[$start_date_tmp][$old_start_time]); $write_processed = false; } else { Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** init.inc.php 29 May 2003 06:27:15 -0000 1.30 --- init.inc.php 29 May 2003 18:28:00 -0000 1.31 *************** *** 62,71 **** } } else { ! $calcheck = $calendar_path.'/'.$default_cal_check.'.ics'; ! $calcheckopen = @fopen($calcheck, "r"); ! if ($calcheckopen == FALSE) { ! $cal_filename = $default_cal; } else { ! $cal_filename = $default_cal_check; } } --- 62,75 ---- } } else { ! if (isset($default_cal_check)) { ! $calcheck = $calendar_path.'/'.$default_cal_check.'.ics'; ! $calcheckopen = @fopen($calcheck, "r"); ! if ($calcheckopen == FALSE) { ! $cal_filename = $default_cal; ! } else { ! $cal_filename = $default_cal_check; ! } } else { ! $cal_filename = $default_cal; } } Index: overlapping_events.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/overlapping_events.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** overlapping_events.php 15 Feb 2003 20:07:08 -0000 1.10 --- overlapping_events.php 29 May 2003 18:28:00 -0000 1.11 *************** *** 163,180 **** function removeOverlap($ol_start_date, $ol_start_time, $ol_key = 0) { global $master_array, $overlap_array; ! if (sizeof($overlap_array[$ol_start_date]) > 0) { ! $ol_end_time = $master_array[$ol_start_date][$ol_start_time][$ol_key]["event_end"]; ! foreach ($overlap_array[$ol_start_date] as $keyBlock => $blockId) { ! if (($blockId["blockStart"] <= $ol_start_time) or ($blockId["blockEnd"] >= $ol_start_time)) { ! foreach ($blockId["events"] as $keyEvent => $ol_event) { ! $master_array[$ol_start_date][$ol_event["time"]][$ol_event["key"]]["event_overlap"] -= 1; ! if (($ol_event["time"] == $ol_start_time) and ($ol_event["key"] == $ol_key)) { ! unset ($overlap_array[$ol_start_date][$keyBlock]["events"][$keyEvent]); } - } - if ($blockId["maxOverlaps"] = 1) { - unset ($overlap_array[$ol_start_date][$keyBlock]); - } else { - $blockId["maxOverlaps"] -= 1; } } --- 163,182 ---- function removeOverlap($ol_start_date, $ol_start_time, $ol_key = 0) { global $master_array, $overlap_array; ! if (isset($overlap_array[$ol_start_date])) { ! if (sizeof($overlap_array[$ol_start_date]) > 0) { ! $ol_end_time = $master_array[$ol_start_date][$ol_start_time][$ol_key]["event_end"]; ! foreach ($overlap_array[$ol_start_date] as $keyBlock => $blockId) { ! if (($blockId["blockStart"] <= $ol_start_time) or ($blockId["blockEnd"] >= $ol_start_time)) { ! foreach ($blockId["events"] as $keyEvent => $ol_event) { ! $master_array[$ol_start_date][$ol_event["time"]][$ol_event["key"]]["event_overlap"] -= 1; ! if (($ol_event["time"] == $ol_start_time) and ($ol_event["key"] == $ol_key)) { ! unset ($overlap_array[$ol_start_date][$keyBlock]["events"][$keyEvent]); ! } ! } ! if ($blockId["maxOverlaps"] = 1) { ! unset ($overlap_array[$ol_start_date][$keyBlock]); ! } else { ! $blockId["maxOverlaps"] -= 1; } } } |
From: <cl...@us...> - 2003-05-29 18:28:04
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv24363/includes Modified Files: footer.inc.php Log Message: More error_reporting cleanup. Index: footer.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/footer.inc.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** footer.inc.php 11 Mar 2003 23:02:20 -0000 1.5 --- footer.inc.php 29 May 2003 18:28:01 -0000 1.6 *************** *** 4,8 **** if ($enable_rss == 'yes') { echo "<br>\n"; ! if ($current_view == 'rssindex') { echo '<a style="color:gray" href="http://feeds.archive.org/validator/check?url='.$footer_check.'"><img src="'.BASE.'images/valid-rss.png" alt="[Valid RSS]" title="Validate my RSS feed" width="88" height="31" border="1" vspace="3" />'; } else { --- 4,8 ---- if ($enable_rss == 'yes') { echo "<br>\n"; ! if ((isset($current_view)) && ($current_view == 'rssindex')) { echo '<a style="color:gray" href="http://feeds.archive.org/validator/check?url='.$footer_check.'"><img src="'.BASE.'images/valid-rss.png" alt="[Valid RSS]" title="Validate my RSS feed" width="88" height="31" border="1" vspace="3" />'; } else { |
From: <cl...@us...> - 2003-05-29 18:28:03
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv24363 Modified Files: admin.php print.php Log Message: More error_reporting cleanup. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin.php 13 May 2003 04:14:22 -0000 1.2 --- admin.php 29 May 2003 18:28:00 -0000 1.3 *************** *** 17,21 **** // Logout by clearing session variables ! if ($action == "logout") { $HTTP_SESSION_VARS['phpical_loggedin'] = FALSE; unset($HTTP_SESSION_VARS['phpical_username']); --- 17,21 ---- // Logout by clearing session variables ! if ((isset($action)) && ($action == "logout")) { $HTTP_SESSION_VARS['phpical_loggedin'] = FALSE; unset($HTTP_SESSION_VARS['phpical_username']); *************** *** 78,83 **** // If User is Not Logged In, Display The Login Page if ($is_loged_in == FALSE) { ! if (isset($username)) $login_error = "<font color=\"red\">$invalid_login_lang</font>"; echo <<<EOT --- 78,86 ---- // If User is Not Logged In, Display The Login Page if ($is_loged_in == FALSE) { ! if (isset($username)) { $login_error = "<font color=\"red\">$invalid_login_lang</font>"; + } else { + $login_error = ''; + } echo <<<EOT Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** print.php 30 Nov 2002 21:05:39 -0000 1.15 --- print.php 29 May 2003 18:28:00 -0000 1.16 *************** *** 24,27 **** --- 24,29 ---- $print_next_nav = $next_day_lang; $print_prev_nav = $last_day_lang; + $week_start = ''; + $week_end = ''; } elseif ($printview == 'week') { $start_week = localizeDate($dateFormat_week, $start_week_time); *************** *** 42,45 **** --- 44,49 ---- $print_next_nav = $next_month_lang; $print_prev_nav = $last_month_lang; + $week_start = ''; + $week_end = ''; } |
From: <cl...@us...> - 2003-05-29 06:27:18
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv24719/functions Modified Files: date_functions.php ical_parser.php init.inc.php Log Message: Fixed a tons of E_ALL errors for smoother installs. Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** date_functions.php 28 May 2003 04:19:25 -0000 1.13 --- date_functions.php 29 May 2003 06:27:14 -0000 1.14 *************** *** 171,185 **** $event_text = strip_tags($event_text, '<b><i><u>'); } ! if ($arr["organizer"]) { $organizer = urlencode(addslashes($arr["organizer"])); } ! if ($arr["attendee"]) { $attendee = urlencode(addslashes($arr["attendee"])); } ! if ($arr["location"]) { ! $organizer = $arr["location"]; } ! if ($arr["status"]) { ! $organizer = $arr["status"]; } if ($event_text != "") { --- 171,193 ---- $event_text = strip_tags($event_text, '<b><i><u>'); } ! if (isset($arr["organizer"])) { $organizer = urlencode(addslashes($arr["organizer"])); + } else { + $organizer = ''; } ! if (isset($arr["attendee"])) { $attendee = urlencode(addslashes($arr["attendee"])); + } else { + $attendee = ''; } ! if (isset($arr["location"])) { ! $location = $arr["location"]; ! } else { ! $location = ''; } ! if (isset($arr["status"])) { ! $status = $arr["status"]; ! } else { ! $status = ''; } if ($event_text != "") { Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** ical_parser.php 28 May 2003 04:19:25 -0000 1.88 --- ical_parser.php 29 May 2003 06:27:15 -0000 1.89 *************** *** 95,103 **** ); ! $except_dates = array(); ! $except_times = array(); $first_duration = TRUE; ! $count = 1000000; ! $valarm_set = FALSE; unset( --- 95,103 ---- ); ! $except_dates = array(); ! $except_times = array(); $first_duration = TRUE; ! $count = 1000000; ! $valarm_set = FALSE; unset( *************** *** 110,120 **** // CLASS support ! if ($class == 'PRIVATE') { ! $summary ='**PRIVATE**'; ! $description ='**PRIVATE**'; ! } elseif ($class == 'CONFIDENTIAL') { ! $summary ='**CONFIDENTIAL**'; ! $description ='**CONFIDENTIAL**'; ! } // make sure we have some value for $uid --- 110,122 ---- // CLASS support ! if (isset($class)) { ! if ($class == 'PRIVATE') { ! $summary ='**PRIVATE**'; ! $description ='**PRIVATE**'; ! } elseif ($class == 'CONFIDENTIAL') { ! $summary ='**CONFIDENTIAL**'; ! $description ='**CONFIDENTIAL**'; ! } ! } // make sure we have some value for $uid *************** *** 146,151 **** } ! if (!isset($summary)) $summary = ''; ! if (!isset($description)) $description = ''; $mArray_begin = mktime (0,0,0,12,21,($this_year - 1)); --- 148,156 ---- } ! if (!isset($summary)) $summary = ''; ! if (!isset($description)) $description = ''; ! if (!isset($status)) $status = ''; ! if (!isset($class)) $class = ''; ! if (!isset($location)) $location = ''; $mArray_begin = mktime (0,0,0,12,21,($this_year - 1)); *************** *** 180,184 **** // RECURRENCE-ID Support ! if ($recurrence_d) { $recurrence_delete["$recurrence_d"]["$recurrence_t"] = $uid; } --- 185,190 ---- // RECURRENCE-ID Support ! if (isset($recurrence_d)) { ! $recurrence_delete["$recurrence_d"]["$recurrence_t"] = $uid; } *************** *** 187,190 **** --- 193,198 ---- // Maybe this is no longer need since done at bottom of parser? - CL 11/20/02 if ($uid_valid && $write_processed) { + if (!isset($hour)) $hour = 00; + if (!isset($minute)) $minute = 00; $processed[$uid] = array($start_date,($hour.$minute)); } *************** *** 909,913 **** } } ! //print '<pre>'; // Remove pesky recurrences if (is_array($recurrence_delete)) { --- 917,923 ---- } } ! ! /* ! //print '<pre>'; // Remove pesky recurrences if (is_array($recurrence_delete)) { *************** *** 944,948 **** } } ! } // Sort the array by absolute date. if (isset($master_array) && is_array($master_array)) { --- 954,960 ---- } } ! } ! ! */ // Sort the array by absolute date. if (isset($master_array) && is_array($master_array)) { Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** init.inc.php 9 May 2003 20:28:57 -0000 1.29 --- init.inc.php 29 May 2003 06:27:15 -0000 1.30 *************** *** 7,16 **** // uncomment when developing, comment for shipping version ! // error_reporting (E_ALL); if (!defined('BASE')) define('BASE', './'); include(BASE.'config.inc.php'); include(BASE.'functions/error.php'); ! if ($HTTP_COOKIE_VARS['phpicalendar']) { $phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar'])); if (isset($phpicalendar['cookie_language'])) $language = $phpicalendar['cookie_language']; --- 7,16 ---- // uncomment when developing, comment for shipping version ! error_reporting (E_ALL); if (!defined('BASE')) define('BASE', './'); include(BASE.'config.inc.php'); include(BASE.'functions/error.php'); ! if (isset($HTTP_COOKIE_VARS['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($HTTP_COOKIE_VARS['phpicalendar'])); if (isset($phpicalendar['cookie_language'])) $language = $phpicalendar['cookie_language']; |
From: <cl...@us...> - 2003-05-29 06:27:18
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv24719 Modified Files: day.php week.php Log Message: Fixed a tons of E_ALL errors for smoother installs. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** day.php 28 May 2003 04:19:25 -0000 1.89 --- day.php 29 May 2003 06:27:14 -0000 1.90 *************** *** 34,38 **** $nbrGridCols = 1; ! if (is_array($master_array[($getdate)])) { foreach($master_array[($getdate)] as $ovlKey => $ovlValue) { if ($ovlKey != '-1') { --- 34,38 ---- $nbrGridCols = 1; ! if (isset($master_array[($getdate)])) { foreach($master_array[($getdate)] as $ovlKey => $ovlValue) { if ($ovlKey != '-1') { *************** *** 60,64 **** ?> ! <?php if (is_array($master_array['-2'])) include (BASE.'functions/todo.js'); ?> </head> <body bgcolor="#FFFFFF"> --- 60,64 ---- ?> ! <?php if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); ?> </head> <body bgcolor="#FFFFFF"> *************** *** 102,106 **** <?php // The all day events returned here. ! if ($master_array[($getdate)]['-1']) { echo "<tr>\n"; echo '<td colspan="3" height="24">'."\n"; --- 102,106 ---- <?php // The all day events returned here. ! if (isset($master_array[($getdate)]['-1'])) { echo "<tr>\n"; echo '<td colspan="3" height="24">'."\n"; *************** *** 180,184 **** // add events that overlap $day_start instead of cutting them out completely ! if ("$day_start" == "$cal_time" && is_array($master_array[$getdate])) { foreach($master_array[$getdate] as $time_key => $time_arr) { if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { --- 180,184 ---- // add events that overlap $day_start instead of cutting them out completely ! if ("$day_start" == "$cal_time" && isset($master_array[$getdate])) { foreach($master_array[$getdate] as $time_key => $time_arr) { if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') { Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** week.php 29 May 2003 05:07:54 -0000 1.89 --- week.php 29 May 2003 06:27:14 -0000 1.90 *************** *** 59,63 **** } ?> ! <?php if (is_array($master_array['-2'])) include (BASE.'functions/todo.js'); ?> </head> <body bgcolor="#FFFFFF"> --- 59,63 ---- } ?> ! <?php if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); ?> </head> <body bgcolor="#FFFFFF"> |
From: <cl...@us...> - 2003-05-29 05:33:59
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv8681 Modified Files: month.php Log Message: minor tweekages Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** month.php 29 May 2003 05:28:36 -0000 1.88 --- month.php 29 May 2003 05:33:55 -0000 1.89 *************** *** 161,166 **** echo "<tr>\n"; if (!isset($val["event_start"])) { ! echo "<td align=center>"; ! openevent("$calendar_name", "", "", $val, "<font class=\"V10\"><i>", "</i></font>"); --- 161,167 ---- echo "<tr>\n"; if (!isset($val["event_start"])) { ! echo '<td align="center">'; ! openevent("$calendar_name", "", "", $val, $month_event_lines, ! 12, "<font class=\"V10\"><i>", "</i></font>"); *************** *** 172,176 **** $event_end = date($timeFormat, @strtotime ("$event_end")); echo "<td align=\"left\" valign=\"top\">"; ! openevent("$calendar_name", "$event_start", "$event_end", --- 173,177 ---- $event_end = date($timeFormat, @strtotime ("$event_end")); echo "<td align=\"left\" valign=\"top\">"; ! @openevent("$calendar_name", "$event_start", "$event_end", |
From: <cl...@us...> - 2003-05-29 05:28:40
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv7346 Modified Files: month.php Log Message: Month.php now does new javascript popups. Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** month.php 9 May 2003 20:28:56 -0000 1.87 --- month.php 29 May 2003 05:28:36 -0000 1.88 *************** *** 58,62 **** } ?> - <?php include (BASE.'functions/event.js'); ?> </head> <body> --- 58,61 ---- *************** *** 158,193 **** foreach ($event_times as $val) { $num_of_events++; ! $event_text = stripslashes(urldecode($val["event_text"])); ! $event_text = strip_tags($event_text, '<b><i><u>'); ! if ($event_text != "") { ! $event_text2 = addslashes($val["event_text"]); ! $event_text2 = urlencode($event_text2); ! $description = addslashes($val["description"]); ! $description = urlencode($description); ! $event_start = @$val["event_start"]; ! $event_end = @$val["event_end"]; ! $event_start = date ($timeFormat, @strtotime ("$event_start")); ! $event_start2 = date ($timeFormat_small, @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, 12, $month_event_lines); ! $status = $val["status"]; ! echo "<tr>\n"; ! echo "<td>\n"; ! echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; ! echo "<tr>\n"; ! if (!isset($val["event_start"])) { ! $event_start = ''; ! $event_end = ''; ! echo "<td><font class=\"V10\"><center><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><i>$event_text</i></a></center></font></td>\n"; ! } else { ! echo "<td align=\"left\" valign=\"top\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><font class=\"V9\"> $event_start2 $event_text</font></a></td>\n"; ! } ! echo "</tr>\n"; ! echo "</table>\n"; ! echo "</td>\n"; ! echo "</tr>\n"; } } } --- 157,187 ---- foreach ($event_times as $val) { $num_of_events++; ! echo "<tr><td>\n"; ! echo "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\">"; ! echo "<tr>\n"; ! if (!isset($val["event_start"])) { ! echo "<td align=center>"; ! openevent("$calendar_name", "", "", $val, ! "<font class=\"V10\"><i>", ! "</i></font>"); ! } else { ! $event_start = @$val["event_start"]; ! $event_end = @$val["event_end"]; ! $event_start = date($timeFormat, @strtotime ("$event_start")); ! $start2 = date($timeFormat_small,@strtotime("$event_start")); ! $event_end = date($timeFormat, @strtotime ("$event_end")); ! echo "<td align=\"left\" valign=\"top\">"; ! openevent("$calendar_name", ! "$event_start", ! "$event_end", ! $val, ! $month_event_lines, ! 12, ! "<font class=\"V9\"> $start2 ", ! "</font>"); } + echo "</td></tr>\n"; + echo "</table>\n"; + echo "</td></tr>\n"; } } *************** *** 257,267 **** foreach ($new_val as $new_key2 => $new_val2) { if ($new_val2["event_text"]) { - $event_text = stripslashes(urldecode($new_val2["event_text"])); - $event_text2 = addslashes($new_val2["event_text"]); - $event_text2 = str_replace("\"", """, $event_text2); - $event_text2 = urlencode($event_text2); - $description = addslashes(urlencode($new_val2["description"])); - $description = str_replace("\"", """, $description); - $status = $new_val2["status"]; if (isset($new_val2["event_start"])) { $event_start = $new_val2["event_start"]; --- 251,254 ---- *************** *** 269,287 **** $event_start = date ($timeFormat, strtotime ("$event_start")); $event_end = date ($timeFormat, strtotime ("$event_end")); - $event_text = str_replace ("<br>", "", $event_text); $event_start2 = $event_start; } else { $event_start = "$all_day_lang"; $event_start2 = ''; ! $event_end = ''; } ! if (strlen($event_text) > 70) { ! $event_text = substr("$event_text", 0, 65); ! $event_text = $event_text . "..."; } ! echo "<tr>\n"; echo "<td align=\"left\" valign=\"top\" width =\"160\" class=\"montheventline\" nowrap><font $fontclass> <a class=\"psf\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a></font> <font class=\"V9G\">($event_start)</font></td>\n"; echo "<td align=\"left\" valign=\"top\" colspan=\"2\">\n"; ! echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n"; echo "</td>\n"; echo "</tr>\n"; --- 256,278 ---- $event_start = date ($timeFormat, strtotime ("$event_start")); $event_end = date ($timeFormat, strtotime ("$event_end")); $event_start2 = $event_start; } else { $event_start = "$all_day_lang"; $event_start2 = ''; ! $event_end = ''; } ! echo "<tr>\n"; echo "<td align=\"left\" valign=\"top\" width =\"160\" class=\"montheventline\" nowrap><font $fontclass> <a class=\"psf\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a></font> <font class=\"V9G\">($event_start)</font></td>\n"; echo "<td align=\"left\" valign=\"top\" colspan=\"2\">\n"; ! openevent("$calendar_name", ! "$event_start", ! "$event_end", ! $new_val2, ! 0, ! 65, ! "<font class=\"G10B\"> ", ! "</font>"); ! //echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n"; echo "</td>\n"; echo "</tr>\n"; |
From: <cl...@us...> - 2003-05-29 05:08:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv3285/functions Added Files: admin_functions.php Log Message: Did I forget to add the admin_functions.php page? --- NEW FILE: admin_functions.php --- <?php // Is the user logged in // // returns boolean is the user logged in function is_loggedin () { global $HTTP_SESSION_VARS; if (!isset($HTTP_SESSION_VARS['phpical_loggedin']) || $HTTP_SESSION_VARS['phpical_loggedin'] == FALSE) { return FALSE; } else return TRUE; } // Attempt to login. If login is valid, set the session variable 'phpical_loggedin' to TRUE and store the username and password in the session // // arg0: string username // arg1: string password // returns boolean was the login successful function login ($username, $password) { global $HTTP_SESSION_VARS; global $auth_method; switch ($auth_method) { case 'ftp': $loggedin = login_ftp($username, $password); break; case 'internal': $loggedin = login_internal($username, $password); break; default: $loggedin = FALSE; } $HTTP_SESSION_VARS['phpical_loggedin'] = $loggedin; if ($loggedin) { $HTTP_SESSION_VARS['phpical_username'] = $username; $HTTP_SESSION_VARS['phpical_password'] = $password; } return $loggedin; } // Attempt to login to the ftp server // // arg0: string username // arg1: string password // returns boolean was login successful function login_ftp ($username, $password) { global $ftp_server; // set up basic connection $conn_id = ftp_connect($ftp_server); // login with username and password $login_result = ftp_login($conn_id, $username, $password); // check connection if ((!$conn_id) || (!$login_result)) { return FALSE; } // close the FTP stream ftp_close($conn_id); return TRUE; } // Attempt to login using username and password defined in config.inc.php // // arg0: string username // arg1: string password // returns boolean was login successful function login_internal ($username, $password) { global $auth_internal_username; global $auth_internal_password; if ($auth_internal_username == $username && $auth_internal_password == $password) return TRUE; else return FALSE; } // Delete a calendar. If using ftp for authentication, use ftp to delete. Otherwise, use file system functions. // // arg0: string calendar file - not the full path // returns boolean was delete successful function delete_cal ($filename) { global $HTTP_SESSION_VARS; global $auth_method; global $ftp_server; global $calendar_path; global $ftp_calendar_path; if ($auth_method == 'ftp') { $filename = get_ftp_calendar_path() . "/" . $filename; // set up basic connection $conn_id = ftp_connect($ftp_server); // login with username and password $login_result = ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']); // check connection if ((!$conn_id) || (!$login_result)) return FALSE; // delete the file $delete = ftp_delete($conn_id, $filename); // check delete status if (!$delete) return FALSE; // close the FTP stream ftp_close($conn_id); return TRUE; } else { $filename = $calendar_path . "/" . $filename; $delete = @unlink($filename); clearstatcache(); if (@file_exists($filename)) { $filesys = eregi_replace("/","\\", $filename); $delete = @system("del $filesys"); clearstatcache(); if (@file_exists($filename)) { $delete = @chmod ($filename, 0775); $delete = @unlink($filename); $delete = @system("del $filesys"); } } clearstatcache(); if (@file_exists($filename)) { return FALSE; } else { return TRUE; } return TRUE; } } // Copy the uploaded calendar. If using ftp for authentication, use ftp to copy. Otherwise, use file system functions. // // arg0: string full path to calendar file // arg1: string destination filename // returns boolean was copy successful function copy_cal ($source, $destination) { global $HTTP_SESSION_VARS; global $auth_method; global $ftp_server; global $calendar_path; if ($auth_method == 'ftp') { $destination = get_ftp_calendar_path() . "/" . basename($destination); $destination = str_replace ("\\", "/", realpath($destination)); // set up basic connection $conn_id = ftp_connect($ftp_server); // login with username and password $login_result = ftp_login($conn_id, $HTTP_SESSION_VARS['phpical_username'], $HTTP_SESSION_VARS['phpical_password']); // check connection if ((!$conn_id) || (!$login_result)) return FALSE; // upload the file $upload = ftp_put($conn_id, $destination, $source, FTP_ASCII); // check upload status if (!$upload) return FALSE; // close the FTP stream ftp_close($conn_id); return TRUE; } else { $destination = $calendar_path . "/" . basename($destination); if (check_php_version('4.0.3')) { return move_uploaded_file($source, $destination); } else { return copy($source, $destination); } } } // Find the full path to the caledar directory for use with ftp // if $ftp_calendar_path == '', sends back the full path to the $calendar_path - this may not work depending // on ftp server config, but would be a best guess // // return string path to calendar directory for ftp operations function get_ftp_calendar_path() { global $ftp_calendar_path; global $calendar_path; if ($ftp_calendar_path != '') return $ftp_calendar_path; else { return str_replace ("\\", "/", realpath($calendar_path)); } } // Check to see if the current version of php is >= to the arguement // // arg0: string version of php to check against // return boolean true if $version is >= current php version function check_php_version($version) { // intval used for version like "4.0.4pl1" $testVer=intval(str_replace(".", "",$version)); $curVer=intval(str_replace(".", "",phpversion())); if( $curVer < $testVer ) return FALSE; return TRUE; } // Is the file uploaded truly a file via HTTP POST - used to thwart a user from trying to trick the script from working on other files // // arg0: string filename // returns boolean is the uploaded a file function is_uploaded_file_v4 ($filename) { if (!$tmp_file = get_cfg_var('upload_tmp_dir')) { $tmp_file = dirname(tempnam('', '')); } $tmp_file .= '/' . basename($filename); // For Windows compat $filename = str_replace ("\\", "/", $filename); $tmp_file = str_replace ("\\", "/", $tmp_file); // User might have trailing slash in php.ini... return (ereg_replace('/+', '/', $tmp_file) == $filename); } // return the appropriate error message if the file upload had an error // // arg0: array error number from $HTTP_POST_FILES[file]['error'] // returns string error message function get_upload_error ($upload_error) { global $php_error_lang; global $upload_error_lang; global $upload_error_gen_lang; if (isset($upload_error)) { // This is only available in PHP >= 4.2.0 $error = $php_error_lang . " "; switch($upload_error) { case 0: //no error; possible file attack! case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form case 3: //uploaded file was only partially uploaded case 4: //no file was uploaded $error = $error . $upload_error . ": " . $upload_error_lang[$upload_error]; break; default: //a default error, just in case! :) $error = $error . $upload_error . ": " . $upload_error_gen_lang; break; } } else { $error = $upload_error_gen_lang; } return $error; } // Check to see that the file has an .ics extension // // arg0: string filename // returns booloean does the filename end in .ics function is_uploaded_ics ($filename) { // Check the file extension for .ics. Can also check the the mime type, but it's not reliable so why bother... if(preg_match("/.ics$/i", $filename)) { return TRUE; } else { return FALSE; } } // Get all calendar filenames (not including path) // // argo: string path to calendar files // returns array filenames (not including path) function get_calendar_files($calendar_path) { global $error_path_lang; $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path))); $filelist = array(); while ($file = readdir($dir_handle)) { if (substr($file, -4) == ".ics") { array_push($filelist, $file); } } closedir($dir_handle); natcasesort($filelist); return $filelist; } ?> |
From: <cl...@us...> - 2003-05-29 05:07:58
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv3129 Modified Files: README week.php Log Message: Week.php now supports new javascript popup. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** README 9 May 2003 20:28:56 -0000 1.45 --- README 29 May 2003 05:07:53 -0000 1.46 *************** *** 79,83 **** --- 79,85 ---- -Added support for LOCATION -Added support for ATTENDEE + -Added support for ORGANIZER -Added support for STATUS + -New javascript functions provide additional information. -Added the ability to correct the servers time display -Added admin.php for administration of calendars (uses cookies). See config.inc.php for configuration. Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** week.php 9 May 2003 20:28:56 -0000 1.88 --- week.php 29 May 2003 05:07:54 -0000 1.89 *************** *** 59,63 **** } ?> - <?php include (BASE.'functions/event.js'); ?> <?php if (is_array($master_array['-2'])) include (BASE.'functions/todo.js'); ?> </head> --- 59,62 ---- *************** *** 178,199 **** if (isset($master_array[($thisday)]["-1"])) { echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\" class=\"V9\">\n"; ! foreach($master_array[($thisday)]["-1"] as $allday) { ! $all_day_text = stripslashes(urldecode($allday["event_text"])); ! $event_text2 = urlencode(addslashes($all_day_text)); ! $all_day_text = word_wrap($all_day_text, 12, $allday_week_lines); ! $description = addslashes(urlencode($allday["description"])); ! $status = $allday["status"]; ! $event_start = ''; ! $event_end = ''; echo "<tr>\n"; ! echo "<td valign=\"top\" align=\"center\" class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start', '$event_end', '$description', '$status')\"><font color=\"#ffffff\">$all_day_text</font></a></td>\n"; ! echo "</tr>\n"; ! } ! echo "</table>\n"; ! } echo "</td>\n"; $thisdate = ($thisdate + (25 * 60 * 60)); $i++; ! } while ($i < 7); echo "</tr>\n"; } --- 177,199 ---- if (isset($master_array[($thisday)]["-1"])) { echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"4\" class=\"V9\">\n"; ! foreach($master_array[($thisday)]["-1"] as $allday) { echo "<tr>\n"; ! echo "<td valign=\"top\" align=\"center\" class=\"eventbg\">"; ! openevent("$calendar_name", ! "", ! "", ! $allday, ! $allday_week_lines, ! 12, ! '<font color="#ffffff">', ! "</font>"); ! echo "</td></tr>\n"; ! } ! echo "</table>\n"; ! } echo "</td>\n"; $thisdate = ($thisdate + (25 * 60 * 60)); $i++; ! } while ($i < 7); echo "</tr>\n"; } *************** *** 294,309 **** switch ($event_length[$thisday][$i]["state"]) { case "begin": - $event_length[$thisday][$i]["state"] = "started"; - $event_text = stripslashes(urldecode($this_time_arr[($event_length[$thisday][$i]["key"])]["event_text"])); - $event_text = word_wrap($event_text, 25, $week_events_lines); - $event_text2 = urlencode(addslashes($this_time_arr[($event_length[$thisday][$i]["key"])]["event_text"])); $event_start = $this_time_arr[($event_length[$thisday][$i]["key"])]["start_unixtime"]; - $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; - $description = urlencode(addslashes($this_time_arr[($event_length[$thisday][$i]["key"])]["description"])); $event_start = date ($timeFormat, $event_start); - $event_end = date ($timeFormat, $event_end); - $calendar_name2 = urlencode(addslashes($calendar_name)); - $status = $this_time_arr[($event_length[$thisday][$i]["key"])]["status"]; echo "<td rowspan=\"" . $event_length[$thisday][$i]["length"] . "\" colspan=\"" . $drawWidth . "\" align=\"left\" valign=\"top\" class=\"eventbg2week\">\n"; echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n"; --- 294,300 ---- *************** *** 315,320 **** echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n"; echo "<tr>\n"; ! echo "<td class=\"eventbg\"><a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description', '$status')\"><font class=\"V10W\">$event_text</font></a></td>\n"; ! echo "</tr>\n"; echo "</table>\n"; echo "</td>\n"; --- 306,321 ---- echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n"; echo "<tr>\n"; ! echo "<td class=\"eventbg\">"; ! $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; ! $event_end = date ($timeFormat, $event_end); ! openevent("$calendar_name2", ! "$event_start", ! "$event_end", ! $this_time_arr[($event_length[$thisday][$i]["key"])], ! $week_events_lines, ! 25, ! "<font class=\"V10W\">", ! "</font>"); ! echo "</td></tr>\n"; echo "</table>\n"; echo "</td>\n"; |
From: <cl...@us...> - 2003-05-28 04:19:29
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv16911/includes Modified Files: event.php Log Message: Started migration of javascript to function, added improved event.php for location, status, organizer, and attendees. Updated english language include. Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** event.php 10 Mar 2003 19:48:27 -0000 1.5 --- event.php 28 May 2003 04:19:25 -0000 1.6 *************** *** 35,38 **** --- 35,56 ---- } + if (isset($HTTP_GET_VARS['location']) && ($HTTP_GET_VARS['location'] !== '') ) { + $location = $HTTP_GET_VARS['location']; + } else { + $location = ''; + } + + if (isset($HTTP_GET_VARS['organizer']) && ($HTTP_GET_VARS['organizer'] !== '') ) { + $organizer = $HTTP_GET_VARS['organizer']; + } else { + $organizer = ''; + } + + if (isset($HTTP_GET_VARS['attendee']) && ($HTTP_GET_VARS['attendee'] !== '') ) { + $attendee = $HTTP_GET_VARS['attendee']; + } else { + $attendee = ''; + } + $event = rawurldecode($event); $event = stripslashes($event); *************** *** 42,45 **** --- 60,74 ---- $description = stripslashes($description); $description = str_replace('\\', '', $description); + $organizer = rawurldecode($organizer); + $organizer = stripslashes($organizer); + $organizer = str_replace('\\', '', $organizer); + $organizer = unserialize ($organizer); + $attendee = rawurldecode($attendee); + $attendee = stripslashes($attendee); + $attendee = str_replace('\\', '', $attendee); + $attendee = unserialize ($attendee); + $location = rawurldecode($location); + $location = stripslashes($location); + $location = str_replace('\\', '', $location); //$description = htmlspecialchars($description); $calendar_name2 = rawurldecode($calendar_name); *************** *** 86,97 **** </tr> <?php } ?> ! <?php if ($status) { ?> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td> ! <td align="left" colspan="2" class="V12"> ! <?php echo "$status"; ?></td> ! </tr> ! <?php } ?> </table> --- 115,167 ---- </tr> <?php } ?> + + <?php + + if ($organizer) { + $i = 0; + echo '<tr>'; + echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>'; + echo '<td align="left" colspan="2" class="V12">'; + echo $organizer_lang.' - '; + foreach ($organizer as $val) { + $organizers .= $organizer[$i]["name"].', '; + $i++; + } + $organizers = substr ($organizers, 0, -2); + echo $organizers.'</td></tr>'; + } + + if ($attendee) { + $i = 0; + echo '<tr>'; + echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>'; + echo '<td align="left" colspan="2" class="V12">'; + echo $attendee_lang.' - '; + foreach ($attendee as $val) { + $attendees .= $attendee[$i]["name"].', '; + $i++; + } + $attendees = substr ($attendees, 0, -2); + echo $attendees.'</td></tr>'; + } ! if ($status) { ! echo '<tr>'; ! echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>'; ! echo '<td align="left" colspan="2" class="V12">'; ! echo $status_lang.' - '.$status.'</td>'; ! echo '</tr>'; ! } ! ! if ($location) { ! echo '<tr>'; ! echo '<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>'; ! echo '<td align="left" colspan="2" class="V12">'; ! echo $location_lang.' - '.$location.'</td>'; ! echo '</tr>'; ! } ! ! ! ?> </table> |
From: <cl...@us...> - 2003-05-28 04:19:29
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv16911/functions Modified Files: date_functions.php ical_parser.php Log Message: Started migration of javascript to function, added improved event.php for location, status, organizer, and attendees. Updated english language include. Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** date_functions.php 8 Dec 2002 09:45:58 -0000 1.12 --- date_functions.php 28 May 2003 04:19:25 -0000 1.13 *************** *** 161,164 **** --- 161,207 ---- } + function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic) { + $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]; + } else { + $ev = $arr["event_text"]; + $event_text = strip_tags($event_text, '<b><i><u>'); + } + if ($arr["organizer"]) { + $organizer = urlencode(addslashes($arr["organizer"])); + } + if ($arr["attendee"]) { + $attendee = urlencode(addslashes($arr["attendee"])); + } + if ($arr["location"]) { + $organizer = $arr["location"]; + } + if ($arr["status"]) { + $organizer = $arr["status"]; + } + if ($event_text != "") { + if ($lines) $event_text = word_wrap($event_text, $wrap, $lines); + $dsc =urlencode(addslashes($arr["description"])); + echo "<a class=\"psf\" 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()"; + } else { + echo $res[1]; + } + echo "\">$clic$event_text</a>"; + } + } + ?> Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** ical_parser.php 11 Mar 2003 23:02:15 -0000 1.87 --- ical_parser.php 28 May 2003 04:19:25 -0000 1.88 *************** *** 228,232 **** } $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, '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); $start_tmp = strtotime('+1 day',$start_tmp); } --- 228,232 ---- } $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, '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) ); $start_tmp = strtotime('+1 day',$start_tmp); } *************** *** 234,238 **** } else { $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid); ! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, '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); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } --- 234,238 ---- } else { $nbrOfOverlaps = checkOverlap($start_date, $start_time, $end_time, $uid); ! $master_array[($start_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, '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) ); if (!$write_processed) $master_array[($start_date)][($hour.$minute)][$uid]['exception'] = true; } |
From: <cl...@us...> - 2003-05-28 04:19:29
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1:/tmp/cvs-serv16911/languages Modified Files: english.inc.php Log Message: Started migration of javascript to function, added improved event.php for location, status, organizer, and attendees. Updated english language include. Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** english.inc.php 13 May 2003 04:14:22 -0000 1.43 --- english.inc.php 28 May 2003 04:19:25 -0000 1.44 *************** *** 85,96 **** $todo_lang = 'To do items'; $unfinished_lang = 'Unfinished'; ! // ----- New for 0.9.1 ! ! $prefs_set_lang = 'Your preferences have been set.'; ! $prefs_unset_lang = 'Preferences unset. Changes will take place next page load.'; ! $unset_prefs_lang = 'Unset preferences:'; ! // - administration $admin_header_lang = 'PHP iCalendar Administration'; $username_lang = 'Username'; --- 85,98 ---- $todo_lang = 'To do items'; $unfinished_lang = 'Unfinished'; + $prefs_set_lang = 'Your preferences have been set.'; + $prefs_unset_lang = 'Preferences unset. Changes will take place next page load.'; + $unset_prefs_lang = 'Unset preferences:'; ! // ----- New for 0.9.2 ! $organizer_lang = 'Organizer'; ! $attendee_lang = 'Attendee'; ! $status_lang = 'Status'; ! $location_lang = 'Location'; $admin_header_lang = 'PHP iCalendar Administration'; $username_lang = 'Username'; |
From: <cl...@us...> - 2003-05-28 04:19:29
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv16911 Modified Files: day.php Log Message: Started migration of javascript to function, added improved event.php for location, status, organizer, and attendees. Updated english language include. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** day.php 9 May 2003 20:28:56 -0000 1.88 --- day.php 28 May 2003 04:19:25 -0000 1.89 *************** *** 59,64 **** } ?> ! <?php include (BASE.'functions/event.js'); ?> ! <?php if (is_array($master_array['-2'])) include (BASE.'functions/todo.js'); ?> </head> <body bgcolor="#FFFFFF"> --- 59,64 ---- } ?> ! ! <?php if (is_array($master_array['-2'])) include (BASE.'functions/todo.js'); ?> </head> <body bgcolor="#FFFFFF"> *************** *** 103,123 **** // The all day events returned here. if ($master_array[($getdate)]['-1']) { ! echo '<tr>'."\n"; ! echo '<td colspan="3" height="24">'."\n"; ! echo '<table width="100%" border="0" cellspacing="1" cellpadding="4">'."\n"; ! foreach($master_array[($getdate)]['-1'] as $allday) { ! $event_text = stripslashes(urldecode($allday['event_text'])); ! $description = addslashes(urlencode($allday['description'])); ! $event_text2 = rawurlencode(addslashes($allday['event_text'])); ! $status = $allday['status']; ! $event_start = ''; ! $event_end = ''; ! echo '<tr>'."\n"; ! echo '<td valign="top" align="center" class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\', \''.$status.'\')"><font color="#ffffff"><i>'.$event_text.'</i></font></a></td>'."\n"; ! echo '</tr>'."\n"; ! } ! echo '</table>'."\n"; ! echo '</td>'."\n"; ! echo '</tr>'."\n"; } if ($daysofweek_dayview == 'yes') { --- 103,125 ---- // The all day events returned here. if ($master_array[($getdate)]['-1']) { ! echo "<tr>\n"; ! echo '<td colspan="3" height="24">'."\n"; ! echo '<table width="100%" border="0" cellspacing="1" cellpadding="4">'."\n"; ! foreach($master_array[($getdate)]['-1'] as $allday) { ! echo "<tr>\n"; ! echo '<td valign="top" align="center" class="eventbg">'; ! openevent("$calendar_name", ! "", ! "", ! $allday, ! 0, ! "", ! '<font color="#ffffff"><i>', ! "</i></font>"); ! echo "</td>\n</tr>\n"; ! } ! echo '</table>'."\n"; ! echo '</td>'."\n"; ! echo '</tr>'."\n"; } if ($daysofweek_dayview == 'yes') { *************** *** 239,269 **** switch ($event_length[$i]['state']) { case 'begin': ! $event_length[$i]['state'] = 'started'; ! $event_text = stripslashes(urldecode($this_time_arr[($event_length[$i]['key'])]['event_text'])); ! $event_text2 = rawurlencode(addslashes($this_time_arr[($event_length[$i]['key'])]['event_text'])); ! $event_start = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_start']); ! $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_end']); ! $description = addslashes(urlencode($this_time_arr[($event_length[$i]['key'])]['description'])); ! $event_start = date ($timeFormat, $event_start); ! $event_end = date ($timeFormat, $event_end); ! $calendar_name2 = rawurlencode(addslashes($calendar_name)); ! $status = $this_time_arr[($event_length[$i]['key'])]['status']; ! echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2">'."\n"; ! echo '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n"; ! echo '<tr>'."\n"; ! echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n"; ! echo '</tr>'."\n"; ! echo '<tr>'."\n"; ! echo '<td>'."\n"; ! echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n"; ! echo '<tr>'."\n"; ! echo '<td class="eventbg"><a class="psf" href="javascript:openEventInfo(\''.$event_text2.'\', \''.$calendar_name2.'\', \''.$event_start.'\', \''.$event_end.'\', \''.$description.'\', \''.$status.'\')"><font class="eventfont">'.$event_text.'</font></a></td>'."\n"; ! echo '</tr>'."\n"; ! echo '</table>'."\n"; ! echo '</td>'."\n"; ! echo '</tr>'."\n"; ! echo '</table>'."\n"; ! echo '</td>'."\n"; ! break; case 'started': break; --- 241,275 ---- switch ($event_length[$i]['state']) { case 'begin': ! $event_length[$i]['state'] = 'started'; ! $event_start = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_start']); ! $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['event_end']); ! $event_start = date ($timeFormat, $event_start); ! $event_end = date ($timeFormat, $event_end); ! ! echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2">'."\n"; ! echo '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n"; ! echo '<tr>'."\n"; ! echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n"; ! echo '</tr>'."\n"; ! echo '<tr>'."\n"; ! echo '<td>'."\n"; ! echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n"; ! echo '<tr>'."\n"; ! echo '<td class="eventbg">'; ! openevent("$calendar_name", ! "$event_start", ! "$event_end", ! $this_time_arr[($event_length[$i]['key'])], ! "", ! 0, ! "<font class=\"eventfont\">", ! "</font>"); ! echo '</td></tr>'."\n"; ! echo '</table>'."\n"; ! echo '</td>'."\n"; ! echo '</tr>'."\n"; ! echo '</table>'."\n"; ! echo '</td>'."\n"; ! break; case 'started': break; |
From: <cl...@us...> - 2003-05-13 04:14:25
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1:/tmp/cvs-serv7779/languages Modified Files: english.inc.php Log Message: part two of admin.php Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** english.inc.php 30 Mar 2003 00:31:38 -0000 1.42 --- english.inc.php 13 May 2003 04:14:22 -0000 1.43 *************** *** 103,107 **** $logout_lang = 'Logout'; $cal_file_lang = 'Calendar File'; - $confirm_lang = 'Are you sure?'; $php_error_lang = 'PHP Error'; $upload_error_gen_lang = 'There was a problem with your upload.'; --- 103,106 ---- *************** *** 114,119 **** --- 113,120 ---- $copy_error_lang = 'Failed to copy file'; $delete_error_lang = 'Failed to delete file'; + $delete_success_lang = 'was deleted successfully.'; $action_success_lang = 'Your action was successful.'; $submit_lang = 'Submit'; + $delete_lang = 'Delete'; |
From: <cl...@us...> - 2003-05-13 04:14:25
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv7779/functions Modified Files: upload_functions.php Log Message: part two of admin.php Index: upload_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/upload_functions.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** upload_functions.php 30 Mar 2003 00:31:38 -0000 1.1 --- upload_functions.php 13 May 2003 04:14:22 -0000 1.2 *************** *** 1,83 **** - <?php - // Is the file uploaded truly a file via HTTP POST - used to thwart a user from trying to trick the script from working on other files - // - // arg0: string filename - // returns boolean is the uploaded a file - function is_uploaded_file_v4 ($filename) { - if (!$tmp_file = get_cfg_var('upload_tmp_dir')) { - $tmp_file = dirname(tempnam('', '')); - } - $tmp_file .= '/' . basename($filename); - // For Windows compat - $filename = str_replace ("\\", "/", $filename); - $tmp_file = str_replace ("\\", "/", $tmp_file); - // User might have trailing slash in php.ini... - return (ereg_replace('/+', '/', $tmp_file) == $filename); - } - - // return the appropriate error message if the file upload had an error - // - // arg0: array file array from $HTTP_POST_FILES - // returns string error message - function get_upload_error ($uploaded_file) { - global $php_error_lang; - global $upload_error_lang; - global $upload_error_gen_lang; - - if (isset($uploaded_file['error'])) { - // This is only available in PHP >= 4.2.0 - $error = $php_error_lang . " "; - switch($uploaded_file['error']) { - case 0: //no error; possible file attack! - case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini - case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form - case 3: //uploaded file was only partially uploaded - case 4: //no file was uploaded - $error = $error . $uploaded_file['error'] . ": " . $upload_error_lang[$uploaded_file['error']]; - break; - default: //a default error, just in case! :) - $error = $error . $uploaded_file['error'] . ": " . $upload_error_gen_lang; - break; - } - } - else { - $error = $upload_error_gen_lang; - } - - return $error; - } - - // Check to see that the file has an .ics extension - // - // arg0: string filename - // returns booloean does the filename end in .ics - function is_uploaded_ics ($filename) { - // Check the file extension for .ics. Can also check the the mime type, but it's not reliable so why bother... - if(preg_match("/.ics$/i", $filename)) { - return TRUE; - } - else { - return FALSE; - } - } - - // Get all calendar filenames (not including path) - // - // argo: string path to calendar files - // returns array filenames (not including path) - function get_calendar_files($calendar_path) { - global $error_path_lang; - - $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path))); - $filelist = array(); - while ($file = readdir($dir_handle)) { - if (substr($file, -4) == ".ics") { - array_push($filelist, $file); - } - } - closedir($dir_handle); - natcasesort($filelist); - return $filelist; - } - - ?> \ No newline at end of file --- 0 ---- |
From: <cl...@us...> - 2003-05-13 04:14:25
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv7779 Modified Files: admin.php config.inc.php Log Message: part two of admin.php Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** admin.php 30 Mar 2003 00:31:38 -0000 1.1 --- admin.php 13 May 2003 04:14:22 -0000 1.2 *************** *** 1,9 **** <?php ! // TODO - Remove before going live ! //error_reporting (E_ALL); define('BASE', './'); include (BASE.'functions/init.inc.php'); ! include (BASE.'functions/upload_functions.php'); // Redirect if administration is not allowed --- 1,8 ---- <?php ! session_start(); define('BASE', './'); include (BASE.'functions/init.inc.php'); ! include (BASE.'functions/admin_functions.php'); // Redirect if administration is not allowed *************** *** 13,30 **** } ! // Load variables from forms, query strings, and cookies into local scope if($HTTP_POST_VARS) {extract($HTTP_POST_VARS, EXTR_PREFIX_SAME, "post_");} if($HTTP_GET_VARS) {extract($HTTP_GET_VARS, EXTR_PREFIX_SAME, "get_");} - if($HTTP_COOKIE_VARS) {extract($HTTP_COOKIE_VARS, EXTR_PREFIX_SAME, "cookie_");} ! // Logout by clearing user info in cookies if ($action == "logout") { ! setcookie("md5_password",""); ! setcookie("username",""); } ! // if $external_auth == 'yes', don't do any authentication ! if ($external_auth == "yes") { $is_loged_in = TRUE; } --- 12,29 ---- } ! // Load variables from forms and query strings into local scope if($HTTP_POST_VARS) {extract($HTTP_POST_VARS, EXTR_PREFIX_SAME, "post_");} if($HTTP_GET_VARS) {extract($HTTP_GET_VARS, EXTR_PREFIX_SAME, "get_");} ! // Logout by clearing session variables if ($action == "logout") { ! $HTTP_SESSION_VARS['phpical_loggedin'] = FALSE; ! unset($HTTP_SESSION_VARS['phpical_username']); ! unset($HTTP_SESSION_VARS['phpical_password']); } ! // if $auth_method == 'none', don't do any authentication ! if ($auth_method == "none") { $is_loged_in = TRUE; } *************** *** 33,60 **** $is_loged_in = FALSE; ! if (isset($username) && $action != "logout") { ! if (!isset($HTTP_COOKIE_VARS["md5_password"])) { ! $md5_password = md5($password); ! } ! else { ! $md5_password = $HTTP_COOKIE_VARS["md5_password"]; ! } ! if ($admin_username == $username && md5($admin_password) == $md5_password) { ! //TODO lastusername doesn't appear to be working ! $is_loged_in = TRUE; ! setcookie("lastusername", $username, time()+1012324305); ! setcookie("username", $username); ! setcookie("md5_password", $md5_password); ! } ! else { ! $login_error = "<font color=\"red\">$invalid_login_lang</font>"; ! $is_loged_in = FALSE; ! } } ! ! if ($is_loged_in == FALSE) { ! setcookie("username",""); ! setcookie("password",""); ! setcookie("md5_password",""); } } --- 32,40 ---- $is_loged_in = FALSE; ! if (is_loggedin()) { ! $is_loged_in = TRUE; } ! if (isset($username) && $action != "logout") { ! $is_loged_in = login ($username, $password); } } *************** *** 69,83 **** <title><?php echo "$admin_header_lang"; ?></title> <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> - - <script> - <!-- - function verify(){ - msg = "<?php echo $confirm_lang; ?>"; - //all we have to do is return the return value of the confirm() method - return confirm(msg); - } - --> - </script> - </head> <body bgcolor="#FFFFFF"> --- 49,52 ---- *************** *** 94,98 **** <td align="left" width="20" class="navback"> </td> <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td> ! <td align="right" width="20" class="navback" nowrap valign="middle"><font class="G10"><?php if ($external_auth != "yes" && $is_loged_in == TRUE) { echo "<a href=\"{$HTTP_SERVER_VARS['PHP_SELF']}?action=logout\">{$logout_lang}</a>"; } ?></font> </td> </tr> <tr> --- 63,67 ---- <td align="left" width="20" class="navback"> </td> <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td> ! <td align="right" width="20" class="navback" nowrap valign="middle"><font class="G10"><?php if ($auth_method != "none" && $is_loged_in == TRUE) { echo "<a href=\"{$HTTP_SERVER_VARS['PHP_SELF']}?action=logout\">{$logout_lang}</a>"; } ?></font> </td> </tr> <tr> *************** *** 109,112 **** --- 78,84 ---- // If User is Not Logged In, Display The Login Page if ($is_loged_in == FALSE) { + if (isset($username)) + $login_error = "<font color=\"red\">$invalid_login_lang</font>"; + echo <<<EOT <form action="{$HTTP_SERVER_VARS['PHP_SELF']}" method="post"> *************** *** 114,118 **** <tr> <td nowrap>{$username_lang}: </td> ! <td align="left"><input type="text" name="username" value="$lastusername"></td> </tr> <tr> --- 86,90 ---- <tr> <td nowrap>{$username_lang}: </td> ! <td align="left"><input type="text" name="username"></td> </tr> <tr> *************** *** 157,173 **** // Add or Update a calendar if ($action == "addupdate") { ! $addupdate_success = FALSE; ! if (!is_uploaded_file_v4($HTTP_POST_FILES['calfile']['tmp_name'])) { ! $upload_error = get_upload_error($HTTP_POST_FILES['calfile']); ! } ! elseif (!is_uploaded_ics($HTTP_POST_FILES['calfile']['name'])) { ! $upload_error = $upload_error_type_lang; ! } ! // copy() should be replaced with move_uploaded_file(), but only if we can require PHP 4 >= 4.0.3 ! elseif (!copy($HTTP_POST_FILES['calfile']['tmp_name'], $calendar_path . "/" . $HTTP_POST_FILES['calfile']['name'])) { ! $upload_error = $copy_error_lang . " " . $HTTP_POST_FILES['calfile']['tmp_name'] . " - " . $calendar_path . "/" . $HTTP_POST_FILES['calfile']['name']; ! } ! else { ! $addupdate_success = TRUE; } } --- 129,155 ---- // Add or Update a calendar if ($action == "addupdate") { ! $addupdate_msg = ""; ! ! for($filenumber=1; $filenumber<6; $filenumber++) { ! $file = $HTTP_POST_FILES['calfile']; ! $addupdate_success = FALSE; ! ! if (!is_uploaded_file_v4($file['tmp_name'][$filenumber])) { ! $upload_error = get_upload_error($file['error'][$filenumber]); ! } ! elseif (!is_uploaded_ics($file['name'][$filenumber])) { ! $upload_error = $upload_error_type_lang; ! } ! elseif (!copy_cal($file['tmp_name'][$filenumber], $file['name'][$filenumber])) { ! $upload_error = $copy_error_lang . " " . $file['tmp_name'][$filenumber] . " - " . $calendar_path . "/" . $file['name'][$filenumber]; ! } ! else { ! $addupdate_success = TRUE; ! } ! ! if ($addupdate_success) ! $addupdate_msg = $addupdate_msg . "<font color=\"green\">{$cal_file_lang} {$filenumber}: {$action_success_lang}</font><br>"; ! else ! $addupdate_msg = $addupdate_msg . "<font color=\"red\">{$cal_file_lang} {$filenumber}: {$upload_error}</font><br>"; } } *************** *** 176,186 **** // Not at all secure - need to strip out path info if used by users besides admin in the future if ($action == "delete") { ! $delete_success = FALSE; ! ! if (!unlink($calendar_path . "/" . urldecode($delete_calendar))) { ! $delete_error = $delete_error_lang . " " . $calendar_path . "/" . urldecode($delete_calendar); ! } ! else { ! $delete_success = TRUE; } } --- 158,170 ---- // Not at all secure - need to strip out path info if used by users besides admin in the future if ($action == "delete") { ! $delete_msg = ""; ! ! foreach ($delete_calendar as $filename) { ! if (!delete_cal(urldecode($filename))) { ! $delete_msg = $delete_msg . "<font color=\"red\">" . $delete_error_lang . " " . urldecode(substr($filename,0,-4)) . "</font><br>"; ! } ! else { ! $delete_msg = $delete_msg . "<font color=\"green\">" . urldecode(substr($filename,0,-4)) . " " . $delete_success_lang . "</font><br>"; ! } } } *************** *** 191,200 **** <h2><?php echo $addupdate_cal_lang; ?></h2> <p><?php echo $addupdate_desc_lang; ?></p> ! <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post" enctype="multipart/form-data" <?php if($confirm_changes != "no") { echo "onSubmit=\"return verify()\""; } ?> > <input type="hidden" name="action" value="addupdate"> <table border="0" cellspacing="0"> <tr> ! <td nowrap><?php echo $cal_file_lang; ?>: </td> ! <td><input type="file" name="calfile"></td> </tr> <tr> --- 175,200 ---- <h2><?php echo $addupdate_cal_lang; ?></h2> <p><?php echo $addupdate_desc_lang; ?></p> ! <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post" enctype="multipart/form-data"> <input type="hidden" name="action" value="addupdate"> <table border="0" cellspacing="0"> <tr> ! <td nowrap><?php echo $cal_file_lang; ?> 1: </td> ! <td><input type="file" name="calfile[1]"></td> ! </tr> ! <tr> ! <td nowrap><?php echo $cal_file_lang; ?> 2: </td> ! <td><input type="file" name="calfile[2]"></td> ! </tr> ! <tr> ! <td nowrap><?php echo $cal_file_lang; ?> 3: </td> ! <td><input type="file" name="calfile[3]"></td> ! </tr> ! <tr> ! <td nowrap><?php echo $cal_file_lang; ?> 4: </td> ! <td><input type="file" name="calfile[4]"></td> ! </tr> ! <tr> ! <td nowrap><?php echo $cal_file_lang; ?> 5: </td> ! <td><input type="file" name="calfile[5]"></td> </tr> <tr> *************** *** 203,247 **** </tr> <tr> ! <td align="center" colspan="2"><?php if($addupdate_success) { echo "<font color=\"green\">{$action_success_lang}</font>"; } ?><font color="red"><?php echo $upload_error; ?></font> </td> </tr> </table> </form> ! <h2><?php echo $delete_cal_lang; ?></h2> ! <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post" <?php if($confirm_changes != "no") { echo "onSubmit=\"return verify()\""; } ?> > <input type="hidden" name="action" value="delete"> <table border="0" cellspacing="0"> ! <tr> ! <td nowrap><?php echo $cal_file_lang; ?>: </td> ! <td> ! <?php ! // Begin Calendar Selection ! // ! print "<select name=\"delete_calendar\">\n"; ! $filelist = get_calendar_files($calendar_path); ! foreach ($filelist as $file) { ! $cal_filename_tmp = substr($file,0,-4); ! $cal_tmp = urlencode($file); ! $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! print "<option value=\"$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>\n"; ! } ! print "</select>\n"; ! ?> ! </td> ! </tr> ! <tr> ! <td> </td> ! <td><input type="submit" value="<?php echo $submit_lang; ?>"></td> ! </tr> ! <tr> ! <td align="center" colspan="2"><?php if($delete_success) { echo "<font color=\"green\">{$action_success_lang}</font>"; } ?><font color="red"><?php echo $delete_error; ?></font> </td> </tr> </table> </form> - - <?php - echo " </td> </tr> --- 203,252 ---- </tr> <tr> ! <td align="center" colspan="2"><?php echo $addupdate_msg; ?> </td> </tr> </table> </form> ! <h2><?php echo $delete_cal_lang; ?></h2> ! <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post"> <input type="hidden" name="action" value="delete"> <table border="0" cellspacing="0"> ! <?php ! // Print Calendar Checkboxes ! // ! $COLUMNS_TO_PRINT = 3; ! $column = 1; ! $filelist = get_calendar_files($calendar_path); ! foreach ($filelist as $file) { ! if ($column > $COLUMNS_TO_PRINT) { ! echo "</tr>"; ! $column = 1; ! } ! if ($column == 1) { ! echo "<tr>"; ! } ! ! $cal_filename_tmp = substr($file,0,-4); ! $cal_tmp = urlencode($file); ! $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); ! ! echo "<td align=\"left\"><input name=\"delete_calendar[]\" value=\"$cal_tmp\" type=\"checkbox\">$cal_displayname_tmp</td>\n"; ! ! $column++; ! } ! // Print remaining empty columns if necessary ! $number_of_columns = count($filelist); ! while (gettype($number_of_columns/$COLUMNS_TO_PRINT) != "integer") { ! echo "<td> </td>"; ! $number_of_columns++; ! } ! ?> </tr> </table> + <p><input type="submit" value="<?php echo $delete_lang; ?>"></p> + <p><?php echo $delete_msg; ?> </p> </form> </td> </tr> *************** *** 249,259 **** </td> </tr> ! </table>"; - include (BASE.'includes/footer.inc.php'); ! echo "</center> ! </body> ! </html>"; ! ?> --- 254,266 ---- </td> </tr> ! </table> ! <?php include (BASE.'includes/footer.inc.php'); ?> ! ! ! </center> ! </body> ! </html> ! Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** config.inc.php 9 May 2003 20:28:56 -0000 1.100 --- config.inc.php 13 May 2003 04:14:22 -0000 1.101 *************** *** 48,57 **** // Administration settings ! $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password ! $external_auth = 'no'; // Set to yes if external authentication (such as HTTP Authentication) is used and no authentican should be performed by PHP iCalendar ! $admin_username = 'clittle'; // The username for the administrator ! $admin_password = 'jackhamm3r'; // change this if allow_admin is set to yes ! $confirm_changes = 'yes'; // Set to no to eliminate the confirmation popup on administration form submits ! $blacklisted_cals[] = ''; // Fill in between the quotes the name of the calendars $blacklisted_cals[] = ''; // you wish to 'blacklist' or that you don't want to show up in your calendar --- 48,58 ---- // Administration settings ! $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method ! $auth_method = 'ftp'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic. ! $auth_internal_username = 'admin'; // Only used if $auth_method='internal'. The username for the administrator. ! $auth_internal_password = 'default'; // Only used if $auth_method='internal'. The password for the administrator. ! $ftp_server = 'localhost'; // Only used if $auth_method='ftp'. The ftp server name. 'localhost' will work for most servers. ! $ftp_calendar_path = ''; // Only used if $auth_method='ftp'. The full path to the calendar directory on the ftp server. If = '', will attempt to deduce the path based on $calendar_path, but may not be accurate depending on ftp server config. ! $blacklisted_cals[] = ''; // Fill in between the quotes the name of the calendars $blacklisted_cals[] = ''; // you wish to 'blacklist' or that you don't want to show up in your calendar |
From: <cl...@us...> - 2003-05-09 20:29:01
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv22020/functions Modified Files: init.inc.php Log Message: Added server offset in seconds. Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** init.inc.php 16 Feb 2003 20:25:21 -0000 1.28 --- init.inc.php 9 May 2003 20:28:57 -0000 1.29 *************** *** 36,40 **** $getdate = $HTTP_GET_VARS['getdate']; } else { ! $getdate = date('Ymd'); } } --- 36,40 ---- $getdate = $HTTP_GET_VARS['getdate']; } else { ! $getdate = date('Ymd', strtotime("now + $second_offset seconds")); } } |
From: <cl...@us...> - 2003-05-09 20:29:00
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv22020 Modified Files: README config.inc.php day.php month.php week.php Log Message: Added server offset in seconds. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** README 30 Mar 2003 00:31:38 -0000 1.44 --- README 9 May 2003 20:28:56 -0000 1.45 *************** *** 80,83 **** --- 80,84 ---- -Added support for ATTENDEE -Added support for STATUS + -Added the ability to correct the servers time display -Added admin.php for administration of calendars (uses cookies). See config.inc.php for configuration. -Add or Update a calendar via a web interface Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** config.inc.php 30 Mar 2003 00:31:38 -0000 1.99 --- config.inc.php 9 May 2003 20:28:56 -0000 1.100 *************** *** 1,5 **** <?php ! // Configuration file for PHP iCalendar 0.9.1 // // To set values, change the text between the single quotes --- 1,5 ---- <?php ! // Configuration file for PHP iCalendar 0.9.2 // // To set values, change the text between the single quotes *************** *** 23,26 **** --- 23,27 ---- $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X) $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. + $second_offset = '0'; // The time in seconds between your time and your server's time. // Advanced settings for custom installs, cookies, etc. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** day.php 10 Mar 2003 19:48:22 -0000 1.87 --- day.php 9 May 2003 20:28:56 -0000 1.88 *************** *** 3,7 **** $jumpto_day_time = strtotime($HTTP_GET_VARS['jumpto_day']); if ($jumpto_day_time == -1) { ! $getdate = date('Ymd'); } else { $getdate = date('Ymd', $jumpto_day_time); --- 3,7 ---- $jumpto_day_time = strtotime($HTTP_GET_VARS['jumpto_day']); if ($jumpto_day_time == -1) { ! $getdate = date('Ymd', strtotime("now + $second_offset seconds")); } else { $getdate = date('Ymd', $jumpto_day_time); *************** *** 16,20 **** $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date ('Ymd'); $tomorrows_date = date( 'Ymd', strtotime('+1 day', $unix_time)); $yesterdays_date = date( 'Ymd', strtotime('-1 day', $unix_time)); --- 16,20 ---- $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date ('Ymd', $unix_time); $tomorrows_date = date( 'Ymd', strtotime('+1 day', $unix_time)); $yesterdays_date = date( 'Ymd', strtotime('-1 day', $unix_time)); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** month.php 10 Mar 2003 19:48:24 -0000 1.86 --- month.php 9 May 2003 20:28:56 -0000 1.87 *************** *** 12,16 **** $unix_time = strtotime($getdate); ! $today_today = date ("Ymd"); $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); --- 12,16 ---- $unix_time = strtotime($getdate); ! $today_today = date ('Ymd', $unix_time); $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** week.php 10 Mar 2003 19:48:24 -0000 1.87 --- week.php 9 May 2003 20:28:56 -0000 1.88 *************** *** 10,14 **** $unix_time = strtotime($getdate); $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ! $today_today = date ("Ymd"); $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); --- 10,14 ---- $unix_time = strtotime($getdate); $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ! $today_today = date ('Ymd', $unix_time); $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); |
From: <cl...@us...> - 2003-03-30 00:31:43
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv15475/functions Added Files: upload_functions.php Log Message: Initial check-in for Administration controls. --- NEW FILE: upload_functions.php --- <?php // Is the file uploaded truly a file via HTTP POST - used to thwart a user from trying to trick the script from working on other files // // arg0: string filename // returns boolean is the uploaded a file function is_uploaded_file_v4 ($filename) { if (!$tmp_file = get_cfg_var('upload_tmp_dir')) { $tmp_file = dirname(tempnam('', '')); } $tmp_file .= '/' . basename($filename); // For Windows compat $filename = str_replace ("\\", "/", $filename); $tmp_file = str_replace ("\\", "/", $tmp_file); // User might have trailing slash in php.ini... return (ereg_replace('/+', '/', $tmp_file) == $filename); } // return the appropriate error message if the file upload had an error // // arg0: array file array from $HTTP_POST_FILES // returns string error message function get_upload_error ($uploaded_file) { global $php_error_lang; global $upload_error_lang; global $upload_error_gen_lang; if (isset($uploaded_file['error'])) { // This is only available in PHP >= 4.2.0 $error = $php_error_lang . " "; switch($uploaded_file['error']) { case 0: //no error; possible file attack! case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form case 3: //uploaded file was only partially uploaded case 4: //no file was uploaded $error = $error . $uploaded_file['error'] . ": " . $upload_error_lang[$uploaded_file['error']]; break; default: //a default error, just in case! :) $error = $error . $uploaded_file['error'] . ": " . $upload_error_gen_lang; break; } } else { $error = $upload_error_gen_lang; } return $error; } // Check to see that the file has an .ics extension // // arg0: string filename // returns booloean does the filename end in .ics function is_uploaded_ics ($filename) { // Check the file extension for .ics. Can also check the the mime type, but it's not reliable so why bother... if(preg_match("/.ics$/i", $filename)) { return TRUE; } else { return FALSE; } } // Get all calendar filenames (not including path) // // argo: string path to calendar files // returns array filenames (not including path) function get_calendar_files($calendar_path) { global $error_path_lang; $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path))); $filelist = array(); while ($file = readdir($dir_handle)) { if (substr($file, -4) == ".ics") { array_push($filelist, $file); } } closedir($dir_handle); natcasesort($filelist); return $filelist; } ?> |
From: <cl...@us...> - 2003-03-30 00:31:43
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv15475 Modified Files: README config.inc.php Added Files: admin.php Log Message: Initial check-in for Administration controls. --- NEW FILE: admin.php --- <?php // TODO - Remove before going live //error_reporting (E_ALL); define('BASE', './'); include (BASE.'functions/init.inc.php'); include (BASE.'functions/upload_functions.php'); // Redirect if administration is not allowed if ($allow_admin != "yes") { header("Location: index.php"); die(); } // Load variables from forms, query strings, and cookies into local scope if($HTTP_POST_VARS) {extract($HTTP_POST_VARS, EXTR_PREFIX_SAME, "post_");} if($HTTP_GET_VARS) {extract($HTTP_GET_VARS, EXTR_PREFIX_SAME, "get_");} if($HTTP_COOKIE_VARS) {extract($HTTP_COOKIE_VARS, EXTR_PREFIX_SAME, "cookie_");} // Logout by clearing user info in cookies if ($action == "logout") { setcookie("md5_password",""); setcookie("username",""); } // if $external_auth == 'yes', don't do any authentication if ($external_auth == "yes") { $is_loged_in = TRUE; } // Check if The User is Identified else { $is_loged_in = FALSE; if (isset($username) && $action != "logout") { if (!isset($HTTP_COOKIE_VARS["md5_password"])) { $md5_password = md5($password); } else { $md5_password = $HTTP_COOKIE_VARS["md5_password"]; } if ($admin_username == $username && md5($admin_password) == $md5_password) { //TODO lastusername doesn't appear to be working $is_loged_in = TRUE; setcookie("lastusername", $username, time()+1012324305); setcookie("username", $username); setcookie("md5_password", $md5_password); } else { $login_error = "<font color=\"red\">$invalid_login_lang</font>"; $is_loged_in = FALSE; } } if ($is_loged_in == FALSE) { setcookie("username",""); setcookie("password",""); setcookie("md5_password",""); } } ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <html> <head> <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title><?php echo "$admin_header_lang"; ?></title> <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> <script> <!-- function verify(){ msg = "<?php echo $confirm_lang; ?>"; //all we have to do is return the return value of the confirm() method return confirm(msg); } --> </script> </head> <body bgcolor="#FFFFFF"> <center> <?php include (BASE.'includes/header.inc.php'); ?> <table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> <td align="center" valign="middle"> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td align="left" width="20" class="navback"> </td> <td align="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td> <td align="right" width="20" class="navback" nowrap valign="middle"><font class="G10"><?php if ($external_auth != "yes" && $is_loged_in == TRUE) { echo "<a href=\"{$HTTP_SERVER_VARS['PHP_SELF']}?action=logout\">{$logout_lang}</a>"; } ?></font> </td> </tr> <tr> <td colspan="3" class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td> </tr> <tr> <td align="left" width="20"> </td> <td colspan="2"> <?php // If User is Not Logged In, Display The Login Page if ($is_loged_in == FALSE) { echo <<<EOT <form action="{$HTTP_SERVER_VARS['PHP_SELF']}" method="post"> <table cellspacing="0" cellpadding="0"> <tr> <td nowrap>{$username_lang}: </td> <td align="left"><input type="text" name="username" value="$lastusername"></td> </tr> <tr> <td>{$password_lang}: </td> <td align="left"><input type="password" name="password"></td> </tr> <tr> <td> </td> <td align="left"><input type="submit" value="{$login_lang}"></td> </tr> <tr> <td align="center" colspan="3">{$login_error} </td> </tr> </table> </form> EOT; echo " </td> </tr> </table> </td> </tr> </table>"; include (BASE.'includes/footer.inc.php'); echo " </center> </body> </html>"; die(); } // The user is logged in if we get here // Add or Update a calendar if ($action == "addupdate") { $addupdate_success = FALSE; if (!is_uploaded_file_v4($HTTP_POST_FILES['calfile']['tmp_name'])) { $upload_error = get_upload_error($HTTP_POST_FILES['calfile']); } elseif (!is_uploaded_ics($HTTP_POST_FILES['calfile']['name'])) { $upload_error = $upload_error_type_lang; } // copy() should be replaced with move_uploaded_file(), but only if we can require PHP 4 >= 4.0.3 elseif (!copy($HTTP_POST_FILES['calfile']['tmp_name'], $calendar_path . "/" . $HTTP_POST_FILES['calfile']['name'])) { $upload_error = $copy_error_lang . " " . $HTTP_POST_FILES['calfile']['tmp_name'] . " - " . $calendar_path . "/" . $HTTP_POST_FILES['calfile']['name']; } else { $addupdate_success = TRUE; } } // Delete a calendar // Not at all secure - need to strip out path info if used by users besides admin in the future if ($action == "delete") { $delete_success = FALSE; if (!unlink($calendar_path . "/" . urldecode($delete_calendar))) { $delete_error = $delete_error_lang . " " . $calendar_path . "/" . urldecode($delete_calendar); } else { $delete_success = TRUE; } } ?> <h2><?php echo $addupdate_cal_lang; ?></h2> <p><?php echo $addupdate_desc_lang; ?></p> <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post" enctype="multipart/form-data" <?php if($confirm_changes != "no") { echo "onSubmit=\"return verify()\""; } ?> > <input type="hidden" name="action" value="addupdate"> <table border="0" cellspacing="0"> <tr> <td nowrap><?php echo $cal_file_lang; ?>: </td> <td><input type="file" name="calfile"></td> </tr> <tr> <td> </td> <td><input type="submit" value="<?php echo $submit_lang; ?>"></td> </tr> <tr> <td align="center" colspan="2"><?php if($addupdate_success) { echo "<font color=\"green\">{$action_success_lang}</font>"; } ?><font color="red"><?php echo $upload_error; ?></font> </td> </tr> </table> </form> <h2><?php echo $delete_cal_lang; ?></h2> <form action="<?php echo $HTTP_SERVER_VARS['PHP_SELF']; ?>" method="post" <?php if($confirm_changes != "no") { echo "onSubmit=\"return verify()\""; } ?> > <input type="hidden" name="action" value="delete"> <table border="0" cellspacing="0"> <tr> <td nowrap><?php echo $cal_file_lang; ?>: </td> <td> <?php // Begin Calendar Selection // print "<select name=\"delete_calendar\">\n"; $filelist = get_calendar_files($calendar_path); foreach ($filelist as $file) { $cal_filename_tmp = substr($file,0,-4); $cal_tmp = urlencode($file); $cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp); print "<option value=\"$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>\n"; } print "</select>\n"; ?> </td> </tr> <tr> <td> </td> <td><input type="submit" value="<?php echo $submit_lang; ?>"></td> </tr> <tr> <td align="center" colspan="2"><?php if($delete_success) { echo "<font color=\"green\">{$action_success_lang}</font>"; } ?><font color="red"><?php echo $delete_error; ?></font> </td> </tr> </table> </form> <?php echo " </td> </tr> </table> </td> </tr> </table>"; include (BASE.'includes/footer.inc.php'); echo "</center> </body> </html>"; ?> Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** README 11 Mar 2003 23:02:07 -0000 1.43 --- README 30 Mar 2003 00:31:38 -0000 1.44 *************** *** 80,83 **** --- 80,86 ---- -Added support for ATTENDEE -Added support for STATUS + -Added admin.php for administration of calendars (uses cookies). See config.inc.php for configuration. + -Add or Update a calendar via a web interface + -Delete a calendar via a web interface 0.9.1 Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** config.inc.php 24 Feb 2003 20:23:39 -0000 1.98 --- config.inc.php 30 Mar 2003 00:31:38 -0000 1.99 *************** *** 45,48 **** --- 45,55 ---- $show_todos = 'yes'; // Show your todo list on the side of day and week view. $show_completed = 'yes'; // Show completed todos on your todo list. + + // Administration settings + $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password + $external_auth = 'no'; // Set to yes if external authentication (such as HTTP Authentication) is used and no authentican should be performed by PHP iCalendar + $admin_username = 'clittle'; // The username for the administrator + $admin_password = 'jackhamm3r'; // change this if allow_admin is set to yes + $confirm_changes = 'yes'; // Set to no to eliminate the confirmation popup on administration form submits $blacklisted_cals[] = ''; // Fill in between the quotes the name of the calendars |
From: <cl...@us...> - 2003-03-30 00:31:43
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1:/tmp/cvs-serv15475/languages Modified Files: english.inc.php Log Message: Initial check-in for Administration controls. Index: english.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** english.inc.php 13 Feb 2003 07:22:18 -0000 1.41 --- english.inc.php 30 Mar 2003 00:31:38 -0000 1.42 *************** *** 92,95 **** --- 92,122 ---- $unset_prefs_lang = 'Unset preferences:'; + // - administration + $admin_header_lang = 'PHP iCalendar Administration'; + $username_lang = 'Username'; + $password_lang = 'Password'; + $login_lang = 'Login'; + $invalid_login_lang = 'Wrong username or password.'; + $addupdate_cal_lang = 'Add or Update a Calendar'; + $addupdate_desc_lang = 'Add a calendar by uploading a new file. Update a calendar by uploading a file of the same name.'; + $delete_cal_lang = 'Delete a Calendar'; + $logout_lang = 'Logout'; + $cal_file_lang = 'Calendar File'; + $confirm_lang = 'Are you sure?'; + $php_error_lang = 'PHP Error'; + $upload_error_gen_lang = 'There was a problem with your upload.'; + $upload_error_lang[0] = 'There was a problem with your upload.'; + $upload_error_lang[1] = 'The file you are trying to upload is too big.'; + $upload_error_lang[2] = 'The file you are trying to upload is too big.'; + $upload_error_lang[3] = 'The file you are trying upload was only partially uploaded.'; + $upload_error_lang[4] = 'You must select a file for upload.'; + $upload_error_type_lang = 'Only .ics files may be uploaded.'; + $copy_error_lang = 'Failed to copy file'; + $delete_error_lang = 'Failed to delete file'; + $action_success_lang = 'Your action was successful.'; + $submit_lang = 'Submit'; + + + // - navigation $back_lang = 'Back'; |