Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
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) |
|
From: <ica...@us...> - 2003-09-24 01:27:05
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv24407/includes
Modified Files:
event.php
Log Message:
Abstracted page logic from display markup (to help ease upcoming transition to templates)
Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** event.php 20 Sep 2003 00:16:05 -0000 1.10
--- event.php 24 Sep 2003 01:27:01 -0000 1.11
***************
*** 3,76 ****
include (BASE.'functions/init.inc.php');
if (isset($HTTP_GET_VARS['event']) && ($HTTP_GET_VARS['event'] !== '') ) {
! $event = $HTTP_GET_VARS['event'];
} else {
! $event = '';
}
if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== '') ) {
! $description = $HTTP_GET_VARS['description'];
} else {
! $description = '';
}
if (isset($HTTP_GET_VARS['cal']) && ($HTTP_GET_VARS['cal'] !== '') ) {
! $calendar_name = $HTTP_GET_VARS['cal'];
} else {
! $calendar_name = '';
}
-
if (isset($HTTP_GET_VARS['start']) && ($HTTP_GET_VARS['start'] !== '') ) {
! $start = $HTTP_GET_VARS['start'];
} else {
! $start = '';
}
if (isset($HTTP_GET_VARS['end']) && ($HTTP_GET_VARS['end'] !== '') ) {
! $end = $HTTP_GET_VARS['end'];
} else {
! $end = '';
}
if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {
! $status = $HTTP_GET_VARS['status'];
} else {
! $status = '';
}
-
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);
! $event = str_replace('\\', '', $event);
! $description = rawurldecode($description);
! $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);
! $calendar_name2 = rawurldecode($calendar_name);
! $calendar_name2 = stripslashes($calendar_name2);
! $calendar_name2 = str_replace('\\', '', $calendar_name2);
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
--- 3,140 ----
include (BASE.'functions/init.inc.php');
+ // Load vars
if (isset($HTTP_GET_VARS['event']) && ($HTTP_GET_VARS['event'] !== '') ) {
! $event=$HTTP_GET_VARS['event'];
} else {
! $event='';
}
if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== '') ) {
! $description=$HTTP_GET_VARS['description'];
} else {
! $description='';
}
if (isset($HTTP_GET_VARS['cal']) && ($HTTP_GET_VARS['cal'] !== '') ) {
! $calendar_name=$HTTP_GET_VARS['cal'];
} else {
! $calendar_name='';
}
if (isset($HTTP_GET_VARS['start']) && ($HTTP_GET_VARS['start'] !== '') ) {
! $start=$HTTP_GET_VARS['start'];
} else {
! $start='';
}
if (isset($HTTP_GET_VARS['end']) && ($HTTP_GET_VARS['end'] !== '') ) {
! $end=$HTTP_GET_VARS['end'];
} else {
! $end='';
}
if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {
! $status=$HTTP_GET_VARS['status'];
} else {
! $status='';
}
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='';
}
! // Prep vars for HTML display
! $event=stripslashes(rawurldecode($event));
! $event=str_replace('\\','',$event);
! $description=stripslashes(rawurldecode($description));
! $description=str_replace('\\','',$description);
! $organizer=stripslashes(rawurldecode($organizer));
! $organizer=str_replace('\\','',$organizer);
! $organizer=unserialize($organizer);
! $attendee=str_replace('\\','',$attendee);
! $attendee=unserialize ($attendee);
! $location=stripslashes(rawurldecode($location));
! $location=str_replace('\\','',$location);
! $calendar_name=stripslashes(rawurldecode($calendar_name));
! $calendar_name=str_replace('\\','',$calendar_name);
!
! // Format calendar title
! if ($calendar_name == $ALL_CALENDARS_COMBINED) {
! $cal_title=$all_cal_comb_lang;
! $cal_title_full=$all_cal_comb_lang;
! } else {
! $cal_title=$calendar_name;
! $cal_title_full=$calendar_name . ' ' . $calendar_lang;
! }
!
! // Format event time
! if (($start) && ($end)) {
! $event_times=' - <font class="V9">(<i>' . $start . ' - ' . $end . '</i>)</font>';
! }
! if ($start == '' && $end == '' && (isset($start) && isset($end))) {
! $event_times=' - <font class="V9">(<i>' . $all_day_lang . '</i>)</font>';
! }
!
! // Format optional event fields
! if ($description) {
! $display.="<!-- Description -->\n";
! $display.='<tr>' . "\n";
! $display.='<td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>' . "\n";
! $display.='<td align="left" colspan="2" class="V12">' . "\n";
! $display.=ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$description);
! $display.='</td>' . "\n";
! $display.='</tr>' . "\n";
! }
! if ($organizer) {
! $i=0;
! $display.='<tr>' . "\n";
! $display.='<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>' . "\n";
! $display.='<td align="left" colspan="2" class="V12">';
! $display.=$organizer_lang . ' - ';
! foreach ($organizer as $val) {
! $organizers.=$organizer[$i]["name"] . ', ';
! $i++;
! }
! $display.=substr($organizers,0,-2);
! $display.='</td>' . "\n";
! $display.='</tr>' . "\n";
! }
! if ($attendee) {
! $i=0;
! $display.="<!-- Attendee -->\n";
! $display.='<tr>' . "\n";
! $display.='<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>' . "\n";
! $display.='<td align="left" colspan="2" class="V12">' . "\n";
! $display.=$attendee_lang . ' - ';
! foreach ($attendee as $val) {
! $attendees .= $attendee[$i]["name"] . ', ';
! $i++;
! }
! $attendees=substr($attendees,0,-2);
! $display.='</td>' . "\n";
! $display.='</tr>' . "\n";
! }
! if ($status) {
! $display.="<!-- Status -->\n";
! $display.='<tr>' . "\n";
! $display.='<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>' . "\n";
! $display.='<td align="left" colspan="2" class="V12">' . "\n";
! $display.=$status_lang . ' - ' . $status. '</td>' . "\n";
! $display.='</tr>';
! }
! if ($location) {
! $display.="<!-- Location -->\n";
! $display.='<tr>' . "\n";
! $display.='<td width="1%"><img src="images/spacer.gif" width="6" height="1" alt=" "></td>' . "\n";
! $display.='<td align="left" colspan="2" class="V12">' . "\n";
! $display.=$location_lang . ' - ' . $location.'</td>' . "\n";
! $display.='</tr>' . "\n";
! }
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
***************
*** 78,183 ****
<html>
<head>
! <meta http-equiv="content-type" content="text/html;charset=UTF-8">
! <title><?php
! if ($calendar_name == $ALL_CALENDARS_COMBINED) {
! echo "$all_cal_comb_lang";
! } else {
! echo "$calendar_name2";
! }?></title>
<link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">
</head>
! <body bgcolor="#eeeeee"><center>
<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
- <tr>
- <td align="left" valign="top" width="1%" class="sideback"><img src="../images/spacer.gif" width="1" height="20" alt=" "></td>
- <td align="center" width="98%" class="sideback"><font class="G10BOLD">
- <?php
- if ($calendar_name == $ALL_CALENDARS_COMBINED) {
- echo "$all_cal_comb_lang";
- } else {
- echo "$calendar_name2 $calendar_lang";
- }
- ?>
- </font></td>
- <td align="right" valign="top" width="1%" class="sideback"></td>
- </tr>
- <tr>
- <td colspan="3"><img src="../images/spacer.gif" width="1" height="6" alt=" "></td>
- </tr>
- <tr>
- <td colspan="3">
- <table width="430" border="0" cellspacing="0" cellpadding="0">
- <?php
- if (($start) && ($end)) $event_times = ' - <font class="V9">(<i>'.$start.' - '.$end.'</i>)</font>';
- if ($start == '' && $end == '' && (isset($start) && isset($end))) $event_times = ' - <font class="V9">(<i>'.$all_day_lang.'</i>)</font>';
- ?>
- <tr>
- <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
- <td align="left" colspan="2" class="V12"><?php echo $event.' '.$event_times.'<br><br>'; ?></td>
- </tr>
-
- <?php if ($description) { ?>
- <tr>
- <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
- <td align="left" colspan="2" class="V12">
- <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",
- '<a target="_new" href="\0">\0</a>', $description); ?></td>
- </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>
! </td>
! </tr>
! </table>
</center>
</body>
! </html>
--- 142,182 ----
<html>
<head>
! <meta http-equiv="content-type" content="text/html;charset=UTF-8">
! <title><?php echo $cal_title; ?></title>
<link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">
</head>
!
! <!-- Start PAGE -->
! <body bgcolor="#eeeeee">
! <center>
<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
! <!-- Calendar Title -->
! <tr>
! <td align="left" valign="top" width="1%" class="sideback"><img src="../images/spacer.gif" width="1" height="20" alt=" "></td>
! <td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo $cal_title_full; ?></font></td>
! <td align="right" valign="top" width="1%" class="sideback"></td>
! </tr>
! <tr>
! <td colspan="3"><img src="../images/spacer.gif" width="1" height="6" alt=" "></td>
! </tr>
!
! <!-- Event Info -->
! <tr>
! <td colspan="3">
! <table width="430" border="0" cellspacing="0" cellpadding="0">
! <tr>
! <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
! <td align="left" colspan="2" class="V12"><?php echo $event . ' ' . $event_times; ?><br><br></td>
! </tr>
! <?php echo $display; ?>
! </table>
! </td>
! </tr>
!
! </table>
</center>
</body>
! <!-- End PAGE -->
!
! </html>
\ No newline at end of file
|
|
From: <ica...@us...> - 2003-09-23 00:15:52
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv9546 Modified Files: config.inc.php Log Message: Set save_parsed_cals to 'yes' to speed up default load of phpicalendar Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** config.inc.php 20 Sep 2003 00:37:36 -0000 1.112 --- config.inc.php 23 Sep 2003 00:15:44 -0000 1.113 *************** *** 32,36 **** // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase. ! $save_parsed_cals = 'no'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence. $use_sessions = 'no'; // This has not yet been implemented. $display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box. --- 32,36 ---- // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase. ! $save_parsed_cals = 'yes'; // Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence. $use_sessions = 'no'; // This has not yet been implemented. $display_custom_goto = 'no'; // In the 'Jump To' box, display the custom 'go to day' box. |
|
From: <cl...@us...> - 2003-09-21 20:02:58
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv4382/calendars Modified Files: US Holidays.ics Log Message: Added a fix for when peeps write calendar start times before 1970 (when unix started). Index: US Holidays.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/US Holidays.ics,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** US Holidays.ics 21 Sep 2003 19:01:56 -0000 1.1 --- US Holidays.ics 21 Sep 2003 20:02:54 -0000 1.2 *************** *** 1,277 **** ! BEGIN:VCALENDAR ! VERSION:2.0 ! PRODID:-//Rockin' Software//WinDates 5.0//EN ! METHOD:PUBLISH ! ! BEGIN:VEVENT ! SUMMARY:Grandparent's Day ! DESCRIPTION:First Sunday after Labor Day ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:19780910 ! RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=SU;BYMONTHDAY=13,7,8,9,10,11,12;BYMONTH=9 ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Election Day ! DESCRIPTION:Tuesday after 1st Monday in November ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17531106 ! RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8;BYMONTH=11 ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:April Fools Day ! DESCRIPTION:April 1 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530401 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Armed Forces Day ! DESCRIPTION:3rd Saturday of May ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530519 ! RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=3SA ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Columbus Day ! DESCRIPTION:2nd Monday of October ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17531008 ! RRULE:FREQ=MONTHLY;BYMONTH=10;BYDAY=2MO ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Daylight Savings +1 hr ! DESCRIPTION:1st Sunday of April ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530401 ! RRULE:FREQ=MONTHLY;BYMONTH=4;BYDAY=1SU ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Daylight Savings -1 hr ! DESCRIPTION:Last Sunday of October ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17531028 ! RRULE:FREQ=MONTHLY;BYMONTH=10;BYDAY=-1SU ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Father's Day ! DESCRIPTION:3rd Sunday of June ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530617 ! RRULE:FREQ=MONTHLY;BYMONTH=6;BYDAY=3SU ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Flag Day ! DESCRIPTION:June 14 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530614 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Groundhog Day ! DESCRIPTION:February 2 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530202 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Halloween ! DESCRIPTION:October 31 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17531031 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Independence Day ! DESCRIPTION:July 4 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530704 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Labor Day ! DESCRIPTION:1st Monday of September ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530903 ! RRULE:FREQ=MONTHLY;BYMONTH=9;BYDAY=1MO ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Lincoln's Birthday ! DESCRIPTION:February 12 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530212 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Mardi Gras (Fat Tuesday) ! DESCRIPTION:47 days before Easter ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530308 ! X-WD-RECUR-EASTER:TRUE ! X-WD-RECUR-OFFSET:-47 ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Martin Luther King Jr. ! DESCRIPTION:3rd Monday of January ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530115 ! RRULE:FREQ=MONTHLY;BYMONTH=1;BYDAY=3MO ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Memorial Day ! DESCRIPTION:Last Monday of May ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530528 ! RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=-1MO ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Mother's Day ! DESCRIPTION:2nd Sunday of May ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530513 ! RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=2SU ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:New Year's Day ! DESCRIPTION:January 1 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530101 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:New Year's Eve ! DESCRIPTION:December 31 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17531231 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:President's Day ! DESCRIPTION:3rd Monday of February ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530219 ! RRULE:FREQ=MONTHLY;BYMONTH=2;BYDAY=3MO ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Secretaries Day ! DESCRIPTION:Wednesday of last full week in April ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:19520423 ! RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=WE;BYMONTHDAY=25,26,27,21,22,23,24;BYMONTH=4 ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:St. Patrick's Day ! DESCRIPTION:March 17 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530317 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Thanksgiving ! DESCRIPTION:4th Thursday of November ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17531122 ! RRULE:FREQ=MONTHLY;BYMONTH=11;BYDAY=4TH ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Valentine's Day ! DESCRIPTION:February 14 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530214 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Veteran's Day ! DESCRIPTION:November 11 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17531111 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! BEGIN:VEVENT ! SUMMARY:Washington's Birthday ! DESCRIPTION:February 22 ! DTSTAMP:20030701T000000Z ! UID:hol...@ic... ! CATEGORIES:Holiday - US ! DTSTART;VALUE=DATE:17530222 ! RRULE:FREQ=YEARLY ! END:VEVENT ! ! END:VCALENDAR --- 1,37 ---- ! BEGIN:VCALENDAR ! ! ! VERSION:2.0 ! ! ! PRODID:-//Rockin' Software//WinDates 5.0//EN ! ! ! METHOD:PUBLISH ! ! ! ! ! BEGIN:VEVENT ! ! SUMMARY:Washington's Birthday ! ! DESCRIPTION:February 22 ! ! DTSTAMP:20030701T000000Z ! ! UID:hol...@ic... ! ! CATEGORIES:Holiday - US ! ! DTSTART;VALUE=DATE:17530222 ! ! RRULE:FREQ=YEARLY ! ! END:VEVENT ! ! ! ! END:VCALENDAR ! ! |
|
From: <cl...@us...> - 2003-09-21 20:02:58
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv4382/functions
Modified Files:
ical_parser.php
Log Message:
Added a fix for when peeps write calendar start times before 1970 (when
unix started).
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** ical_parser.php 21 Sep 2003 18:18:19 -0000 1.109
--- ical_parser.php 21 Sep 2003 20:02:54 -0000 1.110
***************
*** 388,391 ****
--- 388,392 ----
case 'END':
+ if (!isset($number)) $number = 1;
// if $until isn't set yet, we set it to the end of our range we're looking at
// The FREQ switch array will always kick our early, so lets try this workaround.
***************
*** 495,499 ****
break;
case 'YEARLY':
! if (!isset($bymonth)) $bymonth[] = date('m', $start_date_time);
foreach($bymonth as $month) {
$year = date('Y', $next_range_time);
--- 496,504 ----
break;
case 'YEARLY':
!
! if (!isset($bymonth)) {
! $m = date('m', $start_date_time);
! $bymonth = array("$m");
! }
foreach($bymonth as $month) {
$year = date('Y', $next_range_time);
***************
*** 765,768 ****
--- 770,778 ----
$field = ereg_replace(';VALUE=DATE-TIME', '', $field);
if (preg_match("/^DTSTART;VALUE=DATE/i", $field)) {
+ ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $data, $dtstart_check);
+ if ($dtstart_check[1] < 1969) {
+ $dtstart_check[1] = '1990';
+ $data = $dtstart_check[1].$dtstart_check[2].$dtstart_check[3];
+ }
$allday_start = $data;
$start_date = $allday_start;
|
|
From: <cl...@us...> - 2003-09-21 19:02:00
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv24828/calendars Added Files: US Holidays.ics Log Message: Added WinDates calendar for testing. --- NEW FILE: US Holidays.ics --- BEGIN:VCALENDAR VERSION:2.0 PRODID:-//Rockin' Software//WinDates 5.0//EN METHOD:PUBLISH BEGIN:VEVENT SUMMARY:Grandparent's Day DESCRIPTION:First Sunday after Labor Day DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:19780910 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=SU;BYMONTHDAY=13,7,8,9,10,11,12;BYMONTH=9 END:VEVENT BEGIN:VEVENT SUMMARY:Election Day DESCRIPTION:Tuesday after 1st Monday in November DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17531106 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8;BYMONTH=11 END:VEVENT BEGIN:VEVENT SUMMARY:April Fools Day DESCRIPTION:April 1 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530401 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Armed Forces Day DESCRIPTION:3rd Saturday of May DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530519 RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=3SA END:VEVENT BEGIN:VEVENT SUMMARY:Columbus Day DESCRIPTION:2nd Monday of October DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17531008 RRULE:FREQ=MONTHLY;BYMONTH=10;BYDAY=2MO END:VEVENT BEGIN:VEVENT SUMMARY:Daylight Savings +1 hr DESCRIPTION:1st Sunday of April DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530401 RRULE:FREQ=MONTHLY;BYMONTH=4;BYDAY=1SU END:VEVENT BEGIN:VEVENT SUMMARY:Daylight Savings -1 hr DESCRIPTION:Last Sunday of October DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17531028 RRULE:FREQ=MONTHLY;BYMONTH=10;BYDAY=-1SU END:VEVENT BEGIN:VEVENT SUMMARY:Father's Day DESCRIPTION:3rd Sunday of June DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530617 RRULE:FREQ=MONTHLY;BYMONTH=6;BYDAY=3SU END:VEVENT BEGIN:VEVENT SUMMARY:Flag Day DESCRIPTION:June 14 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530614 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Groundhog Day DESCRIPTION:February 2 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530202 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Halloween DESCRIPTION:October 31 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17531031 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Independence Day DESCRIPTION:July 4 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530704 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Labor Day DESCRIPTION:1st Monday of September DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530903 RRULE:FREQ=MONTHLY;BYMONTH=9;BYDAY=1MO END:VEVENT BEGIN:VEVENT SUMMARY:Lincoln's Birthday DESCRIPTION:February 12 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530212 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Mardi Gras (Fat Tuesday) DESCRIPTION:47 days before Easter DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530308 X-WD-RECUR-EASTER:TRUE X-WD-RECUR-OFFSET:-47 END:VEVENT BEGIN:VEVENT SUMMARY:Martin Luther King Jr. DESCRIPTION:3rd Monday of January DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530115 RRULE:FREQ=MONTHLY;BYMONTH=1;BYDAY=3MO END:VEVENT BEGIN:VEVENT SUMMARY:Memorial Day DESCRIPTION:Last Monday of May DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530528 RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=-1MO END:VEVENT BEGIN:VEVENT SUMMARY:Mother's Day DESCRIPTION:2nd Sunday of May DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530513 RRULE:FREQ=MONTHLY;BYMONTH=5;BYDAY=2SU END:VEVENT BEGIN:VEVENT SUMMARY:New Year's Day DESCRIPTION:January 1 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530101 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:New Year's Eve DESCRIPTION:December 31 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17531231 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:President's Day DESCRIPTION:3rd Monday of February DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530219 RRULE:FREQ=MONTHLY;BYMONTH=2;BYDAY=3MO END:VEVENT BEGIN:VEVENT SUMMARY:Secretaries Day DESCRIPTION:Wednesday of last full week in April DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:19520423 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=WE;BYMONTHDAY=25,26,27,21,22,23,24;BYMONTH=4 END:VEVENT BEGIN:VEVENT SUMMARY:St. Patrick's Day DESCRIPTION:March 17 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530317 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Thanksgiving DESCRIPTION:4th Thursday of November DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17531122 RRULE:FREQ=MONTHLY;BYMONTH=11;BYDAY=4TH END:VEVENT BEGIN:VEVENT SUMMARY:Valentine's Day DESCRIPTION:February 14 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530214 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Veteran's Day DESCRIPTION:November 11 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17531111 RRULE:FREQ=YEARLY END:VEVENT BEGIN:VEVENT SUMMARY:Washington's Birthday DESCRIPTION:February 22 DTSTAMP:20030701T000000Z UID:hol...@ic... CATEGORIES:Holiday - US DTSTART;VALUE=DATE:17530222 RRULE:FREQ=YEARLY END:VEVENT END:VCALENDAR |
|
From: <cl...@us...> - 2003-09-21 18:33:07
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv19100 Modified Files: README Log Message: README update for 4.x browsers. Added links to ical based apps. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** README 20 Sep 2003 21:46:17 -0000 1.49 --- README 21 Sep 2003 18:33:02 -0000 1.50 *************** *** 44,51 **** valid IETF 2445 files (.ics). Some of the supported applications are: ! -Apple iCal ! -Mozilla Calendar ! -Ximian Evolution ! -KOrganizer Bugs: --- 44,57 ---- valid IETF 2445 files (.ics). Some of the supported applications are: ! - Apple iCal ! - http://www.apple.com/ical/ ! - Mozilla Calendar ! - http://www.mozilla.org/projects/calendar/ ! - Ximian Evolution ! - http://www.ximian.com/products/evolution/ ! - KOrganizer ! - http://korganizer.kde.org/ ! - WinDates 5.0 ! - http://www.rockinsoftware.com/windates.htm Bugs: *************** *** 71,74 **** --- 77,88 ---- COPYING for more information about our license. + Older Browser Support: + ---------------------- + Starting with 0.9.4, PHP iCalendar is moving away from supporting 4.x browsers. + If you still need support for these browers, 0.9.3 is still available for + download. To get the latest ical support, simply download the latest version + of PHP iCalendar and replace the file called 'ical_parser.php' in the + functions folder. + Changes: -------- *************** *** 83,86 **** --- 97,101 ---- -Moved HTML head into header.inc.php to better support embedding of calendar. -Moved HTML foot into footer.inc.php to better support embedding of calendar. + -Specify the name of 'All Calendars Combined' in language files. 0.9.3 *************** *** 89,92 **** --- 104,109 ---- -Added Esperanto language. -Major bug fixes. + -Last to support Netscape 4.x + 0.9.2 -Fixed an extra .php on the preferences page. |
|
From: <cl...@us...> - 2003-09-21 18:18:22
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv16075/functions
Modified Files:
ical_parser.php
Log Message:
Somewhat better BYMONTH support. Still seems flakey in year view for some
reason. :(
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** ical_parser.php 20 Sep 2003 19:43:16 -0000 1.108
--- ical_parser.php 21 Sep 2003 18:18:19 -0000 1.109
***************
*** 439,442 ****
--- 439,443 ----
break;
case 'MONTHLY':
+ if (!isset($bymonth)) $bymonth = array(1,2,3,4,5,6,7,8,9,10,11,12);
$next_range_time = strtotime(date('Y-m-01', $next_range_time));
// month has two cases, either $bymonthday or $byday
***************
*** 464,470 ****
$last_tmp = (date('w',$next_range_time) == $on_day_num) ? '' : 'last ';
$next_date_time = strtotime($last_tmp.$on_day.' -'.$nth.' week', $next_range_time);
} elseif (is_array($bymonthday)) {
// This supports MONTHLY where BYDAY and BYMONTH are both set
- if (!isset($bymonth)) $bymonth = array(1,2,3,4,5,6,7,8,9,10,11,12);
foreach($bymonthday as $day) {
$year = date('Y', $next_range_time);
--- 465,474 ----
$last_tmp = (date('w',$next_range_time) == $on_day_num) ? '' : 'last ';
$next_date_time = strtotime($last_tmp.$on_day.' -'.$nth.' week', $next_range_time);
+ $month = date('m', $next_date_time);
+ if (in_array($month, $bymonth)) {
+ $recur_data[] = $next_date_time;
+ }
} elseif (is_array($bymonthday)) {
// This supports MONTHLY where BYDAY and BYMONTH are both set
foreach($bymonthday as $day) {
$year = date('Y', $next_range_time);
***************
*** 478,484 ****
}
}
! } elseif (isset($byday_arr[1])) {
$next_date_time = strtotime($on_day.' +'.$nth.' week', $next_range_time);
! $recur_data[] = $next_date_time;
}
$next_date = date('Ymd', $next_date_time);
--- 482,491 ----
}
}
! } elseif ((isset($byday_arr[1])) && ($byday_arr[1] != '-')) {
$next_date_time = strtotime($on_day.' +'.$nth.' week', $next_range_time);
! $month = date('m', $next_date_time);
! if (in_array($month, $bymonth)) {
! $recur_data[] = $next_date_time;
! }
}
$next_date = date('Ymd', $next_date_time);
|
|
From: <cl...@us...> - 2003-09-21 17:13:49
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv4741/calendars Modified Files: Home.ics Log Message: Removed extra form space with a style. Index: Home.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/Home.ics,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Home.ics 20 Sep 2003 19:43:15 -0000 1.11 --- Home.ics 21 Sep 2003 17:13:45 -0000 1.12 *************** *** 194,196 **** --- 194,214 ---- BYDAY=FR END:VEVENT + BEGIN:VEVENT + SUMMARY:Daylight Savings +1 hr + DESCRIPTION:1st Sunday of April + DTSTAMP:20030701T000000Z + UID:hol...@ic... + CATEGORIES:Holiday - US + DTSTART;VALUE=DATE:17530401 + RRULE:FREQ=MONTHLY;BYMONTH=4;BYDAY=1SU + END:VEVENT + BEGIN:VEVENT + SUMMARY:Daylight Savings -1 hr + DESCRIPTION:Last Sunday of October + DTSTAMP:20030701T000000Z + UID:hol...@ic... + CATEGORIES:Holiday - US + DTSTART;VALUE=DATE:17531028 + RRULE:FREQ=MONTHLY;BYMONTH=10;BYDAY=-1SU + END:VEVENT END:VCALENDAR |
|
From: <cl...@us...> - 2003-09-21 17:13:49
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv4741/includes
Modified Files:
calendar_nav.php sidebar.php
Log Message:
Removed extra form space with a style.
Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** calendar_nav.php 21 Sep 2003 05:59:31 -0000 1.10
--- calendar_nav.php 21 Sep 2003 17:13:46 -0000 1.11
***************
*** 105,109 ****
echo '<b>'.$jump_lang.'</b><br>';
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! echo "<form action=\"month.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
include('./functions/list_icals.php');
include('./functions/list_years.php');
--- 105,109 ----
echo '<b>'.$jump_lang.'</b><br>';
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! echo "<form style=\"margin-bottom:0;\" action=\"month.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
include('./functions/list_icals.php');
include('./functions/list_years.php');
Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** sidebar.php 21 Sep 2003 05:59:31 -0000 1.20
--- sidebar.php 21 Sep 2003 17:13:46 -0000 1.21
***************
*** 14,18 ****
}
! $search_box = '<form action="search.php" method="GET"><input type="hidden" name="cal" value="'.$cal.'"><input type="hidden" name="getdate" value="'.$getdate.'"><input type="text" style="font-size:10px" size="15" class="search_style" name="query" value="'.$search_lang.'" onfocus="javascript:if(this.value==\''.$search_lang.'\') {this.value=\'\';}" onblur="javascript:if(this.value==\'\') {this.value=\''.$search_lang.'\'}"><INPUT type="image" src="styles/'.$style_sheet.'/search.gif" name="submit" value="Search"></form>';
?>
--- 14,18 ----
}
! $search_box = '<form style="margin-bottom:0;" action="search.php" method="GET"><input type="hidden" name="cal" value="'.$cal.'"><input type="hidden" name="getdate" value="'.$getdate.'"><input type="text" style="font-size:10px" size="15" class="search_style" name="query" value="'.$search_lang.'" onfocus="javascript:if(this.value==\''.$search_lang.'\') {this.value=\'\';}" onblur="javascript:if(this.value==\'\') {this.value=\''.$search_lang.'\'}"><INPUT type="image" src="styles/'.$style_sheet.'/search.gif" name="submit" value="Search"></form>';
?>
***************
*** 51,55 ****
echo '<div style="padding: 5px;">';
! echo '<form action="day.php" method="GET">';
echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
include('./functions/list_icals.php');
--- 51,55 ----
echo '<div style="padding: 5px;">';
! echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
include('./functions/list_icals.php');
***************
*** 62,66 ****
}
if ($display_custom_goto == "yes") {
! echo '<form action="day.php" method="GET">';
echo '<input type="hidden" name="cal" value="'.urlencode($cal).'">';
echo '<input type="text" style="width:160px; font-size:10px" name="jumpto_day">';
--- 62,66 ----
}
if ($display_custom_goto == "yes") {
! echo '<form style="margin-bottom:0;" action="day.php" method="GET">';
echo '<input type="hidden" name="cal" value="'.urlencode($cal).'">';
echo '<input type="text" style="width:160px; font-size:10px" name="jumpto_day">';
|
|
From: <cl...@us...> - 2003-09-21 05:59:35
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv27840/includes
Modified Files:
calendar_nav.php sidebar.php
Log Message:
Fixed extra forms on sidebar. Fixed missing <tr>s.
Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** calendar_nav.php 20 Sep 2003 00:16:05 -0000 1.9
--- calendar_nav.php 21 Sep 2003 05:59:31 -0000 1.10
***************
*** 51,54 ****
--- 51,55 ----
$start_day = strtotime("+1 day", $start_day);
}
+ echo '</tr>';
$minical_time = strtotime("-1 month", $fake_getdate_time);
$minical_month = date("m", $minical_time);
***************
*** 104,108 ****
echo '<b>'.$jump_lang.'</b><br>';
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! echo "<form action=\"day.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
include('./functions/list_icals.php');
include('./functions/list_years.php');
--- 105,109 ----
echo '<b>'.$jump_lang.'</b><br>';
echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
! echo "<form action=\"month.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
include('./functions/list_icals.php');
include('./functions/list_years.php');
***************
*** 172,175 ****
--- 173,177 ----
$start_day = strtotime("+1 day", $start_day);
}
+ echo '</tr>';
$minical_time = strtotime("+1 month", $fake_getdate_time);
$minical_month = date("m", $minical_time);
Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** sidebar.php 20 Sep 2003 00:31:36 -0000 1.19
--- sidebar.php 21 Sep 2003 05:59:31 -0000 1.20
***************
*** 1,383 ****
! <?php
! // Get the real date to display in the sidebar, not the date displayed in the calendar
! $really_unix_time = strtotime(date('Ymd'));
! $really_today_today = date ('Ymd', $really_unix_time);
!
! if ($cal == $ALL_CALENDARS_COMBINED) {
! $cal_displayname2 = $all_cal_comb_lang;
! } else {
! $cal_displayname2 = $calendar_name . " $calendar_lang";
! }
! if (strlen($cal_displayname2) > 24) {
! $cal_displayname2 = substr("$cal_displayname2", 0, 21);
! $cal_displayname2 = $cal_displayname2 . "...";
! }
!
! $search_box = '<form action="search.php" method="GET"><input type="hidden" name="cal" value="'.$cal.'"><input type="hidden" name="getdate" value="'.$getdate.'"><input type="text" style="font-size:10px" size="15" class="search_style" name="query" value="'.$search_lang.'" onfocus="javascript:if(this.value==\''.$search_lang.'\') {this.value=\'\';}" onblur="javascript:if(this.value==\'\') {this.value=\''.$search_lang.'\'}"><INPUT type="image" src="styles/'.$style_sheet.'/search.gif" name="submit" value="Search"></form>';
! ?>
! <form action="" method="GET">
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr>
! <td align="left" valign="top" width="24" class="sideback"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$yesterdays_date\"><img src=\"styles/$style_sheet/left_arrows.gif\" alt=\"[$prev_lang]\" width=\"16\" height=\"20\" border=\"0\" align=\"left\"></a>"; ?></td>
! <td align="center" width="112" class="sideback"><font class="G10BOLD"><?php echo "$thisday2"; ?></font></td>
! <td align="right" valign="top" width="24" class="sideback"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$tomorrows_date\"><img src=\"styles/$style_sheet/right_arrows.gif\" alt=\"[$next_lang]\" width=\"16\" height=\"20\" border=\"0\" align=\"right\"></a>"; ?></td>
! </tr>
! <tr>
! <td colspan="3" bgcolor="#FFFFFF" align="left">
! <?php
! echo '<div style="padding: 5px;">';
! echo '<font class="G10BOLD">'.$cal_displayname2.'</font><br>';
! echo '<span class="G10">';
! echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$really_today_today\">$goday_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$really_today_today\">$goweek_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$really_today_today\">$gomonth_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$really_today_today\">$goyear_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$getdate&printview=$current_view\">$goprint_lang</a><br>\n";
! if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n";
! if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! echo '</span></div>';
! ?>
! </td>
! </tr>
! </table>
! </form>
! <form action="day.php" method="GET">
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$jump_lang"; ?></div></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="left">
! <?php
!
echo '<div style="padding: 5px;">';
! echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
! include('./functions/list_icals.php');
! include('./functions/list_years.php');
! include('./functions/list_months.php');
! include('./functions/list_weeks.php');
! if ($show_search == 'yes') {
! echo $search_box;
! }
! if ($display_custom_goto == "yes") {
! echo '<form action="day.php" method="GET">';
! echo '<input type="hidden" name="cal" value="'.urlencode($cal).'">';
! echo '<input type="text" style="width:160px; font-size:10px" name="jumpto_day">';
! echo '<input type="submit" value="Go">';
! echo '</form>';
! }
! echo '</div>';
! ?>
! </td>
! </tr>
! </table>
! </form>
! <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?>
! <form action="" method="GET">
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$tomorrows_lang"; ?></div></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
! <tr>
! <td colspan="7"><img src="images/spacer.gif" width="21" height="6" alt=" "></td>
! </tr>
!
! <?php
! echo "<tr>\n";
! echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\" alt=\" \"></td>";
! echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
! foreach ($master_array[("$tomorrows_date")] as $event_times) {
! foreach ($event_times as $val) {
! $event_text = stripslashes(urldecode($val["event_text"]));
! $event_text = strip_tags($event_text, '<b><i><u>');
! if ($event_text != "") {
! $event_text2 = rawurlencode(addslashes($val["event_text"]));
! $description = addslashes(urlencode($val["description"]));
! $event_start = @$val["event_start"];
! $event_end = @$val["event_end"];
! $event_start = date ($timeFormat, @strtotime ("$event_start"));
! $event_end = date ($timeFormat, @strtotime ("$event_end"));
! $calendar_name2 = addslashes($calendar_name);
! $calendar_name2 = urlencode($calendar_name2);
! $event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
!
! if (!isset($val["event_start"])) {
! $event_start = $all_day_lang;
! $event_end = '';
! openevent($calendar_name2, $event_start,
! $event_end, $val, $tomorrows_events_lines, 21, '<i>', '</i>', 'psf');
! echo "<br>\n";
! } else {
! openevent($calendar_name2, $event_start,
! $event_end, $val, $tomorrows_events_lines, 21, '<font class="G10B">• ', '</font>', 'psf');
! echo "<br>\n";
! }
!
! }
}
}
! echo "</td>\n";
! echo "</tr>\n";
! ?>
! </table>
! </td>
! </tr>
! <tr>
! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
! </tr>
! </table>
! </form>
! <?php
! }
! if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
! <form action="" method="GET">
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" width="98%" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$todo_lang"; ?></div></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
! <tr>
! <td colspan="7"><img src="images/spacer.gif" width="21" height="6" alt=" "></td>
! </tr>
!
! <?php
! echo "<tr>\n";
! echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\" alt=\" \"></td>";
! echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
! echo "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n";
! foreach ($master_array['-2'] as $vtodo_times) {
! foreach ($vtodo_times as $val) {
! $vtodo_text = stripslashes(urldecode($val["vtodo_text"]));
! if ($vtodo_text != "") {
! if (isset($val["description"])) {
! $description = urldecode($val["description"]);
! } else {
! $description = "";
! }
! $completed_date = $val['completed_date'];
! $status = $val["status"];
! $priority = $val['priority'];
! $start_date = $val["start_date"];
! $due_date = $val['due_date'];
! $vtodo_array = array(
! 'cal' => $calendar_name,
! 'completed_date'=> $completed_date,
! 'description' => $description,
! 'due_date' => $due_date,
! 'priority' => $priority,
! 'start_date' => $start_date,
! 'status' => $status,
! 'vtodo_text' => $vtodo_text);
! $vtodo_array = base64_encode(serialize($vtodo_array));
!
! $vtodo_text = word_wrap(strip_tags(str_replace('<br>',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
! $vtodo_link = "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_array')\">";
!
! if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) {
! if ($show_completed == 'yes') {
! $vtodo_text = "<S>$vtodo_text</S>";
! echo "<tr><td>$vtodo_link<img src=\"images/completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
! echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
! }
! } elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) {
! echo "<tr><td>$vtodo_link<img src=\"images/important.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
! echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
! } else {
! echo "<tr><td>$vtodo_link<img src=\"images/not_completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
}
}
}
}
! echo "</table>\n";
! echo "</td>\n";
! echo "</tr>\n";
! ?>
! </table>
! </td>
! </tr>
! <tr>
! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
! </tr>
! </table>
! </form>
<?php }
$fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15');
?>
! <form action="" method="GET">
! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("-1 month", $fake_getdate_time))); ?></font></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
! <?php
! $start_day = strtotime($week_start_day);
! echo '<tr>';
! for ($i=0; $i<7; $i++) {
! $day_num = date("w", $start_day);
! $day = $daysofweekreallyshort_lang[$day_num];
! echo '<td align="center" class="G10BOLD">'.$day.'</td>';
! $start_day = strtotime("+1 day", $start_day);
}
! $minical_time = strtotime("-1 month", $fake_getdate_time);
! $minical_month = date("m", $minical_time);
! $minical_year = date("Y", $minical_time);
! $first_of_month = $minical_year.$minical_month."01";
! $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
! do {
! $day = date ("j", $start_day);
! $daylink = date ("Ymd", $start_day);
! $check_month = date ("m", $start_day);
! if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
! if ($i == 0) echo "<tr>\n";
! if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! } else {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! }
! $start_day = strtotime("+1 day", $start_day);
! $i++;
! if ($i == 7) {
! echo '</tr>';
! $i = 0;
! $checkagain = date ("m", $start_day);
! if ($checkagain != $minical_month) $whole_month = FALSE;
! }
! } while ($whole_month == TRUE);
! ?>
! </table>
! <img src="images/spacer.gif" width="1" height="3" alt=" "><br>
! </td>
! </tr>
! </table>
! </form>
! <form action="" method="GET">
! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime($getdate))); ?></font></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
! <?php
! $start_day = strtotime($week_start_day);
! echo '<tr>';
! for ($i=0; $i<7; $i++) {
! $day_num = date("w", $start_day);
! $day = $daysofweekreallyshort_lang[$day_num];
! echo '<td align="center" class="G10BOLD">'.$day.'</td>';
! $start_day = strtotime("+1 day", $start_day);
}
! $minical_time = $fake_getdate_time;
! $minical_month = date("m", $minical_time);
! $minical_year = date("Y", $minical_time);
! $first_of_month = $minical_year.$minical_month."01";
! $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
! do {
! $day = date ("j", $start_day);
! $daylink = date ("Ymd", $start_day);
! $check_month = date ("m", $start_day);
! if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
! if ($i == 0) echo "<tr>\n";
! if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! } else {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! }
! $start_day = strtotime("+1 day", $start_day);
! $i++;
! if ($i == 7) {
! echo '</tr>';
! $i = 0;
! $checkagain = date ("m", $start_day);
! if ($checkagain != $minical_month) $whole_month = FALSE;
! }
! } while ($whole_month == TRUE);
! ?>
! </table>
! <img src="images/spacer.gif" width="1" height="3" alt=" "><br>
! </td>
! </tr>
! </table>
! </form>
!
! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("+1 month", strtotime($getdate)))); ?></font></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
! <?php
! $start_day = strtotime($week_start_day);
! echo '<tr>';
! for ($i=0; $i<7; $i++) {
! $day_num = date("w", $start_day);
! $day = $daysofweekreallyshort_lang[$day_num];
! echo '<td align="center" class="G10BOLD">'.$day.'</td>';
! $start_day = strtotime("+1 day", $start_day);
}
! $minical_time = strtotime("+1 month", $fake_getdate_time);
! $minical_month = date("m", $minical_time);
! $minical_year = date("Y", $minical_time);
! $first_of_month = $minical_year.$minical_month."01";
! $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
! do {
! $day = date ("j", $start_day);
! $daylink = date ("Ymd", $start_day);
! $check_month = date ("m", $start_day);
! if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
! if ($i == 0) echo "<tr>\n";
! if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! } else {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! }
! $start_day = strtotime("+1 day", $start_day);
! $i++;
! if ($i == 7) {
! echo '</tr>';
! $i = 0;
! $checkagain = date ("m", $start_day);
! if ($checkagain != $minical_month) $whole_month = FALSE;
! }
! } while ($whole_month == TRUE);
! ?>
! </table>
! <img src="images/spacer.gif" width="1" height="3" alt=" "><br>
! </td>
! </tr>
! </table>
--- 1,380 ----
! <?php
! // Get the real date to display in the sidebar, not the date displayed in the calendar
! $really_unix_time = strtotime(date('Ymd'));
! $really_today_today = date ('Ymd', $really_unix_time);
!
! if ($cal == $ALL_CALENDARS_COMBINED) {
! $cal_displayname2 = $all_cal_comb_lang;
! } else {
! $cal_displayname2 = $calendar_name . " $calendar_lang";
! }
! if (strlen($cal_displayname2) > 24) {
! $cal_displayname2 = substr("$cal_displayname2", 0, 21);
! $cal_displayname2 = $cal_displayname2 . "...";
! }
! $search_box = '<form action="search.php" method="GET"><input type="hidden" name="cal" value="'.$cal.'"><input type="hidden" name="getdate" value="'.$getdate.'"><input type="text" style="font-size:10px" size="15" class="search_style" name="query" value="'.$search_lang.'" onfocus="javascript:if(this.value==\''.$search_lang.'\') {this.value=\'\';}" onblur="javascript:if(this.value==\'\') {this.value=\''.$search_lang.'\'}"><INPUT type="image" src="styles/'.$style_sheet.'/search.gif" name="submit" value="Search"></form>';
!
! ?>
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr>
! <td align="left" valign="top" width="24" class="sideback"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$yesterdays_date\"><img src=\"styles/$style_sheet/left_arrows.gif\" alt=\"[$prev_lang]\" width=\"16\" height=\"20\" border=\"0\" align=\"left\"></a>"; ?></td>
! <td align="center" width="112" class="sideback"><font class="G10BOLD"><?php echo "$thisday2"; ?></font></td>
! <td align="right" valign="top" width="24" class="sideback"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$tomorrows_date\"><img src=\"styles/$style_sheet/right_arrows.gif\" alt=\"[$next_lang]\" width=\"16\" height=\"20\" border=\"0\" align=\"right\"></a>"; ?></td>
! </tr>
! <tr>
! <td colspan="3" bgcolor="#FFFFFF" align="left">
! <?php
echo '<div style="padding: 5px;">';
! echo '<font class="G10BOLD">'.$cal_displayname2.'</font><br>';
! echo '<span class="G10">';
! echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$really_today_today\">$goday_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$really_today_today\">$goweek_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$really_today_today\">$gomonth_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$really_today_today\">$goyear_lang</a><br>\n";
! echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$getdate&printview=$current_view\">$goprint_lang</a><br>\n";
! if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n";
! if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
! echo '</span></div>';
! ?>
! </td>
! </tr>
! </table>
! <img src="images/spacer.gif" width="1" height="10" alt=" "><br>
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$jump_lang"; ?></div></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="left">
! <?php
!
! echo '<div style="padding: 5px;">';
! echo '<form action="day.php" method="GET">';
! echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
! include('./functions/list_icals.php');
! include('./functions/list_years.php');
! include('./functions/list_months.php');
! include('./functions/list_weeks.php');
! echo '</form>';
! if ($show_search == 'yes') {
! echo $search_box;
! }
! if ($display_custom_goto == "yes") {
! echo '<form action="day.php" method="GET">';
! echo '<input type="hidden" name="cal" value="'.urlencode($cal).'">';
! echo '<input type="text" style="width:160px; font-size:10px" name="jumpto_day">';
! echo '<input type="submit" value="Go">';
! echo '</form>';
! }
! echo '</div>';
! ?>
! </td>
! </tr>
! </table>
! <img src="images/spacer.gif" width="1" height="10" alt=" "><br>
! <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?>
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$tomorrows_lang"; ?></div></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
! <tr>
! <td colspan="7"><img src="images/spacer.gif" width="21" height="6" alt=" "></td>
! </tr>
!
! <?php
! echo "<tr>\n";
! echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\" alt=\" \"></td>";
! echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
! foreach ($master_array[("$tomorrows_date")] as $event_times) {
! foreach ($event_times as $val) {
! $event_text = stripslashes(urldecode($val["event_text"]));
! $event_text = strip_tags($event_text, '<b><i><u>');
! if ($event_text != "") {
! $event_text2 = rawurlencode(addslashes($val["event_text"]));
! $description = addslashes(urlencode($val["description"]));
! $event_start = @$val["event_start"];
! $event_end = @$val["event_end"];
! $event_start = date ($timeFormat, @strtotime ("$event_start"));
! $event_end = date ($timeFormat, @strtotime ("$event_end"));
! $calendar_name2 = addslashes($calendar_name);
! $calendar_name2 = urlencode($calendar_name2);
! $event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
!
! if (!isset($val["event_start"])) {
! $event_start = $all_day_lang;
! $event_end = '';
! openevent($calendar_name2, $event_start,
! $event_end, $val, $tomorrows_events_lines, 21, '<i>', '</i>', 'psf');
! echo "<br>\n";
! } else {
! openevent($calendar_name2, $event_start,
! $event_end, $val, $tomorrows_events_lines, 21, '<font class="G10B">• ', '</font>', 'psf');
! echo "<br>\n";
! }
!
}
}
! }
! echo "</td>\n";
! echo "</tr>\n";
! ?>
! </table>
! </td>
! </tr>
! <tr>
! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
! </tr>
! </table>
! <img src="images/spacer.gif" width="1" height="10" alt=" "><br>
! <?php } if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" width="98%" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$todo_lang"; ?></div></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
! <tr>
! <td colspan="7"><img src="images/spacer.gif" width="21" height="6" alt=" "></td>
! </tr>
!
! <?php
! echo "<tr>\n";
! echo "<td width=\"1%\"><img src=\"images/spacer.gif\" width=\"4\" height=\"1\" alt=\" \"></td>";
! echo "<td colspan=\"6\" class=\"G10B\" align=\"left\">\n";
! echo "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n";
! foreach ($master_array['-2'] as $vtodo_times) {
! foreach ($vtodo_times as $val) {
! $vtodo_text = stripslashes(urldecode($val["vtodo_text"]));
! if ($vtodo_text != "") {
! if (isset($val["description"])) {
! $description = urldecode($val["description"]);
! } else {
! $description = "";
! }
! $completed_date = $val['completed_date'];
! $status = $val["status"];
! $priority = $val['priority'];
! $start_date = $val["start_date"];
! $due_date = $val['due_date'];
! $vtodo_array = array(
! 'cal' => $calendar_name,
! 'completed_date'=> $completed_date,
! 'description' => $description,
! 'due_date' => $due_date,
! 'priority' => $priority,
! 'start_date' => $start_date,
! 'status' => $status,
! 'vtodo_text' => $vtodo_text);
!
! $vtodo_array = base64_encode(serialize($vtodo_array));
!
! $vtodo_text = word_wrap(strip_tags(str_replace('<br>',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
! $vtodo_link = "<a class=\"psf\" href=\"javascript:openTodoInfo('$vtodo_array')\">";
!
! if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) {
! if ($show_completed == 'yes') {
! $vtodo_text = "<S>$vtodo_text</S>";
! echo "<tr><td>$vtodo_link<img src=\"images/completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
}
+ } elseif (isset($val['priority']) && ($val['priority'] != 0) && ($val['priority'] <= 5)) {
+ echo "<tr><td>$vtodo_link<img src=\"images/important.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
+ echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
+ } else {
+ echo "<tr><td>$vtodo_link<img src=\"images/not_completed.gif\" alt=\" \" width=\"13\" height=\"11\" border=\"0\" align=\"middle\"></a></td>\n";
+ echo "<td><img src=\"images/spacer.gif\" width=\"2\" height=\"1\" border\"0\" /></td><td>$vtodo_link<font class=\"G10B\"> $vtodo_text</font></a></td></tr>\n";
}
}
}
! }
! echo "</table>\n";
! echo "</td>\n";
! echo "</tr>\n";
! ?>
! </table>
! </td>
! </tr>
! <tr>
! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
! </tr>
! </table>
! <img src="images/spacer.gif" width="1" height="10" alt=" "><br>
<?php }
$fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15');
?>
! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("-1 month", $fake_getdate_time))); ?></font></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
! <?php
! $start_day = strtotime($week_start_day);
! echo '<tr>';
! for ($i=0; $i<7; $i++) {
! $day_num = date("w", $start_day);
! $day = $daysofweekreallyshort_lang[$day_num];
! echo '<td align="center" class="G10BOLD">'.$day.'</td>';
! $start_day = strtotime("+1 day", $start_day);
! }
! echo '</tr>';
! $minical_time = strtotime("-1 month", $fake_getdate_time);
! $minical_month = date("m", $minical_time);
! $minical_year = date("Y", $minical_time);
! $first_of_month = $minical_year.$minical_month."01";
! $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
! do {
! $day = date ("j", $start_day);
! $daylink = date ("Ymd", $start_day);
! $check_month = date ("m", $start_day);
! if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
! if ($i == 0) echo "<tr>\n";
! if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! } else {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
}
! $start_day = strtotime("+1 day", $start_day);
! $i++;
! if ($i == 7) {
! echo '</tr>';
! $i = 0;
! $checkagain = date ("m", $start_day);
! if ($checkagain != $minical_month) $whole_month = FALSE;
}
! } while ($whole_month == TRUE);
! ?>
! </table>
! <img src="images/spacer.gif" width="1" height="3" alt=" "><br>
! </td>
! </tr>
! </table>
! <img src="images/spacer.gif" width="1" height="10" alt=" "><br>
! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime($getdate))); ?></font></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
! <?php
! $start_day = strtotime($week_start_day);
! echo '<tr>';
! for ($i=0; $i<7; $i++) {
! $day_num = date("w", $start_day);
! $day = $daysofweekreallyshort_lang[$day_num];
! echo '<td align="center" class="G10BOLD">'.$day.'</td>';
! $start_day = strtotime("+1 day", $start_day);
! }
! echo '</tr>';
! $minical_time = $fake_getdate_time;
! $minical_month = date("m", $minical_time);
! $minical_year = date("Y", $minical_time);
! $first_of_month = $minical_year.$minical_month."01";
! $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
! do {
! $day = date ("j", $start_day);
! $daylink = date ("Ymd", $start_day);
! $check_month = date ("m", $start_day);
! if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
! if ($i == 0) echo "<tr>\n";
! if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! } else {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
}
! $start_day = strtotime("+1 day", $start_day);
! $i++;
! if ($i == 7) {
! echo '</tr>';
! $i = 0;
! $checkagain = date ("m", $start_day);
! if ($checkagain != $minical_month) $whole_month = FALSE;
! }
! } while ($whole_month == TRUE);
! ?>
! </table>
! <img src="images/spacer.gif" width="1" height="3" alt=" "><br>
! </td>
! </tr>
! </table>
! <img src="images/spacer.gif" width="1" height="10" alt=" "><br>
! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
! <tr height="20">
! <td align="center" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("+1 month", strtotime($getdate)))); ?></font></td>
! </tr>
! <tr>
! <td bgcolor="#FFFFFF" align="center">
! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
! <?php
! $start_day = strtotime($week_start_day);
! echo '<tr>';
! for ($i=0; $i<7; $i++) {
! $day_num = date("w", $start_day);
! $day = $daysofweekreallyshort_lang[$day_num];
! echo '<td align="center" class="G10BOLD">'.$day.'</td>';
! $start_day = strtotime("+1 day", $start_day);
! }
! echo '</tr>';
! $minical_time = strtotime("+1 month", $fake_getdate_time);
! $minical_month = date("m", $minical_time);
! $minical_year = date("Y", $minical_time);
! $first_of_month = $minical_year.$minical_month."01";
! $start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
! do {
! $day = date ("j", $start_day);
! $daylink = date ("Ymd", $start_day);
! $check_month = date ("m", $start_day);
! if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
! if ($i == 0) echo "<tr>\n";
! if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! } else {
! echo '<td width="22" align="center" class="G10B">';
! echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
! }
! $start_day = strtotime("+1 day", $start_day);
! $i++;
! if ($i == 7) {
! echo '</tr>';
! $i = 0;
! $checkagain = date ("m", $start_day);
! if ($checkagain != $minical_month) $whole_month = FALSE;
! }
! } while ($whole_month == TRUE);
! ?>
! </table>
! <img src="images/spacer.gif" width="1" height="3" alt=" "><br>
! </td>
! </tr>
! </table>
|
Update of /cvsroot/phpicalendar/phpicalendar/languages
In directory sc8-pr-cvs1:/tmp/cvs-serv24791/languages
Modified Files:
brazilian.inc.php catalan.inc.php czech.inc.php danish.inc.php
dutch.inc.php english.inc.php esperanto.inc.php
finnish.inc.php french.inc.php german.inc.php italian.inc.php
japanese.inc.php norwegian.inc.php polish.inc.php
portuguese.inc.php spanish.inc.php swedish.inc.php
traditional_chinese.inc.php
Log Message:
Language checkins for 0.9.4
Index: brazilian.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/brazilian.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** brazilian.inc.php 30 May 2003 18:08:37 -0000 1.4
--- brazilian.inc.php 21 Sep 2003 05:33:58 -0000 1.5
***************
*** 2,6 ****
// Brazilian Portuguese language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Wilton, Bennet (su...@be...)
--- 2,6 ----
// Brazilian Portuguese language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Wilton, Bennet (su...@be...)
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Dia';
$week_lang = 'Semana';
--- 8,11 ----
***************
*** 88,94 ****
$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';
--- 86,89 ----
***************
*** 119,122 ****
--- 114,120 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: catalan.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/catalan.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** catalan.inc.php 2 Jun 2003 19:02:19 -0000 1.4
--- catalan.inc.php 21 Sep 2003 05:33:58 -0000 1.5
***************
*** 2,10 ****
// Catalan language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Oriol Ferrer Mesia; (tm...@sa...)
-
$day_lang = "Dia";
$week_lang = "Setmana";
--- 2,9 ----
// Catalan language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Oriol Ferrer Mesia; (tm...@sa...)
$day_lang = "Dia";
$week_lang = "Setmana";
***************
*** 86,92 ****
$prefs_unset_lang = 'Preferences unset. Changes will take place next page load.';
$unset_prefs_lang = 'Unset preferences:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organitzador';
$attendee_lang = 'Persones presents';
--- 85,88 ----
***************
*** 117,120 ****
--- 113,119 ----
$submit_lang = 'Envia';
$delete_lang = 'Esborra';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: czech.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/czech.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** czech.inc.php 30 May 2003 18:08:37 -0000 1.4
--- czech.inc.php 21 Sep 2003 05:33:58 -0000 1.5
***************
*** 2,12 ****
// Czech language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Whit, studio jižák (wh...@st...)
//
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Den';
--- 2,10 ----
// Czech language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Whit, studio jižák (wh...@st...)
//
// Submit new translations to ch...@ch...
$day_lang = 'Den';
Index: danish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/danish.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** danish.inc.php 30 May 2003 18:08:37 -0000 1.22
--- danish.inc.php 21 Sep 2003 05:33:58 -0000 1.23
***************
*** 2,6 ****
// Danish language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Henrik H�jmark (st...@wo...)
--- 2,6 ----
// Danish language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Henrik H�jmark (st...@wo...)
***************
*** 9,14 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Dag';
$week_lang = 'Uge';
--- 9,12 ----
***************
*** 88,94 ****
$prefs_unset_lang = 'Indstillinger fjernet. Ændringer er synlig ved næste sidevisning.'; //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';
--- 86,89 ----
***************
*** 119,122 ****
--- 114,120 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: dutch.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/dutch.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** dutch.inc.php 2 Jun 2003 19:02:19 -0000 1.19
--- dutch.inc.php 21 Sep 2003 05:33:58 -0000 1.20
***************
*** 2,6 ****
// Dutch language include
! // For version 0.9.1 PHP iCalendar
//
// Translation by Lieven Gekiere (Li...@ge...)
--- 2,6 ----
// Dutch language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Lieven Gekiere (Li...@ge...)
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Dag';
$week_lang = 'Week';
--- 8,11 ----
***************
*** 85,94 ****
$todo_lang = 'Nog af te werken items';
$unfinished_lang = 'Niet afgewerkt';
! $prefs_set_lang = 'Uw voorkeuren zijn bewaard.';
! $prefs_unset_lang = 'Voorkeuren niet bewaard. Aanpassingen zijn actief de volgende keer u de pagina laadt.';
! $unset_prefs_lang = 'Niet bewaarde voorkeuren:';
!
! // ----- New for 0.9.2
!
$organizer_lang = 'Organisator';
$attendee_lang = 'Aanwezige';
--- 83,89 ----
$todo_lang = 'Nog af te werken items';
$unfinished_lang = 'Niet afgewerkt';
! $prefs_set_lang = 'Uw voorkeuren zijn bewaard.';
! $prefs_unset_lang = 'Voorkeuren niet bewaard. Aanpassingen zijn actief de volgende keer u de pagina laadt.';
! $unset_prefs_lang = 'Niet bewaarde voorkeuren:';
$organizer_lang = 'Organisator';
$attendee_lang = 'Aanwezige';
***************
*** 119,122 ****
--- 114,120 ----
$submit_lang = 'Verzenden';
$delete_lang = 'Verwijder';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: english.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/english.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** english.inc.php 30 Jun 2003 22:16:35 -0000 1.45
--- english.inc.php 21 Sep 2003 05:33:58 -0000 1.46
***************
*** 2,6 ****
// English language include
! // For version 0.9.1 PHP iCalendar
//
// Translation by Chad Little (ch...@ch...)
--- 2,6 ----
// English language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Chad Little (ch...@ch...)
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Day';
$week_lang = 'Week';
--- 8,11 ----
***************
*** 88,94 ****
$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';
--- 86,89 ----
***************
*** 120,127 ****
$delete_lang = 'Delete';
!
! // ----- New after 0.9.2
$all_cal_comb_lang = 'All calendars combined';
-
// - navigation
--- 115,120 ----
$delete_lang = 'Delete';
! // ----- New for 0.9.4
$all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: esperanto.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/esperanto.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** esperanto.inc.php 30 Jun 2003 22:16:36 -0000 1.1
--- esperanto.inc.php 21 Sep 2003 05:33:58 -0000 1.2
***************
*** 2,6 ****
// Esperanto language include
! // For version 0.9.1 PHP iCalendar
//
// Translation by Sjoerd Bosga (sj...@es...)
--- 2,6 ----
// Esperanto language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Sjoerd Bosga (sj...@es...)
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Tago';
$week_lang = 'Semajno';
--- 8,11 ----
***************
*** 88,94 ****
$prefs_unset_lang = 'Viaj preferoj malkonserviĝis. Ŝanĝoj videblos venontan fojon kiam vi malfermos paĝon.';
$unset_prefs_lang = 'Malkonservu miajn preferojn:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organizanto:';
$attendee_lang = 'Ĉeestanto:';
--- 86,89 ----
***************
*** 120,125 ****
$delete_lang = 'Forigi';
!
! // ----- New after 0.9.2
$all_cal_comb_lang = 'Ĉiuj kalendaroj kune';
--- 115,119 ----
$delete_lang = 'Forigi';
! // ----- New after 0.9.4
$all_cal_comb_lang = 'Ĉiuj kalendaroj kune';
Index: finnish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/finnish.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** finnish.inc.php 3 Jun 2003 01:35:12 -0000 1.6
--- finnish.inc.php 21 Sep 2003 05:33:58 -0000 1.7
***************
*** 2,6 ****
// Finnish language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Kari Somby (kar...@ra...)
--- 2,6 ----
// Finnish language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Kari Somby (kar...@ra...)
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Päivä';
$week_lang = 'Viikko';
--- 8,11 ----
***************
*** 88,94 ****
$prefs_unset_lang = 'Asetuksia ei päivitetty. Muutokset päivitetään seuraavan sivun ladattua';
$unset_prefs_lang = 'Asetukset peruttu';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organisoija';
$attendee_lang = 'Osanottajat';
--- 86,89 ----
***************
*** 119,122 ****
--- 114,120 ----
$submit_lang = 'Lähetä';
$delete_lang = 'Tuhoa';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: french.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/french.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** french.inc.php 30 May 2003 18:08:37 -0000 1.21
--- french.inc.php 21 Sep 2003 05:33:58 -0000 1.22
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Jour';
$week_lang = 'Semaine';
--- 8,11 ----
***************
*** 85,91 ****
$todo_lang = 'Tâches à faire';
$unfinished_lang = 'Non faites';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organizer';
$attendee_lang = 'Attendee';
--- 83,86 ----
***************
*** 116,119 ****
--- 111,117 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: german.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** german.inc.php 30 May 2003 18:08:37 -0000 1.22
--- german.inc.php 21 Sep 2003 05:33:58 -0000 1.23
***************
*** 2,6 ****
// German language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by David Reindl (dr...@an...)
--- 2,6 ----
// German language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by David Reindl (dr...@an...)
***************
*** 89,95 ****
$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';
--- 89,92 ----
***************
*** 120,123 ****
--- 117,123 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: italian.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/italian.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** italian.inc.php 30 May 2003 18:08:37 -0000 1.22
--- italian.inc.php 21 Sep 2003 05:33:58 -0000 1.23
***************
*** 2,6 ****
// Italian language include
! // For version 0.9.2 PHP iCalendar
//
// First translation by Luca Cacciagrano (cl...@cl...)
--- 2,6 ----
// Italian language include
! // For version 0.9.4 PHP iCalendar
//
// First translation by Luca Cacciagrano (cl...@cl...)
***************
*** 9,14 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Giorno';
$week_lang = 'Settimana';
--- 9,12 ----
***************
*** 89,95 ****
$prefs_unset_lang = 'Preferenze non impostate. Le modifiche avranno effetto al caricamento della prossima pagina.';
$unset_prefs_lang = 'Preferenze non impostate:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organizer';
$attendee_lang = 'Attendee';
--- 87,90 ----
***************
*** 120,123 ****
--- 115,121 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: japanese.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/japanese.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** japanese.inc.php 30 May 2003 18:08:37 -0000 1.28
--- japanese.inc.php 21 Sep 2003 05:33:58 -0000 1.29
***************
*** 91,97 ****
$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';
--- 91,94 ----
***************
*** 122,125 ****
--- 119,125 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: norwegian.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/norwegian.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** norwegian.inc.php 3 Jun 2003 00:23:03 -0000 1.23
--- norwegian.inc.php 21 Sep 2003 05:33:58 -0000 1.24
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Dag';
$week_lang = 'Uke';
--- 8,11 ----
***************
*** 87,93 ****
$prefs_unset_lang = 'Valgene er tilbakestilt. Endringene vil vises neste gang siden lastes.';
$unset_prefs_lang = 'Tilbakestill valgene:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organisator';
$attendee_lang = 'Deltaker';
--- 85,88 ----
***************
*** 118,121 ****
--- 113,119 ----
$submit_lang = 'Legg inn';
$delete_lang = 'Slett';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: polish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/polish.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** polish.inc.php 3 Jun 2003 00:23:03 -0000 1.23
--- polish.inc.php 21 Sep 2003 05:33:58 -0000 1.24
***************
*** 2,6 ****
// Polish language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by StanisÅaw CieÅlicki (st...@po...)
--- 2,6 ----
// Polish language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by StanisÅaw CieÅlicki (st...@po...)
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'DzieÅ';
$week_lang = 'TydzieÅ';
--- 8,11 ----
***************
*** 47,51 ****
$results_lang = 'Wyniki poszukiwania';
$query_lang = 'Pytanie: '; // will be followed by the search query
! $no_results_lang = 'Brak poszukiwanych zadaÅ';
$goprint_lang = 'Do druku';
$time_lang = 'Czas';
--- 45,49 ----
$results_lang = 'Wyniki poszukiwania';
$query_lang = 'Pytanie: '; // will be followed by the search query
! $no_results_lang = 'Brak poszukiwanych zadaÅ';
$goprint_lang = 'Do druku';
$time_lang = 'Czas';
***************
*** 66,76 ****
$preferences_lang = 'Preferencje';
$printer_lang = 'Drukarka';
! $select_lang_lang = 'Wybierz domyÅlny jÄzyk:';
! $select_cal_lang = 'Wybierz domyÅlny kalendarz:';
! $select_view_lang = 'Wybierz domyÅlny podglÄ
d:';
$select_time_lang = 'Wybierz domyÅlny czas rozpoczÄcia dnia:';
$select_day_lang = 'Wybierz domyÅlny dzieÅ rozpoczynajÄ
cy tydzieÅ:';
! $select_style_lang = 'Wybierz domyÅlny styl:';
! $set_prefs_lang = 'Ustaw preferencje';
$completed_date_lang = 'ZakoÅczono';
$completed_lang = 'ZakoÅczono';
--- 64,74 ----
$preferences_lang = 'Preferencje';
$printer_lang = 'Drukarka';
! $select_lang_lang = 'Wybierz domyÅlny jÄzyk:';
! $select_cal_lang = 'Wybierz domyÅlny kalendarz:';
! $select_view_lang = 'Wybierz domyÅlny podglÄ
d:';
$select_time_lang = 'Wybierz domyÅlny czas rozpoczÄcia dnia:';
$select_day_lang = 'Wybierz domyÅlny dzieÅ rozpoczynajÄ
cy tydzieÅ:';
! $select_style_lang = 'Wybierz domyÅlny styl:';
! $set_prefs_lang = 'Ustaw preferencje';
$completed_date_lang = 'ZakoÅczono';
$completed_lang = 'ZakoÅczono';
***************
*** 88,94 ****
$prefs_unset_lang = 'Preferencje przywrócone. Zmiany bÄdÄ
widoczne po ponownym zaÅadowaniu strony.';
$unset_prefs_lang = 'PrzywrÃ³Ä preferencje:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organizer';
$attendee_lang = 'Attendee';
--- 86,89 ----
***************
*** 100,104 ****
$login_lang = 'Login';
$invalid_login_lang = 'ZÅa nazwa użytkownika lub hasÅo.';
! $addupdate_cal_lang = 'Dodaj lub popraw Kalendarz';
$addupdate_desc_lang = 'Dodaj Kalendarz przez zaÅadowanie nowego pliku. Popraw Kalendarz przez zaÅadowanie pliku o tej samej nazwie.';
$delete_cal_lang = 'UsuÅ Kalendarz';
--- 95,99 ----
$login_lang = 'Login';
$invalid_login_lang = 'ZÅa nazwa użytkownika lub hasÅo.';
! $addupdate_cal_lang = 'Dodaj lub popraw Kalendarz';
$addupdate_desc_lang = 'Dodaj Kalendarz przez zaÅadowanie nowego pliku. Popraw Kalendarz przez zaÅadowanie pliku o tej samej nazwie.';
$delete_cal_lang = 'UsuÅ Kalendarz';
***************
*** 120,123 ****
--- 115,121 ----
$delete_lang = 'Wymaż';
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
+
// - navigation
$back_lang = 'Wstecz';
***************
*** 138,144 ****
$format_recur_lang['weekly'] = array('tydzieÅ','tygodni'); // these will be %freq%
$format_recur_lang['daily'] = array('dzieÅ','dni'); // in the replacement below
! $format_recur_lang['hourly'] = array('godzina','godzin');
! $format_recur_lang['minutely'] = array('minuta','minut');
! $format_recur_lang['secondly'] = array('sekunda','sekund');
$format_recur_lang['start'] = 'Każdego %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
--- 136,140 ----
$format_recur_lang['weekly'] = array('tydzieÅ','tygodni'); // these will be %freq%
$format_recur_lang['daily'] = array('dzieÅ','dni'); // in the replacement below
! $format_recur_lang['hourly'] = array('godzina','godzin');$format_recur_lang['minutely'] = array('minuta','minut');$format_recur_lang['secondly'] = array('sekunda','sekund');
$format_recur_lang['start'] = 'Każdego %int% %freq% %for%'; // ie, 'Every 1 day until January 4' or 'Every 1 day for a count of 5'
***************
*** 188,193 ****
// Error messages - %s will be replaced with a variable
$error_title_lang = 'BÅÄ
d!';
! $error_window_lang = 'WystÄ
piÅ bÅÄ
d!';
! $error_calendar_lang = 'Podczas przetwarzania pliku kalendarza â%sâ, wystÄ
piÅ bÅÄ
d.';
$error_path_lang = 'Nie mogÄ otworzyÄ Åcieżki: "%s"';
$error_back_lang = 'ProszÄ użyÄ przycisku âWsteczâ aby wróciÄ.';
--- 184,188 ----
// Error messages - %s will be replaced with a variable
$error_title_lang = 'BÅÄ
d!';
! $error_window_lang = 'WystÄ
piÅ bÅÄ
d!';$error_calendar_lang = 'Podczas przetwarzania pliku kalendarza â%sâ, wystÄ
piÅ bÅÄ
d.';
$error_path_lang = 'Nie mogÄ otworzyÄ Åcieżki: "%s"';
$error_back_lang = 'ProszÄ użyÄ przycisku âWsteczâ aby wróciÄ.';
Index: portuguese.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/portuguese.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** portuguese.inc.php 30 May 2003 18:08:37 -0000 1.10
--- portuguese.inc.php 21 Sep 2003 05:33:58 -0000 1.11
***************
*** 2,6 ****
// Portuguese language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Rui Costa (rui...@ub...)
--- 2,6 ----
// Portuguese language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Rui Costa (rui...@ub...)
***************
*** 8,13 ****
// Submit new translations to ch...@ch...
-
-
$day_lang = 'Dia';
$week_lang = 'Semana';
--- 8,11 ----
***************
*** 87,93 ****
$prefs_unset_lang = 'Preferencias retiradas. Alteracoes aparecerao nas proxinas paginas.';
$unset_prefs_lang = 'Retirar preferencias:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organizer';
$attendee_lang = 'Attendee';
--- 85,88 ----
***************
*** 118,121 ****
--- 113,119 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: spanish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/spanish.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** spanish.inc.php 30 May 2003 18:08:37 -0000 1.12
--- spanish.inc.php 21 Sep 2003 05:33:58 -0000 1.13
***************
*** 2,10 ****
// Spanish language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Javier Navarro from XIPS (jna...@xi...)
-
$day_lang = "Día";
$week_lang = "Semana";
--- 2,9 ----
// Spanish language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Javier Navarro from XIPS (jna...@xi...)
$day_lang = "Día";
$week_lang = "Semana";
***************
*** 86,92 ****
$prefs_unset_lang = 'Preferencias no activas. Los cambios se activaran al recargar la página.';
$unset_prefs_lang = 'Preferencias sin activar:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organizer';
$attendee_lang = 'Attendee';
--- 85,88 ----
***************
*** 117,120 ****
--- 113,119 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
Index: swedish.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/swedish.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
Binary files /tmp/cvssOVSkl and /tmp/cvsw7vjrw differ
Index: traditional_chinese.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/languages/traditional_chinese.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** traditional_chinese.inc.php 30 May 2003 18:08:37 -0000 1.4
--- traditional_chinese.inc.php 21 Sep 2003 05:33:58 -0000 1.5
***************
*** 2,6 ****
// Trad. Chinese language include
! // For version 0.9.2 PHP iCalendar
//
// Translation by Kevin Fyure (di...@ma...)
--- 2,6 ----
// Trad. Chinese language include
! // For version 0.9.4 PHP iCalendar
//
// Translation by Kevin Fyure (di...@ma...)
***************
*** 88,94 ****
$prefs_unset_lang = 'è¨å®å·²éåãæ´åçé¨ä»½æå¨è®åä¸ä¸é æçæã';
$unset_prefs_lang = 'éåè¨å®:';
-
- // ----- New for 0.9.2
-
$organizer_lang = 'Organizer';
$attendee_lang = 'Attendee';
--- 88,91 ----
***************
*** 119,122 ****
--- 116,122 ----
$submit_lang = 'Submit';
$delete_lang = 'Delete';
+
+ // ----- New for 0.9.4
+ $all_cal_comb_lang = 'All calendars combined';
// - navigation
|
|
From: <cl...@us...> - 2003-09-21 05:02:55
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv21145/functions
Modified Files:
error.php
Log Message:
Index: error.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/error.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** error.php 21 Sep 2003 03:22:08 -0000 1.9
--- error.php 21 Sep 2003 05:02:52 -0000 1.10
***************
*** 1,6 ****
<?php
if (!defined('BASE')) define('BASE','../');
- $current_view = 'error';
- $display_date = $error_title_lang;
function error($error_msg='There was an error processing the request.', $file='NONE') {
--- 1,4 ----
***************
*** 8,12 ****
if (!isset($style_sheet)) $style_sheet = 'silver';
if (!isset($powered_by_lang)) $powered_by_lang = 'Powered by';
- if (!isset($version_lang)) $version_lang = '0.8';
if (!isset($error_title_lang)) $error_title_lang = 'Error!';
if (!isset($error_window_lang)) $error_window_lang = 'There was an error!';
--- 6,9 ----
***************
*** 17,20 ****
--- 14,20 ----
$error_calendar = sprintf($error_calendar_lang, $file);
+ $current_view = 'error';
+ $display_date = $error_title_lang;
+ $calendar_name = $error_title_lang;
include (BASE.'includes/header.inc.php');
|
|
From: <cl...@us...> - 2003-09-21 04:28:39
|
Update of /cvsroot/phpicalendar/phpicalendar/rss
In directory sc8-pr-cvs1:/tmp/cvs-serv17168/rss
Modified Files:
index.php
Log Message:
Header / Footer added.
Index: index.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** index.php 15 Sep 2003 01:00:44 -0000 1.19
--- index.php 21 Sep 2003 04:28:35 -0000 1.20
***************
*** 2,6 ****
define('BASE','../');
- $current_view = "rssindex";
include(BASE.'functions/ical_parser.php');
$default_path = 'http://'.$HTTP_SERVER_VARS['SERVER_NAME'].substr($HTTP_SERVER_VARS['PHP_SELF'],0,strpos($HTTP_SERVER_VARS['PHP_SELF'], '/rss/'));
--- 2,5 ----
***************
*** 10,25 ****
$back_page = BASE.$default_view.'.php?cal='.$cal.'&getdate='.$getdate;
}
!
! ?>
! <!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 "$cal $calendar_lang - RSS Info"; ?></title>
! <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">
! </head>
! <body bgcolor="#FFFFFF">
! <?php include (BASE.'includes/header.inc.php'); ?>
<center>
<table border="0" width="700" cellspacing="0" cellpadding="0">
--- 9,15 ----
$back_page = BASE.$default_view.'.php?cal='.$cal.'&getdate='.$getdate;
}
! $current_view = "rssindex";
! $display_date = "$calendar_lang - RSS Info";
! include (BASE.'includes/header.inc.php'); ?>
<center>
<table border="0" width="700" cellspacing="0" cellpadding="0">
***************
*** 106,111 ****
</tr>
</table>
- <?php include (BASE.'includes/footer.inc.php'); ?>
</center>
! </body>
! </html>
--- 96,99 ----
</tr>
</table>
</center>
! <?php include (BASE.'includes/footer.inc.php'); ?>
|
|
From: <cl...@us...> - 2003-09-21 03:22:13
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv9284/functions
Modified Files:
error.php
Log Message:
Completed (hopefully) the move to header/footer on all pages. Cleaned up
header a bit.
Index: error.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/error.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** error.php 30 Nov 2002 21:05:39 -0000 1.8
--- error.php 21 Sep 2003 03:22:08 -0000 1.9
***************
*** 1,4 ****
--- 1,6 ----
<?php
if (!defined('BASE')) define('BASE','../');
+ $current_view = 'error';
+ $display_date = $error_title_lang;
function error($error_msg='There was an error processing the request.', $file='NONE') {
***************
*** 15,28 ****
$error_calendar = sprintf($error_calendar_lang, $file);
?>
! <!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 $error_title_lang; ?></title>
! <link rel="stylesheet" type="text/css" href="styles/<?php echo "$style_sheet/default.css"; ?>">
! </head>
! <body bgcolor="#FFFFFF">
<center>
<table border="0" width="700" cellspacing="0" cellpadding="0">
--- 17,24 ----
$error_calendar = sprintf($error_calendar_lang, $file);
+ include (BASE.'includes/header.inc.php');
+
?>
!
<center>
<table border="0" width="700" cellspacing="0" cellpadding="0">
***************
*** 65,74 ****
</tr>
</table>
- <?php include (BASE.'includes/footer.inc.php'); ?>
</center>
! </body>
! </html>
- <?php
}
! ?>
--- 61,70 ----
</tr>
</table>
</center>
! <?php
!
! include (BASE.'includes/footer.inc.php');
}
!
! ?>
\ No newline at end of file
|
|
From: <cl...@us...> - 2003-09-21 03:22:12
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv9284/includes
Modified Files:
header.inc.php
Log Message:
Completed (hopefully) the move to header/footer on all pages. Cleaned up
header a bit.
Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/header.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** header.inc.php 20 Sep 2003 21:46:17 -0000 1.4
--- header.inc.php 21 Sep 2003 03:22:09 -0000 1.5
***************
*** 1,9 ****
- <?
-
- if ($current_view == 'preferences') $display_date = $preferences_lang;
- if ($current_view == 'search') $display_date = $results_lang;
-
- ?>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
--- 1,2 ----
|
|
From: <cl...@us...> - 2003-09-21 03:22:12
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv9284
Modified Files:
preferences.php search.php
Log Message:
Completed (hopefully) the move to header/footer on all pages. Cleaned up
header a bit.
Index: preferences.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** preferences.php 20 Sep 2003 21:46:17 -0000 1.33
--- preferences.php 21 Sep 2003 03:22:08 -0000 1.34
***************
*** 3,6 ****
--- 3,7 ----
define('BASE','./');
include(BASE.'functions/ical_parser.php');
+ $display_date = $preferences_lang;
if ($cookie_uri == '') {
Index: search.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** search.php 20 Sep 2003 21:46:17 -0000 1.21
--- search.php 21 Sep 2003 03:22:08 -0000 1.22
***************
*** 3,6 ****
--- 3,7 ----
define('BASE','./');
$current_view = 'search';
+ $display_date = $results_lang;
include('./functions/ical_parser.php');
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv23713 Modified Files: README admin.php day.php month.php preferences.php print.php search.php week.php year.php Log Message: Moved all closing html and body tags into the footer. Updated README. Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** README 15 Sep 2003 06:30:57 -0000 1.48 --- README 20 Sep 2003 21:46:17 -0000 1.49 *************** *** 74,84 **** -------- 0.9.4 ! -Vastly improved BYDAY, BYMONTHDAY support ! -Improved DURATION Support -Smaller HTML footprint on all pages with same look and feel. ! -Combined Calendars automatically refresh when changes are made ! -Vtodo popup works again ! -Validation increased on multiple pages ! -Fixed a bug not listing blacklisted calendars 0.9.3 --- 74,86 ---- -------- 0.9.4 ! -Vastly improved BYDAY, BYMONTHDAY, BYYEARDAY support. ! -Improved DURATION Support. -Smaller HTML footprint on all pages with same look and feel. ! -Combined Calendars automatically refresh when changes are made. ! -Vtodo popup works again. ! -Validation increased on multiple pages. ! -Fixed a bug not listing blacklisted calendars. ! -Moved HTML head into header.inc.php to better support embedding of calendar. ! -Moved HTML foot into footer.inc.php to better support embedding of calendar. 0.9.3 Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** admin.php 17 Sep 2003 05:18:23 -0000 1.5 --- admin.php 20 Sep 2003 21:46:17 -0000 1.6 *************** *** 272,283 **** </tr> </table> ! <?php include (BASE.'includes/footer.inc.php'); ?> - - </center> - </body> - </html> --- 272,279 ---- </tr> </table> ! </center> <?php include (BASE.'includes/footer.inc.php'); ?> Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** day.php 20 Sep 2003 20:53:13 -0000 1.98 --- day.php 20 Sep 2003 21:46:17 -0000 1.99 *************** *** 305,314 **** <td width="170" valign="top"> <?php include (BASE.'includes/sidebar.php'); ?> - <?php include (BASE.'includes/footer.inc.php'); ?> </td> </tr> </table> </center> ! </body> ! </html> --- 305,312 ---- <td width="170" valign="top"> <?php include (BASE.'includes/sidebar.php'); ?> </td> </tr> </table> </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** month.php 19 Sep 2003 21:21:19 -0000 1.98 --- month.php 20 Sep 2003 21:46:17 -0000 1.99 *************** *** 234,239 **** </table> <?php } ?> - <?php include (BASE.'includes/footer.inc.php'); ?> </center> ! </body> ! </html> --- 234,239 ---- </table> <?php } ?> </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> ! ! Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** preferences.php 20 Sep 2003 00:17:58 -0000 1.32 --- preferences.php 20 Sep 2003 21:46:17 -0000 1.33 *************** *** 322,327 **** </tr> </table> - <?php include (BASE.'includes/footer.inc.php'); ?> </center> ! </body> ! </html> --- 322,326 ---- </tr> </table> </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> ! Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** print.php 20 Sep 2003 20:59:06 -0000 1.18 --- print.php 20 Sep 2003 21:46:17 -0000 1.19 *************** *** 167,172 **** </tr> </table> - <?php include (BASE.'includes/footer.inc.php'); ?> </center> ! </body> ! </html> --- 167,170 ---- </tr> </table> </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> Index: search.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/search.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** search.php 30 Nov 2002 21:05:39 -0000 1.20 --- search.php 20 Sep 2003 21:46:17 -0000 1.21 *************** *** 87,102 **** $search_took = number_format(($search_ended-$search_started),3); ?> - <!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 "$calendar_name - $results_lang"; ?></title> - <link rel="stylesheet" type="text/css" href="styles/<?php echo $style_sheet.'/default.css'; ?>"> - </head> - <body bgcolor="#FFFFFF"> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> --- 87,94 ---- $search_took = number_format(($search_ended-$search_started),3); + include (BASE.'includes/header.inc.php'); + ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> *************** *** 284,291 **** </table> </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> ! </body> ! </html> ! <?php // takes a boolean search and formats it into an array --- 276,283 ---- </table> </center> ! <?php ! ! include (BASE.'includes/footer.inc.php'); ! // takes a boolean search and formats it into an array Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** week.php 20 Sep 2003 20:53:13 -0000 1.99 --- week.php 20 Sep 2003 21:46:17 -0000 1.100 *************** *** 360,368 **** <td width="170" valign="top"> <?php include (BASE.'includes/sidebar.php'); ?> - <?php include (BASE.'includes/footer.inc.php'); ?> </td> </tr> </table> ! </body> ! </html> --- 360,367 ---- <td width="170" valign="top"> <?php include (BASE.'includes/sidebar.php'); ?> </td> </tr> </table> ! </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** year.php 17 Sep 2003 05:18:23 -0000 1.23 --- year.php 20 Sep 2003 21:46:17 -0000 1.24 *************** *** 168,173 **** </tr> </table> - <?php include (BASE.'includes/footer.inc.php'); ?> </center> ! </body> ! </html> --- 168,171 ---- </tr> </table> </center> ! <?php include (BASE.'includes/footer.inc.php'); ?> |
|
From: <cl...@us...> - 2003-09-20 21:46:21
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv23713/includes Modified Files: footer.inc.php header.inc.php Log Message: Moved all closing html and body tags into the footer. Updated README. Index: footer.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/footer.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** footer.inc.php 19 Sep 2003 21:21:20 -0000 1.8 --- footer.inc.php 20 Sep 2003 21:46:17 -0000 1.9 *************** *** 1,5 **** <?php ! echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.4</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; --- 1,5 ---- <?php ! echo "<center class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.4</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; *************** *** 10,14 **** } } ! echo '</font></center>'; ?> --- 10,17 ---- } } ! echo '</center>'; ?> + + </body> + </html> Index: header.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/header.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** header.inc.php 17 Sep 2003 05:18:24 -0000 1.3 --- header.inc.php 20 Sep 2003 21:46:17 -0000 1.4 *************** *** 1,3 **** ! <? if ($current_view == 'preferences') $display_date = $preferences_lang; ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" --- 1,8 ---- ! <? ! ! if ($current_view == 'preferences') $display_date = $preferences_lang; ! if ($current_view == 'search') $display_date = $results_lang; ! ! ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" |
|
From: <cl...@us...> - 2003-09-20 20:59:09
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv16915
Modified Files:
print.php
Log Message:
Month date now appears as expected.
Index: print.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** print.php 17 Sep 2003 05:18:23 -0000 1.17
--- print.php 20 Sep 2003 20:59:06 -0000 1.18
***************
*** 38,42 ****
$print_prev_nav = $last_week_lang;
} elseif ($printview == 'month') {
! $print_title = localizeDate ($dateFormat_month, strtotime($getdate));
$next = date("Ymd", strtotime("+1 month", $unix_time));
$prev = date("Ymd", strtotime("-1 month", $unix_time));
--- 38,42 ----
$print_prev_nav = $last_week_lang;
} elseif ($printview == 'month') {
! $display_date = localizeDate ($dateFormat_month, strtotime($getdate));
$next = date("Ymd", strtotime("+1 month", $unix_time));
$prev = date("Ymd", strtotime("-1 month", $unix_time));
|
|
From: <cl...@us...> - 2003-09-20 20:53:18
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv16054
Modified Files:
day.php week.php
Log Message:
Cleaned up event_status displaying.
Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** day.php 20 Sep 2003 00:17:58 -0000 1.97
--- day.php 20 Sep 2003 20:53:13 -0000 1.98
***************
*** 234,239 ****
$event_calno = $this_time_arr[($event_length[$i]['key'])]['calnumber'];
$event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
! if ($event_calno < 1) $event_calno=1;
! if ($event_calno > 7) $event_calno=7;
echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
--- 234,239 ----
$event_calno = $this_time_arr[($event_length[$i]['key'])]['calnumber'];
$event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
! if ($event_calno < 1) $event_calno = 1;
! if ($event_calno > 7) $event_calno = 7;
echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
***************
*** 241,248 ****
echo '<tr>'."\n";
echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n";
! echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! if ($event_status == '') echo ' ';
! else echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! echo '</font></td>'."\n";
echo '</tr>'."\n";
echo '<tr>'."\n";
--- 241,249 ----
echo '<tr>'."\n";
echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n";
! if ($event_status != '') {
! echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! echo '</font></td>'."\n";
! }
echo '</tr>'."\n";
echo '<tr>'."\n";
Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** week.php 20 Sep 2003 00:17:59 -0000 1.98
--- week.php 20 Sep 2003 20:53:13 -0000 1.99
***************
*** 287,300 ****
$event_calno = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber'];
$event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']);
! if ($event_calno < 1) $event_calno=1;
! if ($event_calno > 7) $event_calno=7;
echo '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2week_'.$event_calno.'">'."\n";
echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
echo "<tr>\n";
echo "<td class=\"eventborder\"><font class=\"V10WB\"><b>$event_start</b></font></td>\n";
! echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! if ($event_status == '') echo ' ';
! else echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! echo "</font></td>\n";
echo "</tr>\n";
echo "<tr>\n";
--- 287,301 ----
$event_calno = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber'];
$event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']);
! if ($event_calno < 1) $event_calno = 1;
! if ($event_calno > 7) $event_calno = 7;
echo '<td rowspan="' . $event_length[$thisday][$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2week_'.$event_calno.'">'."\n";
echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\n";
echo "<tr>\n";
echo "<td class=\"eventborder\"><font class=\"V10WB\"><b>$event_start</b></font></td>\n";
! if ($event_status != '') {
! echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
! echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
! echo "</font></td>\n";
! }
echo "</tr>\n";
echo "<tr>\n";
|
|
From: <cl...@us...> - 2003-09-20 19:43:20
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv3545/functions Modified Files: ical_parser.php Log Message: Fix for interval = 1 Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** ical_parser.php 20 Sep 2003 19:13:12 -0000 1.107 --- ical_parser.php 20 Sep 2003 19:43:16 -0000 1.108 *************** *** 410,413 **** --- 410,416 ---- $next_range_time = $start_range_time_tmp; + // FIXME: This is a hack to fix repetitions with $interval > 1 + if ($count > 1 && $number > 1) $count = 1 + ($count - 1) * $number; + $count_to = 0; // start at the $start_range and go until we hit the end of our range. |
|
From: <cl...@us...> - 2003-09-20 19:43:20
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv3545/calendars Modified Files: Home.ics Log Message: Fix for interval = 1 Index: Home.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/Home.ics,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Home.ics 19 Sep 2003 21:21:19 -0000 1.10 --- Home.ics 20 Sep 2003 19:43:15 -0000 1.11 *************** *** 180,183 **** RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TH;BYSETPOS=3 END:VEVENT ! END:VCALENDAR --- 180,196 ---- RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TH;BYSETPOS=3 END:VEVENT ! BEGIN:VEVENT ! UID:20030822T181536Z-23921-100-1-13@walker ! DTSTAMP:20030822T180616Z ! DTSTART;VALUE=DATE-TIME:20031114T170000 ! DTEND;VALUE=DATE-TIME:20031114T18300 ! SUMMARY:Event ! SEQUENCE:4 ! LAST-MODIFIED:20030822T193248Z ! LOCATION:Location ! CLASS:PUBLIC ! TRANSP:OPAQUE ! RRULE;X-EVOLUTION-ENDDATE=20031212T160000Z:FREQ=WEEKLY;COUNT=3;INTERVAL=2; ! BYDAY=FR ! END:VEVENT END:VCALENDAR |
|
From: <cl...@us...> - 2003-09-20 19:13:19
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv31153/functions
Modified Files:
ical_parser.php list_icals.php
Log Message:
Added BYYEARDAY support, added getdate to switching calendars.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** ical_parser.php 20 Sep 2003 00:37:36 -0000 1.106
--- ical_parser.php 20 Sep 2003 19:13:12 -0000 1.107
***************
*** 210,217 ****
// Handling of the all day events
if ((isset($allday_start) && $allday_start != '')) {
! $start = strtotime($allday_start);
! if (isset($allday_end)) {
! $end = strtotime($allday_end);
! } else {
$end = strtotime('+1 day', $start);
}
--- 210,220 ----
// Handling of the all day events
if ((isset($allday_start) && $allday_start != '')) {
! $start = strtotime($allday_start);
! if ($spans_day) {
! $allday_end = date('Ymd',$end_unixtime);
! }
! if (isset($allday_end)) {
! $end = strtotime($allday_end);
! } else {
$end = strtotime('+1 day', $start);
}
***************
*** 506,509 ****
--- 509,525 ----
$recur_data[] = $next_date_time;
}
+ foreach ($byyearday as $yearday) {
+ ereg ('([-\+]{0,1})?([0-9]{1,3})', $yearday, $byyearday_arr);
+ if ($byyearday_arr[1] == '-') {
+ $ydtime = mktime(0,0,0,12,31,$this_year);
+ $yearnum = $byyearday_arr[2] - 1;
+ $next_date_time = strtotime('-'.$yearnum.' days', $ydtime);
+ } else {
+ $ydtime = mktime(0,0,0,1,1,$this_year);
+ $yearnum = $byyearday_arr[2] - 1;
+ $next_date_time = strtotime('+'.$yearnum.' days', $ydtime);
+ }
+ $recur_data[] = $next_date_time;
+ }
break;
default:
***************
*** 741,744 ****
--- 757,761 ----
$allday_start = $data;
$start_date = $allday_start;
+ $start_unixtime = strtotime($data);
} else {
if (preg_match("/^DTSTART;TZID=/i", $field)) {
Index: list_icals.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** list_icals.php 20 Sep 2003 00:16:05 -0000 1.16
--- list_icals.php 20 Sep 2003 19:13:13 -0000 1.17
***************
*** 31,37 ****
if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
if ($cal_tmp == $cal) {
! print "<option value=\"$current_view.php?cal=$cal_tmp\" selected>$cal_displayname_tmp $calendar_lang</option>";
} else {
! print "<option value=\"$current_view.php?cal=$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>";
}
}
--- 31,37 ----
if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
if ($cal_tmp == $cal) {
! print "<option value=\"$current_view.php?cal=$cal_tmp&getdate=$getdate\" selected>$cal_displayname_tmp $calendar_lang</option>";
} else {
! print "<option value=\"$current_view.php?cal=$cal_tmp&getdate=$getdate\">$cal_displayname_tmp $calendar_lang</option>";
}
}
***************
*** 40,46 ****
// option to open all (non-web) calenders together
if ($cal == $ALL_CALENDARS_COMBINED) {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>";
} else {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>";
}
--- 40,46 ----
// option to open all (non-web) calenders together
if ($cal == $ALL_CALENDARS_COMBINED) {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\" selected>$all_cal_comb_lang</option>";
} else {
! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED&getdate=$getdate\">$all_cal_comb_lang</option>";
}
***************
*** 52,58 ****
$cal_encoded_tmp = urlencode($cal_tmp);
if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
! print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\" selected>$cal_displayname_tmp Webcal</option>";
} else {
! print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>";
}
}
--- 52,58 ----
$cal_encoded_tmp = urlencode($cal_tmp);
if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
! print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\" selected>$cal_displayname_tmp Webcal</option>";
} else {
! print "<option value=\"$current_view.php?cal=$cal_encoded_tmp&getdate=$getdate\">$cal_displayname_tmp Webcal</option>";
}
}
|
|
From: <jo...@us...> - 2003-09-20 00:37:41
|
Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv20975/functions
Modified Files:
ical_parser.php
Log Message:
Patch [793608] $day_end value.
Users may now specify a $day_end value in config.inc.php to end the
calendar display before midnight.
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** ical_parser.php 20 Sep 2003 00:31:36 -0000 1.105
--- ical_parser.php 20 Sep 2003 00:37:36 -0000 1.106
***************
*** 10,14 ****
$fillTime = $day_start;
$day_array = array ();
! while ($fillTime != '2400') {
array_push ($day_array, $fillTime);
ereg ('([0-9]{2})([0-9]{2})', $fillTime, $dTime);
--- 10,14 ----
$fillTime = $day_start;
$day_array = array ();
! while ($fillTime < $day_end) {
array_push ($day_array, $fillTime);
ereg ('([0-9]{2})([0-9]{2})', $fillTime, $dTime);
|
|
From: <jo...@us...> - 2003-09-20 00:37:39
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv20975 Modified Files: config.inc.php Log Message: Patch [793608] $day_end value. Users may now specify a $day_end value in config.inc.php to end the calendar display before midnight. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** config.inc.php 20 Sep 2003 00:16:05 -0000 1.111 --- config.inc.php 20 Sep 2003 00:37:36 -0000 1.112 *************** *** 13,16 **** --- 13,17 ---- $week_start_day = 'Sunday'; // Day of the week your week starts on $day_start = '0800'; // Start time for day grid + $day_end = '2000'; // End time for day grid $gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred $num_years = '3'; // Number of years to display in 'Jump to' |
