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: <cl...@us...> - 2003-09-16 05:38:39
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv2036/functions Modified Files: list_icals.php list_months.php list_weeks.php list_years.php Log Message: Finally fixed the jumpto's to not have space around them. Also cleaned up the HTML footprint to be slimmer. Index: list_icals.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** list_icals.php 15 Sep 2003 01:00:44 -0000 1.14 --- list_icals.php 16 Sep 2003 05:38:34 -0000 1.15 *************** *** 7,13 **** } else { $query=""; ! } ! print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">\n"; ! // open file $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename)); --- 7,11 ---- } else { $query=""; ! } // open file $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename)); *************** *** 33,39 **** 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>\n"; } else { ! print "<option value=\"$current_view.php?cal=$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>\n"; } } --- 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>"; } } *************** *** 42,48 **** // option to open all (non-web) calenders together if ($cal == 'all_calenders_combined971') { ! print "<option value=\"$current_view.php?cal=all_calenders_combined971\" selected>$all_cal_comb_lang</option>\n"; } else { ! print "<option value=\"$current_view.php?cal=all_calenders_combined971\">$all_cal_comb_lang</option>\n"; } --- 40,46 ---- // option to open all (non-web) calenders together if ($cal == 'all_calenders_combined971') { ! print "<option value=\"$current_view.php?cal=all_calenders_combined971\" selected>$all_cal_comb_lang</option>"; } else { ! print "<option value=\"$current_view.php?cal=all_calenders_combined971\">$all_cal_comb_lang</option>"; } *************** *** 54,60 **** $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>\n"; } else { ! print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>\n"; } } --- 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>"; } } *************** *** 65,70 **** // finish <select> ! print "</select>\n</form>"; } ?> --- 63,70 ---- // finish <select> ! print "</select>"; } + + ?> Index: list_months.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_months.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** list_months.php 10 Mar 2003 18:27:11 -0000 1.6 --- list_months.php 16 Sep 2003 05:38:34 -0000 1.7 *************** *** 1,4 **** <?php ! print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n"; $month_time = strtotime("$this_year-01-01"); $getdate_month = date("m", strtotime($getdate)); --- 1,4 ---- <?php ! print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n"; $month_time = strtotime("$this_year-01-01"); $getdate_month = date("m", strtotime($getdate)); *************** *** 19,22 **** // finish <select> ! print "</select>\n</form>"; ?> --- 19,22 ---- // finish <select> ! print "</select>"; ?> Index: list_weeks.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_weeks.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** list_weeks.php 10 Mar 2003 18:27:12 -0000 1.6 --- list_weeks.php 16 Sep 2003 05:38:34 -0000 1.7 *************** *** 12,16 **** $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n"; // build the <option> tags --- 12,16 ---- $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n"; // build the <option> tags *************** *** 30,33 **** // finish <select> ! print "</select>\n</form>"; ?> --- 30,33 ---- // finish <select> ! print "</select>"; ?> Index: list_years.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_years.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** list_years.php 10 Mar 2003 18:27:13 -0000 1.3 --- list_years.php 16 Sep 2003 05:38:34 -0000 1.4 *************** *** 5,9 **** $num_years2 = $num_years; //echo "$num_years2"; ! print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n"; // build the <option> tags for ($i=0; $i < ($num_years2 +2); $i++) { --- 5,9 ---- $num_years2 = $num_years; //echo "$num_years2"; ! print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">"; // build the <option> tags for ($i=0; $i < ($num_years2 +2); $i++) { *************** *** 11,15 **** $yeardate = date("Ymd", $year_time2); $year_year = date ("Y", $year_time2); ! print "<option value=\"year.php?cal=$cal&getdate=$yeardate\">$year_year</option>\n"; $num_years2--; } --- 11,15 ---- $yeardate = date("Ymd", $year_time2); $year_year = date ("Y", $year_time2); ! print "<option value=\"year.php?cal=$cal&getdate=$yeardate\">$year_year</option>"; $num_years2--; } *************** *** 20,26 **** $yeardate = date("Ymd", $year_time); if ($year_year == $getdate_year) { ! print "<option value=\"year.php?cal=$cal&getdate=$yeardate\" selected>$year_year</option>\n"; } else { ! print "<option value=\"year.php?cal=$cal&getdate=$yeardate\">$year_year</option>\n"; } $year_time = strtotime ("+1 year", $year_time); --- 20,26 ---- $yeardate = date("Ymd", $year_time); if ($year_year == $getdate_year) { ! print "<option value=\"year.php?cal=$cal&getdate=$yeardate\" selected>$year_year</option>"; } else { ! print "<option value=\"year.php?cal=$cal&getdate=$yeardate\">$year_year</option>"; } $year_time = strtotime ("+1 year", $year_time); *************** *** 28,31 **** // finish <select> ! print "</select>\n</form>"; ?> --- 28,31 ---- // finish <select> ! print "</select>"; ?> |
From: <cl...@us...> - 2003-09-16 05:38:39
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv2036/includes Modified Files: calendar_nav.php sidebar.php Log Message: Finally fixed the jumpto's to not have space around them. Also cleaned up the HTML footprint to be slimmer. Index: calendar_nav.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** calendar_nav.php 14 Sep 2003 20:18:05 -0000 1.7 --- calendar_nav.php 16 Sep 2003 05:38:34 -0000 1.8 *************** *** 99,140 **** <table cellpadding="0" cellspacing="0" border="0" width="160"> <tr> ! <td valign="middle" align="center"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> ! <tr> ! <td width="4"></td> ! <td> ! <?php ! include('./functions/list_icals.php'); ! include('./functions/list_years.php'); ! include('./functions/list_months.php'); ! include('./functions/list_weeks.php'); ! ?> ! </td> ! </tr> ! <?php ! if ($display_custom_goto == "yes") { ! ?> ! <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td class="G10B"> ! <form action="day.php" method="GET"> ! <input type="hidden" name="cal" value="<?php print urlencode($cal); ?>"> ! <input type="text" size="15" name="jumpto_day"> ! <input type="submit" value="Go"> ! </form> ! </td> ! </tr> ! <?php ! } ! if ($show_search == 'yes') { ?> ! <tr> ! <td colspan="2"><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! </tr> ! <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td valign="middle" align="left"><?php echo "$search_box"; ?></td> ! </tr> ! <?php } ?> ! </table> </td> </tr> --- 99,116 ---- <table cellpadding="0" cellspacing="0" border="0" width="160"> <tr> ! <td bgcolor="#FFFFFF" align="left" class="G10BOLD"> ! <?php ! ! 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'); ! include('./functions/list_months.php'); ! include('./functions/list_weeks.php'); ! echo "</form>"; ! echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>'; ! ! ?> </td> </tr> Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** sidebar.php 15 Sep 2003 00:40:04 -0000 1.14 --- sidebar.php 16 Sep 2003 05:38:34 -0000 1.15 *************** *** 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" 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 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>'; ?> *************** *** 56,112 **** </table> <br> ! <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$jump_lang"; ?></font></td> ! <td align="right" valign="top" width="1%" class="sideback"></td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="left"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> ! <tr> ! <td colspan="2"><img src="images/spacer.gif" width="21" height="6" alt=" "></td> ! </tr> ! <tr> ! <td width="4"></td> ! <td> ! <?php ! include('./functions/list_icals.php'); ! include('./functions/list_years.php'); ! include('./functions/list_months.php'); ! include('./functions/list_weeks.php'); ! ?> ! </td> ! </tr> ! <?php ! if ($display_custom_goto == "yes") { ! ?> ! <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td class="G10B"> ! <form action="day.php" method="GET"> ! <input type="hidden" name="cal" value="<?php print urlencode($cal); ?>"> ! <input type="text" size="15" name="jumpto_day"> ! <input type="submit" value="Go"> ! </form> ! </td> ! </tr> ! <?php ! } ! if ($show_search == 'yes') { ?> ! <tr> ! <td colspan="2"><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! </tr> ! <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td valign="middle" align="left"><?php echo "$search_box"; ?></td> ! </tr> ! <?php } ?> ! </table> </td> </tr> - <tr> - <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> - </tr> </table> <br> --- 56,88 ---- </table> <br> ! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> ! <tr height="20"> ! <td align="center" class="sideback"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td> </tr> <tr> ! <td bgcolor="#FFFFFF" align="left"> ! <?php ! ! 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'); ! 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>'; ! } ! ! ?> </td> </tr> </table> <br> *************** *** 115,125 **** <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$tomorrows_lang"; ?></font></td> - <td align="right" valign="top" width="1%" class="sideback"></td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="center"> <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> <tr> --- 91,99 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr height="20"> <td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$tomorrows_lang"; ?></font></td> </tr> <tr> ! <td bgcolor="#FFFFFF" align="center"> <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> <tr> *************** *** 179,189 **** <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$todo_lang"; ?></font></td> - <td align="right" valign="top" width="1%" class="sideback"></td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="center"> <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> <tr> --- 153,161 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> ! <tr height="20"> <td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$todo_lang"; ?></font></td> </tr> <tr> ! <td bgcolor="#FFFFFF" align="center"> <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> <tr> |
From: <cl...@us...> - 2003-09-16 05:38:39
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv2036 Modified Files: config.inc.php day.php Log Message: Finally fixed the jumpto's to not have space around them. Also cleaned up the HTML footprint to be slimmer. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.107 retrieving revision 1.108 diff -C2 -d -r1.107 -r1.108 *** config.inc.php 15 Sep 2003 06:28:50 -0000 1.107 --- config.inc.php 16 Sep 2003 05:38:33 -0000 1.108 *************** *** 1,5 **** <?php ! // Configuration file for PHP iCalendar 0.9.2 // // To set values, change the text between the single quotes --- 1,5 ---- <?php ! // Configuration file for PHP iCalendar 0.9.4 // // To set values, change the text between the single quotes *************** *** 40,44 **** $daysofweek_dayview = 'no'; // Display the days of the week in day.php view. $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). ! $show_search = 'yes'; // Show the search box in the sidebar. $header_always = 'yes'; // Set to yes to have header on print.php $allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies. --- 40,44 ---- $daysofweek_dayview = 'no'; // Display the days of the week in day.php view. $enable_rss = 'yes'; // Enable RSS access to your calendars (good thing). ! $show_search = 'no'; // Show the search box in the sidebar. $header_always = 'yes'; // Set to yes to have header on print.php $allow_preferences = 'yes'; // Allow visitors to change various preferences via cookies. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** day.php 14 Sep 2003 21:01:34 -0000 1.93 --- day.php 16 Sep 2003 05:38:33 -0000 1.94 *************** *** 54,59 **** <?php // if RSS is enabled, set the RSS auto-discovery link ! if ($enable_rss == 'yes') ! { echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=day\">"; } --- 54,58 ---- <?php // if RSS is enabled, set the RSS auto-discovery link ! if ($enable_rss == 'yes') { echo "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$default_path."/rss/rss.php?cal=".$cal."&rssview=day\">"; } *************** *** 314,319 **** </table> </td> ! <td width="20"><img src="images/spacer.gif" width="20" height="1" alt=" "></td> ! <td width="160" valign="top"> <?php include (BASE.'includes/sidebar.php'); ?> <?php include (BASE.'includes/footer.inc.php'); ?> --- 313,318 ---- </table> </td> ! <td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td> ! <td width="170" valign="top"> <?php include (BASE.'includes/sidebar.php'); ?> <?php include (BASE.'includes/footer.inc.php'); ?> |
From: <cl...@us...> - 2003-09-15 06:31:00
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv1245 Modified Files: README Log Message: For 0.9.4 Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** README 13 Aug 2003 05:37:35 -0000 1.47 --- README 15 Sep 2003 06:30:57 -0000 1.48 *************** *** 73,76 **** --- 73,85 ---- Changes: -------- + 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 -Multiple calendar support (up to 8). |
From: <cl...@us...> - 2003-09-15 06:28:54
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv719/functions Modified Files: ical_parser.php Log Message: Major changes in BYDAY monthly support, added new stuffs to readme and added new calendar to test and fix. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** ical_parser.php 15 Sep 2003 03:18:24 -0000 1.97 --- ical_parser.php 15 Sep 2003 06:28:51 -0000 1.98 *************** *** 98,102 **** $beginning, $rrule_array, $start_of_vevent, $description, $valarm_description, $start_unixtime, $end_unixtime, ! $recurrence_id, $uid, $class, $location ); --- 98,102 ---- $beginning, $rrule_array, $start_of_vevent, $description, $valarm_description, $start_unixtime, $end_unixtime, ! $recurrence_id, $uid, $class, $location, $rrule ); *************** *** 432,436 **** $next_range_time = strtotime(date('Y-m-01', $next_range_time)); // month has two cases, either $bymonthday or $byday ! if (is_array($bymonthday)) { // loop through the days on which this event happens foreach($bymonthday as $day) { --- 432,436 ---- $next_range_time = strtotime(date('Y-m-01', $next_range_time)); // month has two cases, either $bymonthday or $byday ! if ((is_array($bymonthday)) && (!is_array($byday))) { // loop through the days on which this event happens foreach($bymonthday as $day) { *************** *** 446,463 **** // loop through the days on which this event happens foreach($byday as $day) { ! ereg ('([-\+]{0,1})([0-9]{1})([A-Z]{2})', $day, $byday_arr); $nth = $byday_arr[2]-1; $on_day = two2threeCharDays($byday_arr[3]); $on_day_num = two2threeCharDays($byday_arr[3],false); ! if ($byday_arr[1] == '-') { $last_day_tmp = date('t',$next_range_time); $next_range_time = strtotime(date('Y-m-'.$last_day_tmp, $next_range_time)); $last_tmp = (date('w',$next_range_time) == $on_day_num) ? '' : 'last '; $next_date_time = strtotime($last_tmp.$on_day.' -'.$nth.' week', $next_range_time); ! } else { $next_date_time = strtotime($on_day.' +'.$nth.' week', $next_range_time); } $next_date = date('Ymd', $next_date_time); ! $recur_data[] = $next_date_time; } } --- 446,478 ---- // loop through the days on which this event happens foreach($byday as $day) { ! ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); $nth = $byday_arr[2]-1; $on_day = two2threeCharDays($byday_arr[3]); $on_day_num = two2threeCharDays($byday_arr[3],false); ! if ((isset($byday_arr[1])) && ($byday_arr[1] == '-')) { $last_day_tmp = date('t',$next_range_time); $next_range_time = strtotime(date('Y-m-'.$last_day_tmp, $next_range_time)); $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); ! $month = date('m', $next_range_time); ! if (checkdate($month,$day,$year)) { ! $next_date_time = mktime(0,0,0,$month,$day,$year); ! $daday = strtolower(strftime("%a", $next_date_time)); ! if ($daday == $on_day && in_array($month, $bymonth)) { ! $recur_data[] = $next_date_time; ! } ! } ! } ! } 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); ! //$recur_data[] = $next_date_time; } } *************** *** 470,474 **** $checkdate_time = mktime(0,0,0,$month,1,$year); foreach($byday as $day) { ! ereg ('([-\+]{0,1})([0-9]{1})([A-Z]{2})', $day, $byday_arr); $nth = $byday_arr[2]-1; $on_day = two2threeCharDays($byday_arr[3]); --- 485,489 ---- $checkdate_time = mktime(0,0,0,$month,1,$year); foreach($byday as $day) { ! ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); $nth = $byday_arr[2]-1; $on_day = two2threeCharDays($byday_arr[3]); *************** *** 955,967 **** //If you want to see the values in the arrays, uncomment below. ! /* ! print '<pre>'; ! print_r($master_array); ! print_r($overlap_array); //print_r($day_array); ! //print_r($rrule); //print_r($recurrence_delete); ! print '</pre>'; ! */ // Set a calender name for all calenders combined --- 970,981 ---- //If you want to see the values in the arrays, uncomment below. ! ! //print '<pre>'; ! //print_r($master_array); ! //print_r($overlap_array); //print_r($day_array); ! //print_r($rrule_array); //print_r($recurrence_delete); ! //print '</pre>'; // Set a calender name for all calenders combined |
From: <cl...@us...> - 2003-09-15 06:28:54
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv719/calendars Modified Files: Home.ics Added Files: LACW.ics Log Message: Major changes in BYDAY monthly support, added new stuffs to readme and added new calendar to test and fix. --- NEW FILE: LACW.ics --- BEGIN:VCALENDAR CALSCALE:GREGORIAN X-WR-TIMEZONE;VALUE=TEXT:US/Mountain PRODID:-//Apple Computer\, Inc//iCal 1.0//EN X-WR-RELCALID;VALUE=TEXT:4C3F5D0E-D051-11D7-A119-00306583A102-CALP X-WR-CALNAME;VALUE=TEXT:LACW VERSION:2.0 BEGIN:VEVENT UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID DTSTAMP:20030817T012730Z SUMMARY:Los Alamos Community winds at the White Rock Baptist Church (Vives & Beethoven's 5th\, 2nd movement) DTSTART;TZID=US/Mountain:20030812T190000 DTEND;TZID=US/Mountain:20030812T210000 RRULE:FREQ=WEEKLY;UNTIL=20031005T055959;INTERVAL=1;BYDAY=TU END:VEVENT BEGIN:VEVENT RECURRENCE-ID;TZID=US/Mountain:20030826T190000 DTSTAMP:20030817T012938Z SUMMARY:Cancelled: Los Alamos Community winds at the White Rock Baptist Church UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID DTSTART;TZID=US/Mountain:20030826T190000 DURATION:PT2H END:VEVENT BEGIN:VEVENT SUMMARY:Los Alamos Community winds at the White Rock Baptist Church (Copland & Beethoven's 5th\, 3rd & 4th movements) DURATION:PT2H RECURRENCE-ID;TZID=US/Mountain:20030819T190000 DTSTART;TZID=US/Mountain:20030819T190000 UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID END:VEVENT BEGIN:VEVENT SUMMARY:Los Alamos Community winds at the Los Alamos Middle School (Grainger & Beethoven's 5th\, 1st & 2nd movements) DURATION:PT2H RECURRENCE-ID;TZID=US/Mountain:20030902T190000 DTSTART;TZID=US/Mountain:20030902T190000 UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID END:VEVENT BEGIN:VEVENT RECURRENCE-ID;TZID=US/Mountain:20030909T190000 DTSTAMP:20030817T013316Z SUMMARY:Los Alamos Community winds at the Los Alamos Middle School (Susato\, Vives\, & Beethoven's 5th\, 3rd & 4th movements) UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID DTSTART;TZID=US/Mountain:20030909T190000 DURATION:PT2H END:VEVENT BEGIN:VEVENT RECURRENCE-ID;TZID=US/Mountain:20030916T190000 DTSTAMP:20030817T013302Z SUMMARY:Los Alamos Community winds at the Los Alamos Middle School (Mendelssohn & Beethoven's 5th) UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID DTSTART;TZID=US/Mountain:20030916T190000 DURATION:PT2H END:VEVENT BEGIN:VEVENT SUMMARY:Los Alamos Community winds at the Los Alamos Middle School (Copland\, Grainger\, & Beethoven's 5th) DURATION:PT2H RECURRENCE-ID;TZID=US/Mountain:20030923T190000 DTSTART;TZID=US/Mountain:20030923T190000 UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID END:VEVENT BEGIN:VEVENT SUMMARY:Los Alamos Community winds at the Los Alamos Middle School (Dress Rehearsal) DURATION:PT2H RECURRENCE-ID;TZID=US/Mountain:20030930T190000 DTSTART;TZID=US/Mountain:20030930T190000 UID:5ECEAD4E-D051-11D7-A119-00306583A102-RID END:VEVENT BEGIN:VEVENT UID:1F3E3CC2-D053-11D7-A119-00306583A102-RID DTSTAMP:20030817T013656Z SUMMARY:LACW Concert at the Betty Ehart Senior Center DTSTART;TZID=US/Mountain:20031004T193000 DTEND;TZID=US/Mountain:20031004T213000 END:VEVENT END:VCALENDAR Index: Home.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/Home.ics,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Home.ics 30 May 2003 17:58:55 -0000 1.8 --- Home.ics 15 Sep 2003 06:28:50 -0000 1.9 *************** *** 128,130 **** --- 128,170 ---- DURATION:PT1H 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 + EXDATE;TZID=US/Eastern:20030407T095000 + EXDATE;TZID=US/Eastern:20020107T095000 + EXDATE;TZID=US/Eastern:20020204T095000 + EXDATE;TZID=US/Eastern:20020304T095000 + EXDATE;TZID=US/Eastern:20020401T095000 + EXDATE;TZID=US/Eastern:20020506T095000 + EXDATE;TZID=US/Eastern:20020603T095000 + EXDATE;TZID=US/Eastern:20020701T095000 + EXDATE;TZID=US/Eastern:20020805T095000 + EXDATE;TZID=US/Eastern:20020902T095000 + EXDATE;TZID=US/Eastern:20021007T095000 + EXDATE;TZID=US/Eastern:20021104T095000 + EXDATE;TZID=US/Eastern:20021202T095000 + EXDATE;TZID=US/Eastern:20030106T095000 + EXDATE;TZID=US/Eastern:20030203T095000 + EXDATE;TZID=US/Eastern:20030303T095000 + EXDATE;TZID=US/Eastern:20030505T095000 + EXDATE;TZID=US/Eastern:20030602T095000 + EXDATE;TZID=US/Eastern:20030804T095000 + EXDATE;TZID=US/Eastern:20030901T095000 + EXDATE;TZID=US/Eastern:20030707T095000 + UID:D9040425-RID + SUMMARY:Water Aloe Plant + DTSTART;TZID=US/Eastern:20020107T095000 + DTSTAMP:20030819T222017Z + DURATION:PT10M + RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1MO + END:VEVENT + + END:VCALENDAR |
From: <cl...@us...> - 2003-09-15 06:28:54
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv719 Modified Files: config.inc.php month.php Log Message: Major changes in BYDAY monthly support, added new stuffs to readme and added new calendar to test and fix. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.106 retrieving revision 1.107 diff -C2 -d -r1.106 -r1.107 *** config.inc.php 15 Sep 2003 03:04:47 -0000 1.106 --- config.inc.php 15 Sep 2003 06:28:50 -0000 1.107 *************** *** 31,35 **** // 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. --- 31,35 ---- // 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. Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** month.php 15 Sep 2003 00:26:16 -0000 1.95 --- month.php 15 Sep 2003 06:28:50 -0000 1.96 *************** *** 127,132 **** } if ($i == 0) echo '<tr height="105">'; - echo '<td valign="top" align="left" '.$bgclass.' width="105" height="105">'; if (isset($master_array[("$daylink")])) { echo '<div align="right"><font class="G10"><a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a></font></div>'; echo '<div align="left">'; --- 127,132 ---- } if ($i == 0) echo '<tr height="105">'; if (isset($master_array[("$daylink")])) { + echo '<td valign="top" align="left" '.$bgclass.' width="105" height="105">'; echo '<div align="right"><font class="G10"><a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a></font></div>'; echo '<div align="left">'; *************** *** 163,167 **** } else { echo '<td align="center" valign="top" '.$bgclass.' width="105" height="105">'; ! echo '<a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>'; echo '</td>'; } --- 163,167 ---- } else { echo '<td align="center" valign="top" '.$bgclass.' width="105" height="105">'; ! echo '<div align="right"><font class="G10"><a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a></font></div>'; echo '</td>'; } |
From: <ica...@us...> - 2003-09-15 03:18:28
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv1375/functions Modified Files: ical_parser.php init.inc.php Log Message: Fixed the bug that displayed events from blacklisted cals in combined calendar view. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** ical_parser.php 15 Sep 2003 03:04:48 -0000 1.96 --- ical_parser.php 15 Sep 2003 03:18:24 -0000 1.97 *************** *** 954,958 **** - //If you want to see the values in the arrays, uncomment below. /* --- 954,957 ---- Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** init.inc.php 15 Sep 2003 01:00:44 -0000 1.35 --- init.inc.php 15 Sep 2003 03:18:24 -0000 1.36 *************** *** 104,113 **** $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename)); - // build the array while (false != ($file = readdir($dir_handle))) { ! if (preg_match("/^[^.].+\.ics$/", $file)) { ! $file = $calendar_path.'/'.$file; ! array_push($cal_filelist, $file); } } --- 104,113 ---- $dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename)); // build the array while (false != ($file = readdir($dir_handle))) { ! if (preg_match("/^[^.].+\.ics$/", $file) && ! !in_array(substr($file, 0, -4), $blacklisted_cals)) { ! $file = $calendar_path.'/'.$file; ! array_push($cal_filelist, $file); } } |
From: <ica...@us...> - 2003-09-15 03:18:27
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv1375 Modified Files: AUTHORS Log Message: Fixed the bug that displayed events from blacklisted cals in combined calendar view. Index: AUTHORS =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AUTHORS 5 Sep 2003 15:14:37 -0000 1.4 --- AUTHORS 15 Sep 2003 03:18:23 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- -------------- Chad Little <ch...@ch...> + Patrick Crowley <pa...@ic...> DEVELOPERS |
From: <cl...@us...> - 2003-09-15 03:04:52
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv31855/functions Modified Files: ical_parser.php Log Message: a Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** ical_parser.php 15 Sep 2003 02:54:03 -0000 1.95 --- ical_parser.php 15 Sep 2003 03:04:48 -0000 1.96 *************** *** 928,953 **** if ($parse_file) { ! // Sort the array by absolute date. ! if (isset($master_array) && is_array($master_array)) { ! ksort($master_array); ! reset($master_array); ! ! // sort the sub (day) arrays so the times are in order ! foreach (array_keys($master_array) as $k) { ! if (isset($master_array[$k]) && is_array($master_array[$k])) { ! ksort($master_array[$k]); ! reset($master_array[$k]); ! } ! } ! } ! // write the new master array to the file ! if (isset($master_array) && is_array($master_array) && $save_parsed_cals == 'yes' && $is_webcal == FALSE) { ! $write_me = serialize($master_array); ! $fd = fopen($parsedcal, 'w'); ! fwrite($fd, $write_me); ! fclose($fd); ! touch($parsedcal, $realcal_mtime); } } --- 928,953 ---- if ($parse_file) { ! // Sort the array by absolute date. ! if (isset($master_array) && is_array($master_array)) { ! ksort($master_array); ! reset($master_array); ! // sort the sub (day) arrays so the times are in order ! foreach (array_keys($master_array) as $k) { ! if (isset($master_array[$k]) && is_array($master_array[$k])) { ! ksort($master_array[$k]); ! reset($master_array[$k]); ! } } + } + + // write the new master array to the file + if (isset($master_array) && is_array($master_array) && $save_parsed_cals == 'yes' && $is_webcal == FALSE && $cal != 'all_calenders_combined971') { + $write_me = serialize($master_array); + $fd = fopen($parsedcal, 'w'); + fwrite($fd, $write_me); + fclose($fd); + touch($parsedcal, $realcal_mtime); + } } |
From: <cl...@us...> - 2003-09-15 03:04:50
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv31855 Modified Files: config.inc.php Log Message: a Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.105 retrieving revision 1.106 diff -C2 -d -r1.105 -r1.106 *** config.inc.php 14 Sep 2003 21:01:34 -0000 1.105 --- config.inc.php 15 Sep 2003 03:04:47 -0000 1.106 *************** *** 31,35 **** // 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. --- 31,35 ---- // 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-15 02:54:07
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv29812/functions Modified Files: ical_parser.php Log Message: Switched it to not save parsed combined cals. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** ical_parser.php 15 Sep 2003 01:00:44 -0000 1.94 --- ical_parser.php 15 Sep 2003 02:54:03 -0000 1.95 *************** *** 32,36 **** // reading the file if it's allowed $parse_file = true; ! if ($is_webcal == false && $save_parsed_cals == 'yes') { $realcal_mtime = filemtime($filename); $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; --- 32,36 ---- // reading the file if it's allowed $parse_file = true; ! if (($is_webcal == false) && ($save_parsed_cals == 'yes') && ($cal != 'all_calenders_combined971')) { $realcal_mtime = filemtime($filename); $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; |
From: <cl...@us...> - 2003-09-15 01:00:48
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv9108/functions Modified Files: admin_functions.php ical_parser.php init.inc.php list_icals.php Log Message: Fix for bug #794853 listing dot-files. Index: admin_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/admin_functions.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** admin_functions.php 30 May 2003 00:45:20 -0000 1.2 --- admin_functions.php 15 Sep 2003 01:00:44 -0000 1.3 *************** *** 295,299 **** $filelist = array(); while ($file = readdir($dir_handle)) { ! if (substr($file, -4) == ".ics") { array_push($filelist, $file); } --- 295,299 ---- $filelist = array(); while ($file = readdir($dir_handle)) { ! if (preg_match("/^[^.].+\.ics$/", $file)) { array_push($filelist, $file); } Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** ical_parser.php 13 Aug 2003 05:37:36 -0000 1.93 --- ical_parser.php 15 Sep 2003 01:00:44 -0000 1.94 *************** *** 884,901 **** case 'DURATION': if (($first_duration == TRUE) && (!stristr($field, '=DURATION'))) { ! ereg ('^P([0-9]{1,2})?([W,D]{0,1}[T])?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration); ! if ($duration[2] = 'W') { ! $weeks = $duration[1]; ! $days = 0; ! } else { ! $days = $duration[1]; ! $weeks = 0; ! } ! $hours = ereg_replace('H', '', $duration[3]); ! $minutes = ereg_replace('M', '', $duration[4]); ! $seconds = ereg_replace('S', '', $duration[5]); ! $the_duration = ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds); ! $end_unixtime = $start_unixtime + $the_duration; ! $end_time = date ('Hi', $end_unixtime); $first_duration = FALSE; } --- 884,896 ---- case 'DURATION': if (($first_duration == TRUE) && (!stristr($field, '=DURATION'))) { ! ereg ('^P([0-9]{1,2}[W])?([0-9]{1,2}[D])?([T]{0,1})?([0-9]{1,2}[H])?([0-9]{1,2}[M])?([0-9]{1,2}[S])?', $data, $duration); ! $weeks = ereg_replace('W', '', $duration[1]); ! $days = ereg_replace('D', '', $duration[2]); ! $hours = ereg_replace('H', '', $duration[4]); ! $minutes = ereg_replace('M', '', $duration[5]); ! $seconds = ereg_replace('S', '', $duration[6]); ! $the_duration = ($weeks * 60 * 60 * 24 * 7) + ($days * 60 * 60 * 24) + ($hours * 60 * 60) + ($minutes * 60) + ($seconds); ! $end_unixtime = $start_unixtime + $the_duration; ! $end_time = date ('Hi', $end_unixtime); $first_duration = FALSE; } *************** *** 927,970 **** } } - - /* - //print '<pre>'; - // Remove pesky recurrences - if (is_array($recurrence_delete)) { - foreach ($recurrence_delete as $delete => $delete_key) { - foreach ($delete_key as $key => $val) { - #echo "Before Delete:: $delete $key $val<br>"; - #print_r($master_array["$delete"]); - if (is_array($master_array[($delete)][($key)][($val)])) { - removeOverlap($delete, $key, $val); - unset($master_array["$delete"]["$key"]["$val"]); - // Remove date from array if no events - if (sizeof($master_array["$delete"]["$key"] = 1)) { - #echo "deleting $delete $key $val<br>"; - unset($master_array["$delete"]["$key"]); - if (!sizeof($master_array["$delete"] > 1)) { - #echo "deleting $delete $key $val<br>"; - unset($master_array["$delete"]); - } - } - #print_r($master_array["$delete"]); - // Check for overlaps and rewrite them - foreach($master_array["$delete"] as $overlap_time => $overlap_val) { - $recur_data_date = $delete; - foreach ($overlap_val as $uid => $val) { - $start_time = $val['event_start']; - $end_time = $val['event_end']; - #$nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid); - #$master_array[($recur_data_date)][($start_time)][($uid)]['event_overlap'] = 0; - #echo "$recur_data_date - $uid - $start_time - $end_time - $nbrOfOverlaps<br>"; - #print_r($val); - } - } - } - } - } - } - - */ } $calnumber = $calnumber + 1; --- 922,925 ---- Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** init.inc.php 13 Aug 2003 05:37:36 -0000 1.34 --- init.inc.php 15 Sep 2003 01:00:44 -0000 1.35 *************** *** 107,111 **** // build the array while (false != ($file = readdir($dir_handle))) { ! if (substr($file, -4) == ".ics") { $file = $calendar_path.'/'.$file; array_push($cal_filelist, $file); --- 107,111 ---- // build the array while (false != ($file = readdir($dir_handle))) { ! if (preg_match("/^[^.].+\.ics$/", $file)) { $file = $calendar_path.'/'.$file; array_push($cal_filelist, $file); *************** *** 114,118 **** // add webcals foreach ($list_webcals as $file) { ! if (substr($file, -4) == ".ics") { array_push($cal_filelist, $file); } --- 114,118 ---- // add webcals foreach ($list_webcals as $file) { ! if (preg_match("/^[^.].+\.ics$/", $file)) { array_push($cal_filelist, $file); } Index: list_icals.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** list_icals.php 30 Jun 2003 22:48:25 -0000 1.13 --- list_icals.php 15 Sep 2003 01:00:44 -0000 1.14 *************** *** 18,22 **** // build the <option> tags while (false != ($file = readdir($dir_handle))) { ! if (substr($file, -4) == ".ics") { array_push($filelist, $file); } --- 18,22 ---- // build the <option> tags while (false != ($file = readdir($dir_handle))) { ! if (preg_match("/^[^.].+\.ics$/", $file)) { array_push($filelist, $file); } |
From: <cl...@us...> - 2003-09-15 01:00:48
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1:/tmp/cvs-serv9108/rss Modified Files: index.php Log Message: Fix for bug #794853 listing dot-files. Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/index.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** index.php 7 Dec 2002 02:27:36 -0000 1.18 --- index.php 15 Sep 2003 01:00:44 -0000 1.19 *************** *** 73,77 **** // build the <option> tags while ($file = readdir($dir_handle)) { ! if (substr($file, -4) == ".ics") { // $cal_filename is the filename of the calendar without .ics --- 73,77 ---- // build the <option> tags while ($file = readdir($dir_handle)) { ! if (preg_match("/^[^.].+\.ics$/", $file)) { // $cal_filename is the filename of the calendar without .ics |
From: <cl...@us...> - 2003-09-15 01:00:47
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv9108 Modified Files: preferences.php Log Message: Fix for bug #794853 listing dot-files. Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** preferences.php 30 Jun 2003 22:46:12 -0000 1.29 --- preferences.php 15 Sep 2003 01:00:44 -0000 1.30 *************** *** 168,172 **** $filelist = array(); while ($file = readdir($dir_handle)) { ! if (substr($file, -4) == ".ics") { array_push($filelist, $file); } --- 168,172 ---- $filelist = array(); while ($file = readdir($dir_handle)) { ! if (preg_match("/^[^.].+\.ics$/", $file)) { array_push($filelist, $file); } |
From: <cl...@us...> - 2003-09-15 00:40:12
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv5547/includes Modified Files: sidebar.php Log Message: Fixed #795112, tomorrow's events popup. Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** sidebar.php 14 Sep 2003 20:03:21 -0000 1.13 --- sidebar.php 15 Sep 2003 00:40:04 -0000 1.14 *************** *** 146,156 **** $event_text = word_wrap($event_text, 21, $tomorrows_events_lines); ! if (!isset($val["event_start"])) { ! $event_start = $all_day_lang; ! $event_end = ''; ! echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a><br>\n"; ! } else { ! echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">• $event_text</font></a><br>\n"; } } --- 146,162 ---- $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"; } + + } |
From: <cl...@us...> - 2003-09-15 00:26:25
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv3107 Modified Files: month.php Log Message: Changed to 15. Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** month.php 14 Sep 2003 23:09:30 -0000 1.94 --- month.php 15 Sep 2003 00:26:16 -0000 1.95 *************** *** 137,141 **** if (!isset($val["event_start"])) { openevent("$calendar_name", "", "", $val, $month_event_lines, ! 14, "<div align=\"center\" class=\"V10\"><i>", "</i></div>", --- 137,141 ---- if (!isset($val["event_start"])) { openevent("$calendar_name", "", "", $val, $month_event_lines, ! 15, "<div align=\"center\" class=\"V10\"><i>", "</i></div>", |
From: <cl...@us...> - 2003-09-14 23:09:34
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv20804 Modified Files: month.php Log Message: Blah Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** month.php 14 Sep 2003 23:04:39 -0000 1.93 --- month.php 14 Sep 2003 23:09:30 -0000 1.94 *************** *** 137,141 **** if (!isset($val["event_start"])) { openevent("$calendar_name", "", "", $val, $month_event_lines, ! 11, "<div align=\"center\" class=\"V10\"><i>", "</i></div>", --- 137,141 ---- if (!isset($val["event_start"])) { openevent("$calendar_name", "", "", $val, $month_event_lines, ! 14, "<div align=\"center\" class=\"V10\"><i>", "</i></div>", |
From: <cl...@us...> - 2003-09-14 23:04:42
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv19845 Modified Files: month.php Log Message: Changed word_wrap from 12 to 11 due to safari, camino. Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** month.php 14 Sep 2003 21:01:34 -0000 1.92 --- month.php 14 Sep 2003 23:04:39 -0000 1.93 *************** *** 137,141 **** if (!isset($val["event_start"])) { openevent("$calendar_name", "", "", $val, $month_event_lines, ! 12, "<div align=\"center\" class=\"V10\"><i>", "</i></div>", --- 137,141 ---- if (!isset($val["event_start"])) { openevent("$calendar_name", "", "", $val, $month_event_lines, ! 11, "<div align=\"center\" class=\"V10\"><i>", "</i></div>", *************** *** 152,156 **** $val, $month_event_lines, ! 12, "<div align=\"left\" class=\"V9\"> $start2 ", "</div>", --- 152,156 ---- $val, $month_event_lines, ! 11, "<div align=\"left\" class=\"V9\"> $start2 ", "</div>", |
From: <cl...@us...> - 2003-09-14 21:01:38
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv25119/functions Modified Files: date_functions.php Log Message: Removed many many tables from month view, switched to DIVS. Fixed openevent, added link class. Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** date_functions.php 29 May 2003 06:27:14 -0000 1.14 --- date_functions.php 14 Sep 2003 21:01:34 -0000 1.15 *************** *** 161,165 **** } ! function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic) { $event_text = stripslashes(urldecode($arr["event_text"])); # for iCal pseudo tag <http> comptability --- 161,165 ---- } ! function openevent($cal, $st, $end, $arr, $lines, $wrap, $clic, $fclic, $class) { $event_text = stripslashes(urldecode($arr["event_text"])); # for iCal pseudo tag <http> comptability *************** *** 193,198 **** if ($event_text != "") { if ($lines) $event_text = word_wrap($event_text, $wrap, $lines); ! $dsc =urlencode(addslashes($arr["description"])); ! echo "<a class=\"psf\" href=\""; if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $ev, $res))) || ($dsc)) { echo "javascript:w=window.open('"; --- 193,198 ---- if ($event_text != "") { if ($lines) $event_text = word_wrap($event_text, $wrap, $lines); ! $dsc = urlencode(addslashes($arr["description"])); ! echo '<a class="'.$class.'" href="'; if ((!(ereg("([[:alpha:]]+://[^<>[:space:]]+)", $ev, $res))) || ($dsc)) { echo "javascript:w=window.open('"; *************** *** 208,212 **** echo $res[1]; } ! echo "\">$clic$event_text</a>"; } } --- 208,212 ---- echo $res[1]; } ! echo '">'.$clic.$event_text.'</a>'.$fclic; } } |
From: <cl...@us...> - 2003-09-14 21:01:38
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv25119 Modified Files: config.inc.php day.php month.php week.php Log Message: Removed many many tables from month view, switched to DIVS. Fixed openevent, added link class. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** config.inc.php 1 Jul 2003 00:40:59 -0000 1.104 --- config.inc.php 14 Sep 2003 21:01:34 -0000 1.105 *************** *** 11,15 **** $default_cal = 'all_calenders_combined971'; // Exact filename of calendar without .ics. Or set to 'all_calenders_combined971' to open all calenders combined into one. $language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto' ! $week_start_day = 'Saturday'; // Day of the week your week starts on $day_start = '0800'; // Start time for day grid $gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred --- 11,15 ---- $default_cal = 'all_calenders_combined971'; // Exact filename of calendar without .ics. Or set to 'all_calenders_combined971' to open all calenders combined into one. $language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto' ! $week_start_day = 'Sunday'; // Day of the week your week starts on $day_start = '0800'; // Start time for day grid $gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** day.php 30 Jun 2003 22:46:12 -0000 1.92 --- day.php 14 Sep 2003 21:01:34 -0000 1.93 *************** *** 119,123 **** "", '<font color="#ffffff"><i>', ! "</i></font>"); echo "</td>\n</tr>\n"; } --- 119,124 ---- "", '<font color="#ffffff"><i>', ! "</i></font>", ! "psf"); echo "</td>\n</tr>\n"; } *************** *** 272,276 **** 0, "<font class=\"eventfont\">", ! "</font>"); echo '</td></tr>'."\n"; echo '</table>'."\n"; --- 273,278 ---- 0, "<font class=\"eventfont\">", ! "</font>", ! "psf"); echo '</td></tr>'."\n"; echo '</table>'."\n"; Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.91 retrieving revision 1.92 diff -C2 -d -r1.91 -r1.92 *** month.php 30 Jun 2003 22:46:12 -0000 1.91 --- month.php 14 Sep 2003 21:01:34 -0000 1.92 *************** *** 93,100 **** <tr> <td align="center" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td colspan="7" width="735"><img src="images/spacer.gif" width="735" height="1" alt=" "></td> ! </tr> <tr> <?php --- 93,97 ---- <tr> <td align="center" valign="top"> ! <table width="100%" border="0" cellspacing="1" cellpadding="2" class="monthback"> <tr> <?php *************** *** 104,176 **** $day_num = date("w", $start_day); $day = $daysofweek_lang[$day_num]; ! print "<td valign=\"top\" width=\"105\" height=\"12\" class=\"dateback\"><center><font class=\"V9BOLD\">$day</font></center></td>"; $start_day = strtotime("+1 day", $start_day); } ?> </tr> - <tr> - <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td> - <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td> - <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td> - <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td> - <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td> - <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td> - <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td> - </tr> - </table> - </td> - </tr> - <tr> - <td align="center" valign="top"> - <table width="100%" border="0" cellspacing="1" cellpadding="0" class="monthback"> <tr> <?php ! $sunday = strtotime("$start_month_day"); ! $i = 0; ! $whole_month = TRUE; ! $num_of_events = 0; do { ! $day = date ("j", $sunday); ! $daylink = date ("Ymd", $sunday); ! $check_month = date ("m", $sunday); if ($check_month != $this_month) { ! $day= "<font class=\"G10G\">$day</font>"; ! $bgclass="class=\"monthoff\""; } else { if ($today_today == $daylink) { ! $bgclass="class=\"monthon\""; } else { ! $bgclass="class=\"monthreg\""; } } ! if ($i == 0) echo "<tr height=\"105\">\n"; ! if (isset($master_array[("$daylink")]) && ($check_month == $this_month)) { ! echo "<td align=\"center\" valign=\"top\" $bgclass width=\"105\" height=\"105\">\n"; ! echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n"; ! echo "<tr>\n"; ! echo "<td align=\"right\" valign=\"top\" class=\"G10B\">\n"; ! echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! echo "</tr>\n"; if ($master_array[("$daylink")]) { foreach ($master_array[("$daylink")] as $event_times) { foreach ($event_times as $val) { $num_of_events++; - echo "<tr><td>\n"; - echo "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\">"; - echo "<tr>\n"; if (!isset($val["event_start"])) { - echo '<td align="center">'; openevent("$calendar_name", "", "", $val, $month_event_lines, 12, ! "<font class=\"V10\"><i>", ! "</i></font>"); } else { $event_start = @$val["event_start"]; $event_end = @$val["event_end"]; $event_start = date($timeFormat, @strtotime ("$event_start")); ! $start2 = date($timeFormat_small,@strtotime("$event_start")); $event_end = date($timeFormat, @strtotime ("$event_end")); - echo "<td align=\"left\" valign=\"top\">"; @openevent("$calendar_name", "$event_start", --- 101,150 ---- $day_num = date("w", $start_day); $day = $daysofweek_lang[$day_num]; ! echo '<td valign="top" width="105" height="12" class="dateback"><center class="V9BOLD">'.$day.'</center></td>'; $start_day = strtotime("+1 day", $start_day); } ?> </tr> <tr> <?php ! $sunday = strtotime("$start_month_day"); ! $i = 0; ! $whole_month = TRUE; ! $num_of_events = 0; do { ! $day = date ("j", $sunday); ! $daylink = date ("Ymd", $sunday); ! $check_month = date ("m", $sunday); if ($check_month != $this_month) { ! $day = '<font class="G10G">'.$day.'</font>'; ! $bgclass = 'class="monthoff"'; } else { if ($today_today == $daylink) { ! $bgclass = 'class="monthon"'; } else { ! $bgclass = 'class="monthreg"'; } } ! if ($i == 0) echo '<tr height="105">'; ! echo '<td valign="top" align="left" '.$bgclass.' width="105" height="105">'; ! if (isset($master_array[("$daylink")])) { ! echo '<div align="right"><font class="G10"><a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a></font></div>'; ! echo '<div align="left">'; if ($master_array[("$daylink")]) { foreach ($master_array[("$daylink")] as $event_times) { foreach ($event_times as $val) { $num_of_events++; if (!isset($val["event_start"])) { openevent("$calendar_name", "", "", $val, $month_event_lines, 12, ! "<div align=\"center\" class=\"V10\"><i>", ! "</i></div>", ! "psf"); } else { $event_start = @$val["event_start"]; $event_end = @$val["event_end"]; $event_start = date($timeFormat, @strtotime ("$event_start")); ! $start2 = date($timeFormat_small,@strtotime("$event_start")); $event_end = date($timeFormat, @strtotime ("$event_end")); @openevent("$calendar_name", "$event_start", *************** *** 179,208 **** $month_event_lines, 12, ! "<font class=\"V9\"> $start2 ", ! "</font>"); } - echo "</td></tr>\n"; - echo "</table>\n"; - echo "</td></tr>\n"; } } } ! echo "</table>\n"; ! echo "</td>\n"; } else { ! echo "<td align=\"center\" valign=\"top\" $bgclass width=\"105\" height=\"105\">\n"; ! echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n"; ! echo "<tr>\n"; ! echo "<td align=\"right\" valign=\"top\" class=\"G10B\">\n"; ! echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! echo "</tr>\n"; ! echo "</table>\n"; ! echo "</td>\n"; } $sunday = strtotime("+1 day", $sunday); $i++; if ($i == 7) { ! echo "</tr>\n"; $i = 0; $checkagain = date ("m", $sunday); --- 153,173 ---- $month_event_lines, 12, ! "<div align=\"left\" class=\"V9\"> $start2 ", ! "</div>", ! "ps3"); } } } } ! echo '</td>'; } else { ! echo '<td align="center" valign="top" '.$bgclass.' width="105" height="105">'; ! echo '<a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>'; ! echo '</td>'; } $sunday = strtotime("+1 day", $sunday); $i++; if ($i == 7) { ! echo '</tr>'; $i = 0; $checkagain = date ("m", $sunday); *************** *** 216,220 **** </table> <?php include (BASE.'includes/calendar_nav.php'); ?> ! <?php if (($num_of_events != 0) && ($this_months_events == "yes")) { ?> <br> <table border="0" cellspacing="0" cellpadding="0" width="737" bgcolor="#FFFFFF" class="calborder"> --- 181,185 ---- </table> <?php include (BASE.'includes/calendar_nav.php'); ?> ! <?php if ($this_months_events == "yes") { ?> <br> <table border="0" cellspacing="0" cellpadding="0" width="737" bgcolor="#FFFFFF" class="calborder"> *************** *** 274,278 **** 65, "<font class=\"G10B\"> ", ! "</font>"); //echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n"; echo "</td>\n"; --- 239,244 ---- 65, "<font class=\"G10B\"> ", ! "</font>", ! "psf"); //echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n"; echo "</td>\n"; Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** week.php 30 Jun 2003 22:46:12 -0000 1.92 --- week.php 14 Sep 2003 21:01:34 -0000 1.93 *************** *** 190,194 **** 12, '<font color="#ffffff">', ! "</font>"); echo "</td></tr>\n"; } --- 190,195 ---- 12, '<font color="#ffffff">', ! "</font>", ! "psf"); echo "</td></tr>\n"; } *************** *** 324,328 **** 25, "<font class=\"V10W\">", ! "</font>"); echo "</td></tr>\n"; echo "</table>\n"; --- 325,330 ---- 25, "<font class=\"V10W\">", ! "</font>", ! "psf"); echo "</td></tr>\n"; echo "</table>\n"; |
From: <cl...@us...> - 2003-09-14 20:18:09
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv15511/includes Modified Files: calendar_nav.php Log Message: Reduced HTML footprint. Cleaned up unneeded spacing. Index: calendar_nav.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** calendar_nav.php 30 Jun 2003 22:37:52 -0000 1.6 --- calendar_nav.php 14 Sep 2003 20:18:05 -0000 1.7 *************** *** 37,97 **** <table width="160" border="0" cellpadding="0" cellspacing="0"> <tr> - <td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20" alt=" "></td> <td align="center"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("-1 month", $fake_getdate_time))); ?></font></td> - <td align="right" valign="top" width="1"></td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="center"> <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"> - <tr> - <td><img src="images/spacer.gif" width="21" height="3" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - </tr> - <tr> <?php $start_day = strtotime($week_start_day); for ($i=0; $i<7; $i++) { $day_num = date("w", $start_day); $day = $daysofweekreallyshort_lang[$day_num]; ! print "<td align=\"center\"><font class=\"G10BOLD\">$day</font></td>\n"; $start_day = strtotime("+1 day", $start_day); } ! ?> ! </tr> ! <tr height="3"> ! <td colspan="7"><img src="images/spacer.gif" width="1" height="3" alt=" "></td> ! </tr> ! <?php ! $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; 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 align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"ps2\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; } else { ! echo "<td align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"psf\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; } $start_day = strtotime("+1 day", $start_day); $i++; if ($i == 7) { ! echo "</tr>\n"; $i = 0; $checkagain = date ("m", $start_day); --- 37,81 ---- <table width="160" border="0" cellpadding="0" cellspacing="0"> <tr> <td align="center"><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); *************** *** 101,109 **** ?> </table> </td> </tr> - <tr> - <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> - </tr> </table> </td> --- 85,91 ---- ?> </table> + <img src="images/spacer.gif" width="1" height="3" alt=" "><br> </td> </tr> </table> </td> *************** *** 118,179 **** <tr> <td valign="middle" align="center"> ! <table width="160" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="left"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td> ! </tr> ! <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><?php include('./functions/list_icals.php'); ?></td> ! </tr> ! <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="5" alt=" "></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><?php include('./functions/list_years.php'); ?></td> ! </tr> ! <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="5" alt=" "></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><?php include('./functions/list_months.php'); ?></td> ! </tr> ! <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="5" alt=" "></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><?php include('./functions/list_weeks.php'); ?></td> ! </tr> ! <?php ! if ($display_custom_goto == "yes") { ! ?> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6" class="G10B"> ! <form action="day.php" method="GET"> ! <input type="hidden" name="cal" value="<?php print urlencode($cal); ?>"> ! <input type="text" size="15" name="jumpto_day"> ! <input type="submit" value="Go"> ! </form> ! </td> ! </tr> ! <?php ! } ! ?> ! </table> </td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> </tr> </table> </td> --- 100,139 ---- <tr> <td valign="middle" align="center"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> <tr> ! <td width="4"></td> ! <td> ! <?php ! include('./functions/list_icals.php'); ! include('./functions/list_years.php'); ! include('./functions/list_months.php'); ! include('./functions/list_weeks.php'); ! ?> </td> </tr> + <?php + if ($display_custom_goto == "yes") { + ?> <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td class="G10B"> ! <form action="day.php" method="GET"> ! <input type="hidden" name="cal" value="<?php print urlencode($cal); ?>"> ! <input type="text" size="15" name="jumpto_day"> ! <input type="submit" value="Go"> ! </form> ! </td> </tr> + <?php + } + if ($show_search == 'yes') { ?> + <tr> + <td colspan="2"><img src="images/spacer.gif" width="21" height="3" alt=" "></td> + </tr> + <tr> + <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> + <td valign="middle" align="left"><?php echo "$search_box"; ?></td> + </tr> + <?php } ?> </table> </td> *************** *** 181,219 **** </table> </td> ! <td><img src="images/spacer.gif" width="10" height="1" alt=" "></td> <td width="160" valign="top"> <table cellpadding="0" cellspacing="0" border="0" width="160"> <tr> <td valign="middle" align="left" valign="top"> ! <table width="160" border="0" cellpadding="0" cellspacing="0"> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="left" valign="top"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> ! <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="2" alt=" "></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><font class="G10BOLD"><?php echo "$cal_displayname2"; ?></font></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6" class="G10B"> ! <?php ! 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_calenders_combined971') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n"; ! ?> ! </td> ! </tr> ! </table> ! </td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> </tr> </table> --- 141,170 ---- </table> </td> ! <td><img src="images/spacer.gif" width="20" height="1" alt=" "></td> <td width="160" valign="top"> <table cellpadding="0" cellspacing="0" border="0" width="160"> <tr> <td valign="middle" align="left" valign="top"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="2" alt=" "></td> </tr> <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><font class="G10BOLD"><?php echo "$cal_displayname2"; ?></font></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6" class="G10B"> ! <?php ! 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_calenders_combined971') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n"; ! ?> ! </td> </tr> </table> *************** *** 229,291 **** <tr> <td valign="middle" align="center"> ! <table width="160" border="0" cellpadding="0" cellspacing="0"> <tr> - <td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20" alt=" "></td> <td align="center"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("+1 month", $fake_getdate_time))); ?></font></td> - <td align="right" valign="top" width="1"></td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="center"> <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"> - <tr> - <td><img src="images/spacer.gif" width="21" height="3" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> - </tr> - <tr> <?php $start_day = strtotime($week_start_day); for ($i=0; $i<7; $i++) { $day_num = date("w", $start_day); $day = $daysofweekreallyshort_lang[$day_num]; ! print "<td align=\"center\"><font class=\"G10BOLD\">$day</font></td>\n"; $start_day = strtotime("+1 day", $start_day); } ! ?> ! </tr> ! <tr height="3"> ! <td colspan="7"><img src="images/spacer.gif" width="1" height="3" alt=" "></td> ! </tr> ! <?php ! $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; 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 align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"ps2\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; } else { ! echo "<td align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"psf\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; } $start_day = strtotime("+1 day", $start_day); $i++; if ($i == 7) { ! echo "</tr>\n"; $i = 0; $checkagain = date ("m", $start_day); --- 180,226 ---- <tr> <td valign="middle" align="center"> ! <table width="160" border="0" cellpadding="3" cellspacing="0"> <tr> <td align="center"><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); *************** *** 295,302 **** ?> </table> </td> - </tr> - <tr> - <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> </tr> </table> --- 230,235 ---- ?> </table> + <img src="images/spacer.gif" width="1" height="3" alt=" "><br> </td> </tr> </table> |
From: <cl...@us...> - 2003-09-14 20:03:25
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv12255/includes Modified Files: sidebar.php Log Message: Removed more tables Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** sidebar.php 14 Sep 2003 20:00:57 -0000 1.12 --- sidebar.php 14 Sep 2003 20:03:21 -0000 1.13 *************** *** 18,270 **** ?> ! <table cellpadding="0" cellspacing="0" border="0" width="170"> <tr> ! <td valign="middle" align="center"> ! <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"> ! <table border="0" cellspacing="0" cellpadding="1" bgcolor="#FFFFFF" width="100%"> ! <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="2" alt=" "></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><font class="G10BOLD"><?php echo "$cal_displayname2"; ?></font></td> ! </tr> ! <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6" class="G10B"> ! <?php ! 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_calenders_combined971') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n"; ! ?> ! </td> ! </tr> ! </table> ! </td> </tr> <tr> ! <td colspan="3"><img src="images/spacer.gif" width="1" height="6" alt=" "></td> </tr> </table> </td> </tr> </table> <br> ! <table cellpadding="0" cellspacing="0" border="0" width="170"> <tr> ! <td valign="middle" align="center"> ! <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$jump_lang"; ?></font></td> ! <td align="right" valign="top" width="1%" class="sideback"></td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="left"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> ! <tr> ! <td colspan="2"><img src="images/spacer.gif" width="21" height="6" alt=" "></td> ! </tr> ! <tr> ! <td width="4"></td> ! <td> ! <?php ! include('./functions/list_icals.php'); ! include('./functions/list_years.php'); ! include('./functions/list_months.php'); ! include('./functions/list_weeks.php'); ! ?> ! </td> ! </tr> ! <?php ! if ($display_custom_goto == "yes") { ! ?> ! <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td class="G10B"> ! <form action="day.php" method="GET"> ! <input type="hidden" name="cal" value="<?php print urlencode($cal); ?>"> ! <input type="text" size="15" name="jumpto_day"> ! <input type="submit" value="Go"> ! </form> ! </td> ! </tr> ! <?php ! } ! if ($show_search == 'yes') { ?> ! <tr> ! <td colspan="2"><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! </tr> ! <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td valign="middle" align="left"><?php echo "$search_box"; ?></td> ! </tr> ! <?php } ?> ! </table> </td> </tr> <tr> ! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> </tr> </table> </td> </tr> </table> <br> ! <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?> ! <table cellpadding="0" cellspacing="0" border="0" width="170"> <tr> ! <td valign="middle" align="center"> ! <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$tomorrows_lang"; ?></font></td> ! <td align="right" valign="top" width="1%" class="sideback"></td> </tr> ! <tr> ! <td colspan="3" 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 = ''; ! echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a><br>\n"; ! } else { ! echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">• $event_text</font></a><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> </td> </tr> </table> <br> <?php } ! if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?> ! <table cellpadding="0" cellspacing="0" border="0" width="170"> <tr> ! <td valign="middle" align="center"> ! <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$todo_lang"; ?></font></td> ! <td align="right" valign="top" width="1%" class="sideback"></td> </tr> ! <tr> ! <td colspan="3" 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 = $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> </td> </tr> </table> <br> <?php } --- 18,250 ---- ?> ! <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"> ! <table border="0" cellspacing="0" cellpadding="1" bgcolor="#FFFFFF" width="100%"> <tr> ! <td colspan="7"><img src="images/spacer.gif" width="21" height="2" alt=" "></td> </tr> <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6"><font class="G10BOLD"><?php echo "$cal_displayname2"; ?></font></td> </tr> <tr> ! <td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td colspan="6" class="G10B"> ! <?php ! 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_calenders_combined971') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n"; ! ?> ! </td> </tr> </table> </td> </tr> + <tr> + <td colspan="3"><img src="images/spacer.gif" width="1" height="6" alt=" "></td> + </tr> </table> <br> ! <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$jump_lang"; ?></font></td> ! <td align="right" valign="top" width="1%" class="sideback"></td> ! </tr> ! <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="left"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%"> <tr> ! <td colspan="2"><img src="images/spacer.gif" width="21" height="6" alt=" "></td> </tr> <tr> ! <td width="4"></td> ! <td> ! <?php ! include('./functions/list_icals.php'); ! include('./functions/list_years.php'); ! include('./functions/list_months.php'); ! include('./functions/list_weeks.php'); ! ?> </td> </tr> + <?php + if ($display_custom_goto == "yes") { + ?> <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td class="G10B"> ! <form action="day.php" method="GET"> ! <input type="hidden" name="cal" value="<?php print urlencode($cal); ?>"> ! <input type="text" size="15" name="jumpto_day"> ! <input type="submit" value="Go"> ! </form> ! </td> ! </tr> ! <?php ! } ! if ($show_search == 'yes') { ?> ! <tr> ! <td colspan="2"><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! </tr> ! <tr> ! <td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td> ! <td valign="middle" align="left"><?php echo "$search_box"; ?></td> </tr> + <?php } ?> </table> </td> </tr> + <tr> + <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> + </tr> </table> <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> ! <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 "$tomorrows_lang"; ?></font></td> ! <td align="right" valign="top" width="1%" class="sideback"></td> ! </tr> ! <tr> ! <td colspan="3" 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 = ''; ! echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><i>$event_text</i></a><br>\n"; ! } else { ! echo "<a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name2', '$event_start', '$event_end', '$description')\"><font class=\"G10B\">• $event_text</font></a><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> <br> <?php } ! if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?> ! ! <table width="170" border="0" cellpadding="0" cellspacing="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 echo "$todo_lang"; ?></font></td> ! <td align="right" valign="top" width="1%" class="sideback"></td> ! </tr> ! <tr> ! <td colspan="3" 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 = $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> + <br> <?php } |
From: <cl...@us...> - 2003-09-14 20:01:01
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv11775/includes Modified Files: sidebar.php Log Message: Reduced HTML footprint of sidebar. Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** sidebar.php 13 Aug 2003 06:04:38 -0000 1.11 --- sidebar.php 14 Sep 2003 20:00:57 -0000 1.12 *************** *** 212,216 **** $vtodo_text = stripslashes(urldecode($val["vtodo_text"])); if ($vtodo_text != "") { ! if (isset($val["description"])) $description = $val["description"]; $completed_date = $val['completed_date']; $status = $val["status"]; --- 212,220 ---- $vtodo_text = stripslashes(urldecode($val["vtodo_text"])); if ($vtodo_text != "") { ! if (isset($val["description"])) { ! $description = $val["description"]; ! } else { ! $description = ""; ! } $completed_date = $val['completed_date']; $status = $val["status"]; *************** *** 267,507 **** $fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15'); ?> - <table cellpadding="0" cellspacing="0" border="0" width="170"> - <tr> - <td valign="middle" align="center"> - <table width="170" border="0" cellpadding="0" cellspacing="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" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("-1 month", $fake_getdate_time))); ?></font></td> ! <td align="right" valign="top" width="1" class="sideback"></td> ! </tr> ! <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="center"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"> ! <tr> ! <td><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! </tr> ! <tr> ! <?php ! $start_day = strtotime($week_start_day); ! for ($i=0; $i<7; $i++) { ! $day_num = date("w", $start_day); ! $day = $daysofweekreallyshort_lang[$day_num]; ! print "<td align=\"center\" class=\"G10BOLD\">$day</td>\n"; ! $start_day = strtotime("+1 day", $start_day); ! } ! ?> ! </tr> ! <tr> ! <td colspan="7" height="3"><img src="images/spacer.gif" width="1" height="3" alt=" "></td> ! </tr> ! <?php ! $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 align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"ps2\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! } else { ! echo "<td align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"psf\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! } ! $start_day = strtotime("+1 day", $start_day); ! $i++; ! if ($i == 7) { ! echo "</tr>\n"; ! $i = 0; ! $checkagain = date ("m", $start_day); ! if ($checkagain != $minical_month) $whole_month = FALSE; ! } ! } while ($whole_month == TRUE); ! ?> ! </table> ! </td> ! </tr> ! <tr> ! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> ! </tr> </table> </td> </tr> </table> <br> ! <table cellpadding="0" cellspacing="0" border="0" width="170"> <tr> ! <td valign="middle" align="center"> ! <table width="170" border="0" cellpadding="0" cellspacing="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" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime($getdate))); ?></font></td> ! <td align="right" valign="top" width="1" class="sideback"></td> ! </tr> ! <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="center"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"> ! <tr> ! <td><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! </tr> ! <tr> ! <?php ! $start_day = strtotime($week_start_day); ! for ($i=0; $i<7; $i++) { ! $day_num = date("w", $start_day); ! $day = $daysofweekreallyshort_lang[$day_num]; ! print "<td align=\"center\" class=\"G10BOLD\">$day</td>\n"; ! $start_day = strtotime("+1 day", $start_day); ! } ! ?> ! </tr> ! <tr> ! <td colspan="7" height="3"><img src="images/spacer.gif" width="1" height="3" alt=" "></td> ! </tr> ! <?php ! $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 align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"ps2\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! } else { ! echo "<td align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"psf\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! } ! $start_day = strtotime("+1 day", $start_day); ! $i++; ! if ($i == 7) { ! echo "</tr>\n"; ! $i = 0; ! $checkagain = date ("m", $start_day); ! if ($checkagain != $minical_month) $whole_month = FALSE; ! } ! } while ($whole_month == TRUE); ! ?> ! </table> ! </td> ! </tr> ! <tr> ! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> ! </tr> </table> </td> </tr> </table> <br> ! <table cellpadding="0" cellspacing="0" border="0" width="170"> <tr> ! <td valign="middle" align="center"> ! <table width="170" border="0" cellpadding="0" cellspacing="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" class="sideback"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("+1 month", strtotime($getdate)))); ?></font></td> ! <td align="right" valign="top" width="1" class="sideback"></td> ! </tr> ! <tr> ! <td colspan="3" bgcolor="#FFFFFF" align="center"> ! <table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF"> ! <tr> ! <td><img src="images/spacer.gif" width="21" height="3" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! <td><img src="images/spacer.gif" width="21" height="1" alt=" "></td> ! </tr> ! <tr> ! <?php ! $start_day = strtotime($week_start_day); ! for ($i=0; $i<7; $i++) { ! $day_num = date("w", $start_day); ! $day = $daysofweekreallyshort_lang[$day_num]; ! print "<td align=\"center\" class=\"G10BOLD\">$day</td>\n"; ! $start_day = strtotime("+1 day", $start_day); ! } ! ?> ! </tr> ! <tr> ! <td colspan="7" height="3"><img src="images/spacer.gif" width="1" height="3" alt=" "></td> ! </tr> ! <?php ! $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 align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"ps2\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! } else { ! echo "<td align=\"center\" class=\"G10B\">\n"; ! echo "<a class=\"psf\" href=\"$minical_view.php?cal=$cal&getdate=$daylink\">$day</a>\n"; ! echo "</td>\n"; ! } ! $start_day = strtotime("+1 day", $start_day); ! $i++; ! if ($i == 7) { ! echo "</tr>\n"; ! $i = 0; ! $checkagain = date ("m", $start_day); ! if ($checkagain != $minical_month) $whole_month = FALSE; ! } ! } while ($whole_month == TRUE); ! ?> ! </table> ! </td> ! </tr> ! <tr> ! <td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td> ! </tr> </table> </td> </tr> --- 271,436 ---- $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); ! } ! $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> <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); ! } ! $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> <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); ! } ! $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> |
From: <cl...@us...> - 2003-09-14 18:31:18
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv21366/includes Modified Files: event.php todo.php Log Message: Fixed SF Bug #795098 Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** event.php 13 Aug 2003 05:37:36 -0000 1.8 --- event.php 14 Sep 2003 18:31:14 -0000 1.9 *************** *** 90,94 **** <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 --- 90,94 ---- <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 *************** *** 103,107 **** </tr> <tr> ! <td colspan="3"><img src="images/spacer.gif" width="1" height="6" alt=" "></td> </tr> <tr> --- 103,107 ---- </tr> <tr> ! <td colspan="3"><img src="../images/spacer.gif" width="1" height="6" alt=" "></td> </tr> <tr> *************** *** 113,117 **** ?> <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> --- 113,117 ---- ?> <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> *************** *** 119,123 **** <?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:]/]", --- 119,123 ---- <?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:]/]", Index: todo.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** todo.php 30 Jun 2003 22:37:52 -0000 1.8 --- todo.php 14 Sep 2003 18:31:14 -0000 1.9 *************** *** 80,89 **** <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 echo "$calendar_name $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> --- 80,89 ---- <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 echo "$calendar_name $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> *************** *** 91,95 **** <table width="100%" 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 ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text).'<br /><br />'; ?></td> </tr> --- 91,95 ---- <table width="100%" 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 ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text).'<br /><br />'; ?></td> </tr> *************** *** 97,101 **** <?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> --- 97,101 ---- <?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> |