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: <jo...@us...> - 2003-09-20 00:35:28
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv20701 Modified Files: list_years.php Log Message: Patch [793606] list_years.php Behavior Incorrect. Correctly displays years for all $num_years values. Index: list_years.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_years.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** list_years.php 16 Sep 2003 05:38:34 -0000 1.4 --- list_years.php 20 Sep 2003 00:35:25 -0000 1.5 *************** *** 1,31 **** <?php ! $year_time = strtotime("$getdate"); ! $getdate_year = date("Y", strtotime($getdate)); ! $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++) { ! $year_time2 = strtotime ("-$num_years2 year", $year_time); ! $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--; } ! $year_time = strtotime("$this_year-01-01"); ! $getdate_year = date("Y", strtotime($getdate)); ! for ($i=0; $i < ($num_years +1); $i++) { ! $year_year = date ("Y", $year_time); ! $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); } // finish <select> print "</select>"; ! ?> \ No newline at end of file --- 1,31 ---- <?php ! $year_time = strtotime($getdate); ! print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n"; ! ! // Print the previous year options. ! for ($i=0; $i < $num_years; $i++) { ! $offset = $num_years - $i; ! $prev_time = strtotime("-$offset year", $year_time); ! $prev_date = date("Ymd", $prev_time); ! $prev_year = date("Y", $prev_time); ! print "<option value=\"year.php?cal=$cal&getdate=$prev_date\">$prev_year</option>\n"; } ! ! // Print the current year option. ! $getdate_date = date("Ymd", $year_time); ! $getdate_year = date("Y", $year_time); ! print "<option value=\"year.php?cal=$cal&getdate=$getdate_date\" selected>$getdate_year</option>\n"; ! ! // Print the next year options. ! for ($i=0; $i < $num_years; $i++) { ! $offset = $i + 1; ! $next_time = strtotime("+$offset year", $year_time); ! $next_date = date("Ymd", $next_time); ! $next_year = date("Y", $next_time); ! print "<option value=\"year.php?cal=$cal&getdate=$next_date\">$next_year</option>\n"; } // finish <select> print "</select>"; ! ?> |
From: <jo...@us...> - 2003-09-20 00:31:40
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv20217/functions Modified Files: ical_parser.php Log Message: Bug [788401] and patch [794859]. Correctly display VTODO descriptions and populate VTODO description values. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** ical_parser.php 20 Sep 2003 00:16:05 -0000 1.104 --- ical_parser.php 20 Sep 2003 00:31:36 -0000 1.105 *************** *** 591,596 **** $vtodo_sort = $vtodo_priority; } ! $master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories); ! unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary); $vtodo_set = FALSE; } elseif ($line == 'BEGIN:VTODO') { --- 591,596 ---- $vtodo_sort = $vtodo_priority; } ! $master_array['-2']["$vtodo_sort"]["$uid"] = array ('start_date' => $start_date, 'start_time' => $start_time, 'vtodo_text' => $summary, 'due_date'=> $due_date, 'due_time'=> $due_time, 'completed_date' => $completed_date, 'completed_time' => $completed_time, 'priority' => $vtodo_priority, 'status' => $status, 'class' => $class, 'categories' => $vtodo_categories, 'description' => $description); ! unset ($start_date, $start_time, $due_date, $due_time, $completed_date, $completed_time, $vtodo_priority, $status, $class, $vtodo_categories, $summary, $description); $vtodo_set = FALSE; } elseif ($line == 'BEGIN:VTODO') { |
From: <jo...@us...> - 2003-09-20 00:31:40
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv20217/includes Modified Files: sidebar.php Log Message: Bug [788401] and patch [794859]. Correctly display VTODO descriptions and populate VTODO description values. Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** sidebar.php 20 Sep 2003 00:16:05 -0000 1.18 --- sidebar.php 20 Sep 2003 00:31:36 -0000 1.19 *************** *** 160,164 **** if ($vtodo_text != "") { if (isset($val["description"])) { ! $description = $val["description"]; } else { $description = ""; --- 160,164 ---- if ($vtodo_text != "") { if (isset($val["description"])) { ! $description = urldecode($val["description"]); } else { $description = ""; |
From: <jo...@us...> - 2003-09-20 00:18:02
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv18192 Modified Files: day.php preferences.php week.php Log Message: Forgot to commit change of references to all_calenders_combined971 to $ALL_CALENDARS_COMBINED for these files. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** day.php 18 Sep 2003 00:49:03 -0000 1.96 --- day.php 20 Sep 2003 00:17:58 -0000 1.97 *************** *** 251,256 **** echo '<tr>'."\n"; echo '<td class="eventbg_'.$event_calno.'">'; ! // Todo: keep track of where the event comes from, and indicate that to openevent instead of "all_calenders_combined971" ! if ($cal == 'all_calenders_combined971') $calendar_name2=$cal; else $calendar_name2=$calendar_name; openevent("$calendar_name2", "$event_start", --- 251,256 ---- echo '<tr>'."\n"; echo '<td class="eventbg_'.$event_calno.'">'; ! // Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED ! if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name; openevent("$calendar_name2", "$event_start", Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** preferences.php 17 Sep 2003 05:18:23 -0000 1.31 --- preferences.php 20 Sep 2003 00:17:58 -0000 1.32 *************** *** 179,186 **** // add option to open all (non-web) calenders together // Todo: add $all_calenders_combined_lang (plural) in the language-specific files and use it here ! if ($cookie_calendar == 'all_calenders_combined971') { ! print "<option value=\"all_calenders_combined971\" selected>$all_cal_comb_lang</option>\n"; } else { ! print "<option value=\"all_calenders_combined971\">$all_cal_comb_lang</option>\n"; } --- 179,186 ---- // add option to open all (non-web) calenders together // Todo: add $all_calenders_combined_lang (plural) in the language-specific files and use it here ! if ($cookie_calendar == $ALL_CALENDARS_COMBINED) { ! print "<option value=\"$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>\n"; } else { ! print "<option value=\"$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>\n"; } Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** week.php 18 Sep 2003 00:49:03 -0000 1.97 --- week.php 20 Sep 2003 00:17:59 -0000 1.98 *************** *** 305,310 **** $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; $event_end = date ($timeFormat, $event_end); ! // Todo: keep track of where the event comes from, and indicate that to openevent instead of "all_calenders_combined971" ! if ($cal == 'all_calenders_combined971') $calendar_name2=$cal; else $calendar_name2=$calendar_name; openevent("$calendar_name2", "$event_start", --- 305,310 ---- $event_end = $this_time_arr[($event_length[$thisday][$i]["key"])]["end_unixtime"]; $event_end = date ($timeFormat, $event_end); ! // Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED ! if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name; openevent("$calendar_name2", "$event_start", |
From: <jo...@us...> - 2003-09-20 00:16:09
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv17823/includes Modified Files: calendar_nav.php event.php sidebar.php Log Message: Set magic string $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'. All previous references to 'all_calendars_combined971' now point at $ALL_CALENDARS_COMBINED. Uncommented closing form tag on sidebar.php, and set correct spacing for the entire sidebar. Index: calendar_nav.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** calendar_nav.php 16 Sep 2003 05:38:34 -0000 1.8 --- calendar_nav.php 20 Sep 2003 00:16:05 -0000 1.9 *************** *** 1,5 **** <?php ! if ($cal == 'all_calenders_combined971') { $cal_displayname2 = $all_cal_comb_lang; } else { --- 1,5 ---- <?php ! if ($cal == $ALL_CALENDARS_COMBINED) { $cal_displayname2 = $all_cal_comb_lang; } else { *************** *** 140,144 **** 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> --- 140,144 ---- echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$getdate&printview=$current_view\">$goprint_lang</a><br>\n"; if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n"; ! if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n"; ?> </td> Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** event.php 14 Sep 2003 18:31:14 -0000 1.9 --- event.php 20 Sep 2003 00:16:05 -0000 1.10 *************** *** 80,84 **** <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title><?php ! if ($calendar_name == 'all_calenders_combined971') { echo "$all_cal_comb_lang"; } else { --- 80,84 ---- <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title><?php ! if ($calendar_name == $ALL_CALENDARS_COMBINED) { echo "$all_cal_comb_lang"; } else { *************** *** 93,97 **** <td align="center" width="98%" class="sideback"><font class="G10BOLD"> <?php ! if ($calendar_name == 'all_calenders_combined971') { echo "$all_cal_comb_lang"; } else { --- 93,97 ---- <td align="center" width="98%" class="sideback"><font class="G10BOLD"> <?php ! if ($calendar_name == $ALL_CALENDARS_COMBINED) { echo "$all_cal_comb_lang"; } else { Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** sidebar.php 16 Sep 2003 06:47:50 -0000 1.17 --- sidebar.php 20 Sep 2003 00:16:05 -0000 1.18 *************** *** 4,8 **** $really_today_today = date ('Ymd', $really_unix_time); ! if ($cal == 'all_calenders_combined971') { $cal_displayname2 = $all_cal_comb_lang; } else { --- 4,8 ---- $really_today_today = date ('Ymd', $really_unix_time); ! if ($cal == $ALL_CALENDARS_COMBINED) { $cal_displayname2 = $all_cal_comb_lang; } else { *************** *** 17,21 **** ?> ! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> --- 17,21 ---- ?> ! <form action="" method="GET"> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr> *************** *** 36,40 **** 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"; echo '</span></div>'; ?> --- 36,40 ---- echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$getdate&printview=$current_view\">$goprint_lang</a><br>\n"; if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n"; ! if ($cal != $ALL_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n"; echo '</span></div>'; ?> *************** *** 42,46 **** </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> --- 42,47 ---- </tr> </table> ! </form> ! <form action="day.php" method="GET"> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> *************** *** 52,61 **** echo '<div style="padding: 5px;">'; ! 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; --- 53,61 ---- echo '<div style="padding: 5px;">'; ! echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">"; include('./functions/list_icals.php'); include('./functions/list_years.php'); include('./functions/list_months.php'); include('./functions/list_weeks.php'); if ($show_search == 'yes') { echo $search_box; *************** *** 73,80 **** </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?> ! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> --- 73,80 ---- </tr> </table> ! </form> <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?> ! <form action="" method="GET"> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> *************** *** 134,142 **** </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <?php } if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?> ! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> --- 134,142 ---- </tr> </table> ! </form> <?php } if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?> ! <form action="" method="GET"> <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> *************** *** 211,220 **** </tr> </table> ! ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <?php } $fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15'); ?> ! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> --- 211,219 ---- </tr> </table> ! </form> <?php } $fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15'); ?> ! <form action="" method="GET"> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> *************** *** 271,275 **** </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> --- 270,275 ---- </tr> </table> ! </form> ! <form action="" method="GET"> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> *************** *** 326,330 **** </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> --- 326,331 ---- </tr> </table> ! </form> ! <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> |
From: <jo...@us...> - 2003-09-20 00:16:09
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv17823 Modified Files: config.inc.php Log Message: Set magic string $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'. All previous references to 'all_calendars_combined971' now point at $ALL_CALENDARS_COMBINED. Uncommented closing form tag on sidebar.php, and set correct spacing for the entire sidebar. Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** config.inc.php 20 Sep 2003 00:07:08 -0000 1.110 --- config.inc.php 20 Sep 2003 00:16:05 -0000 1.111 *************** *** 20,26 **** $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $timezone = ''; // Set timezone. Read TIMEZONES file for more information ! $default_path = 'http://www.wesman.net/~wesley/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X) ! $calendar_path = '/home/wesley/Library/Calendars'; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. --- 20,26 ---- $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $timezone = ''; // Set timezone. Read TIMEZONES file for more information ! $default_path = 'http://www.example.com/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X) ! $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. *************** *** 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. *************** *** 44,48 **** $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). $show_todos = 'yes'; // Show your todo list on the side of day and week view. ! $show_completed = 'no'; // Show completed todos on your todo list. // Administration settings --- 44,48 ---- $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). $show_todos = 'yes'; // Show your todo list on the side of day and week view. ! $show_completed = 'yes'; // Show completed todos on your todo list. // Administration settings |
From: <jo...@us...> - 2003-09-20 00:16:09
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv17823/functions Modified Files: ical_parser.php init.inc.php list_icals.php Log Message: Set magic string $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'. All previous references to 'all_calendars_combined971' now point at $ALL_CALENDARS_COMBINED. Uncommented closing form tag on sidebar.php, and set correct spacing for the entire sidebar. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** ical_parser.php 19 Sep 2003 20:36:58 -0000 1.103 --- ical_parser.php 20 Sep 2003 00:16:05 -0000 1.104 *************** *** 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; --- 32,36 ---- // reading the file if it's allowed $parse_file = true; ! if (($is_webcal == false) && ($save_parsed_cals == 'yes') && ($cal != $ALL_CALENDARS_COMBINED)) { $realcal_mtime = filemtime($filename); $parsedcal = $tmp_dir.'/parsedcal-'.$cal_filename.'-'.$this_year; *************** *** 968,972 **** // 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'); --- 968,972 ---- // 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_CALENDARS_COMBINED) { $write_me = serialize($master_array); $fd = fopen($parsedcal, 'w'); *************** *** 990,994 **** // Set a calender name for all calenders combined ! if ($cal == 'all_calenders_combined971') { $calendar_name = $all_cal_comb_lang; } --- 990,994 ---- // Set a calender name for all calenders combined ! if ($cal == $ALL_CALENDARS_COMBINED) { $calendar_name = $all_cal_comb_lang; } Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** init.inc.php 15 Sep 2003 03:18:24 -0000 1.36 --- init.inc.php 20 Sep 2003 00:16:05 -0000 1.37 *************** *** 9,12 **** --- 9,13 ---- //error_reporting (E_ALL); + $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; if (!defined('BASE')) define('BASE', './'); include(BASE.'config.inc.php'); *************** *** 55,59 **** } else { if (isset($default_cal_check)) { ! if ($default_cal_check != 'all_calenders_combined971') { $calcheck = $calendar_path.'/'.$default_cal_check.'.ics'; $calcheckopen = @fopen($calcheck, "r"); --- 56,60 ---- } else { if (isset($default_cal_check)) { ! if ($default_cal_check != $ALL_CALENDARS_COMBINED) { $calcheck = $calendar_path.'/'.$default_cal_check.'.ics'; $calcheckopen = @fopen($calcheck, "r"); *************** *** 64,68 **** } } else { ! $cal_filename = 'all_calenders_combined971'; } } else { --- 65,69 ---- } } else { ! $cal_filename = $ALL_CALENDARS_COMBINED; } } else { *************** *** 99,103 **** // empty the filelist array $cal_filelist = array(); ! if ($cal == 'all_calenders_combined971') { // Create an array with the paths to all files to be combined // Note: code here is similar to code in list_icals.php // open directory --- 100,104 ---- // empty the filelist array $cal_filelist = array(); ! if ($cal == $ALL_CALENDARS_COMBINED) { // Create an array with the paths to all files to be combined // Note: code here is similar to code in list_icals.php // open directory Index: list_icals.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** list_icals.php 16 Sep 2003 05:38:34 -0000 1.15 --- list_icals.php 20 Sep 2003 00:16:05 -0000 1.16 *************** *** 39,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>"; } --- 39,46 ---- // option to open all (non-web) calenders together ! if ($cal == $ALL_CALENDARS_COMBINED) { ! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED\" selected>$all_cal_comb_lang</option>"; } else { ! print "<option value=\"$current_view.php?cal=$ALL_CALENDARS_COMBINED\">$all_cal_comb_lang</option>"; } |
From: <jo...@us...> - 2003-09-20 00:07:13
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv16506 Modified Files: config.inc.php Log Message: *** empty log message *** Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.109 retrieving revision 1.110 diff -C2 -d -r1.109 -r1.110 *** config.inc.php 17 Sep 2003 05:18:23 -0000 1.109 --- config.inc.php 20 Sep 2003 00:07:08 -0000 1.110 *************** *** 9,13 **** $default_view = 'day'; // Default view for calendars = 'day', 'week', 'month', 'year' $minical_view = 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current' ! $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 --- 9,13 ---- $default_view = 'day'; // Default view for calendars = 'day', 'week', 'month', 'year' $minical_view = 'current'; // Where do the mini-calendars go when clicked? = 'day', 'week', 'month', 'current' ! $default_cal = $ALL_CALENDARS_COMBINED; // Exact filename of calendar without .ics. Or set to $ALL_CALENDARS_COMBINED 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 *************** *** 20,26 **** $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $timezone = ''; // Set timezone. Read TIMEZONES file for more information ! $default_path = 'http://www.example.com/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X) ! $calendar_path = ''; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. --- 20,26 ---- $week_events_lines = '1'; // Number of lines to wrap each event title in the 'Tommorrow's events' box, 0 means display all lines. $timezone = ''; // Set timezone. Read TIMEZONES file for more information ! $default_path = 'http://www.wesman.net/~wesley/phpicalendar'; // The HTTP URL to the PHP iCalendar directory, ie. http://www.example.com/phpicalendar $tmp_dir = '/tmp'; // The temporary directory on your system (/tmp is fine for UNIXes including Mac OS X) ! $calendar_path = '/home/wesley/Library/Calendars'; // Leave this blank on most installs, place your full path to calendars if they are outside the phpicalendar folder. $second_offset = '0'; // The time in seconds between your time and your server's time. *************** *** 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. *************** *** 44,48 **** $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). $show_todos = 'yes'; // Show your todo list on the side of day and week view. ! $show_completed = 'yes'; // Show completed todos on your todo list. // Administration settings --- 44,48 ---- $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). $show_todos = 'yes'; // Show your todo list on the side of day and week view. ! $show_completed = 'no'; // Show completed todos on your todo list. // Administration settings *************** *** 73,75 **** $color_cals[] = 'tan'; // // add more lines as necessary ! ?> \ No newline at end of file --- 73,75 ---- $color_cals[] = 'tan'; // // add more lines as necessary ! ?> |
From: <cl...@us...> - 2003-09-19 21:21:24
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv21013 Modified Files: month.php Log Message: Fixed month display bugs, cleaned up HTML on bottom month table, added new data to calendar for debugging. Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** month.php 17 Sep 2003 05:18:23 -0000 1.97 --- month.php 19 Sep 2003 21:21:19 -0000 1.98 *************** *** 7,44 **** ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); ! $this_day = $day_array2[3]; ! $this_month = $day_array2[2]; ! $this_year = $day_array2[1]; ! $unix_time = strtotime($getdate); ! $today_today = date('Ymd', strtotime("now + $second_offset seconds")); ! $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); ! $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); ! $date = mktime(0,0,0,"$this_month","$this_day","$this_year"); // find out next month ! $next_month_month = ($this_month+1 == '13') ? '1' : ($this_month+1); ! $next_month_day = $this_day; ! $next_month_year = ($next_month_month == '1') ? ($this_year+1) : $this_year; while (!checkdate($next_month_month,$next_month_day,$next_month_year)) $next_month_day--; ! $next_month_time = mktime(0,0,0,$next_month_month,$next_month_day,$next_month_year); // find out last month ! $prev_month_month = ($this_month-1 == '0') ? '12' : ($this_month-1); ! $prev_month_day = $this_day; ! $prev_month_year = ($prev_month_month == '12') ? ($this_year-1) : $this_year; while (!checkdate($prev_month_month,$prev_month_day,$prev_month_year)) $prev_month_day--; ! $prev_month_time = mktime(0,0,0,$prev_month_month,$prev_month_day,$prev_month_year); ! ! ! $next_month = date("Ymd", $next_month_time); ! $prev_month = date("Ymd", $prev_month_time); ! $display_date = localizeDate ($dateFormat_month, $date); ! $parse_month = date ("Ym", $date); ! $first_of_month = $this_year.$this_month."01"; ! $start_month_day = dateOfWeek($first_of_month, $week_start_day); ! $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ! $num_of_events = 0; include (BASE.'includes/header.inc.php'); --- 7,41 ---- ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); ! $this_day = $day_array2[3]; ! $this_month = $day_array2[2]; ! $this_year = $day_array2[1]; ! $unix_time = strtotime($getdate); ! $today_today = date('Ymd', strtotime("now + $second_offset seconds")); ! $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); ! $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); // find out next month ! $next_month_month = ($this_month+1 == '13') ? '1' : ($this_month+1); ! $next_month_day = $this_day; ! $next_month_year = ($next_month_month == '1') ? ($this_year+1) : $this_year; while (!checkdate($next_month_month,$next_month_day,$next_month_year)) $next_month_day--; ! $next_month_time = mktime(0,0,0,$next_month_month,$next_month_day,$next_month_year); // find out last month ! $prev_month_month = ($this_month-1 == '0') ? '12' : ($this_month-1); ! $prev_month_day = $this_day; ! $prev_month_year = ($prev_month_month == '12') ? ($this_year-1) : $this_year; while (!checkdate($prev_month_month,$prev_month_day,$prev_month_year)) $prev_month_day--; ! $prev_month_time = mktime(0,0,0,$prev_month_month,$prev_month_day,$prev_month_year); ! $next_month = date("Ymd", $next_month_time); ! $prev_month = date("Ymd", $prev_month_time); ! $display_date = localizeDate ($dateFormat_month, $unix_time); ! $parse_month = date ("Ym", $unix_time); ! $first_of_month = $this_year.$this_month."01"; ! $start_month_day = dateOfWeek($first_of_month, $week_start_day); ! $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ! $num_of_events2 = 0; include (BASE.'includes/header.inc.php'); *************** *** 56,60 **** <tr> <td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$prev_month\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$last_month_lang]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_month; ?></font></td> <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$next_month\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$next_month_lang]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> --- 53,57 ---- <tr> <td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$prev_month\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$last_month_lang]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td> <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$next_month\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$next_month_lang]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> *************** *** 95,99 **** $i = 0; $whole_month = TRUE; - $num_of_events = 0; do { $day = date ("j", $sunday); --- 92,95 ---- *************** *** 118,129 **** 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, 15, ! "<div align=\"center\" class=\"V10\"><i>", ! "</i></div>", "psf"); } else { $event_start = @$val["event_start"]; $event_end = @$val["event_end"]; --- 114,128 ---- foreach ($master_array[("$daylink")] as $event_times) { foreach ($event_times as $val) { ! $num_of_events2++; if (!isset($val["event_start"])) { ! echo '<div align="center" class="V10">'; ! openevent("$calendar_name", "", "", $val, $month_event_lines, 15, ! "<i>", ! "</i>", "psf"); + echo '</div>'; } else { + echo '<div align="left" class="V9"> '; $event_start = @$val["event_start"]; $event_end = @$val["event_end"]; *************** *** 137,143 **** $month_event_lines, 11, ! "<div align=\"left\" class=\"V9\"> $start2 ", ! "</div>", "ps3"); } } --- 136,143 ---- $month_event_lines, 11, ! "$start2 ", ! "", "ps3"); + echo '</div>'; } } *************** *** 165,183 **** </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"> ! <tr> ! <td align="center" valign="top"> ! <table width="100%" border="0" cellspacing="0" cellpadding="0"> ! <tr> ! <td align="left" valign="top" width="160" class="sideback"><?php echo "<img src=\"images/spacer.gif\" alt=\" \" width=\"16\" height=\"20\" border=\"0\" align=\"left\">"; ?></td> ! <td align="center" class="sideback" width="417" nowrap><font class="G10BOLD"><?php echo "$this_months_lang"; ?></font></td> ! <td align="right" valign="top" width="160" class="sideback"><?php echo "<img src=\"images/spacer.gif\" alt=\" \" width=\"16\" height=\"20\" border=\"0\" align=\"right\">"; ?></td> ! </tr> <tr> ! <td colspan="3" height="1"></td> </tr> <?php // Iterate the entire master array foreach($master_array as $key => $val) { --- 165,176 ---- </table> <?php include (BASE.'includes/calendar_nav.php'); ?> ! <?php if (($this_months_events == "yes") && ($num_of_events2 > 0)) { ?> <br> ! <table width="737" border="0" cellspacing="0" cellpadding="3" class="calborder"> <tr> ! <td colspan="3" align="center" class="sideback" nowrap><div style="height: 16px;" class="G10BOLD"><?php echo "$this_months_lang"; ?></div></td> </tr> <?php + $first_time = TRUE; // Iterate the entire master array foreach($master_array as $key => $val) { *************** *** 190,196 **** $i = 0; if ($today_today == $key) { ! $fontclass="class=\"G10BOLD\""; } else { ! $fontclass="class=\"G10B\""; } --- 183,189 ---- $i = 0; if ($today_today == $key) { ! $fontclass="G10BOLD"; } else { ! $fontclass="G10B"; } *************** *** 213,219 **** } ! echo "<tr>\n"; ! echo "<td align=\"left\" valign=\"top\" width =\"160\" class=\"montheventline\" nowrap><font $fontclass> <a class=\"psf\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a></font> <font class=\"V9G\">($event_start)</font></td>\n"; ! echo "<td align=\"left\" valign=\"top\" colspan=\"2\">\n"; openevent("$calendar_name", "$event_start", --- 206,216 ---- } ! echo "<tr align=\"left\" valign=\"top\">\n"; ! echo "<td width =\"155\" class=\"$fontclass\" nowrap><a class=\"psf\" href=\"day.php?cal=$cal&getdate=$key\">$dayofmonth</a> <font class=\"V9G\">($event_start)</font></td>\n"; ! if ($first_time == TRUE) { ! echo "<td width=\"5\" class=\"montheventline\" rowspan=\"$num_of_events2\"></td>"; ! $first_time = FALSE; ! } ! echo "<td>\n"; openevent("$calendar_name", "$event_start", *************** *** 222,229 **** 0, 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"; echo "</tr>\n"; --- 219,225 ---- 0, 65, ! "<font class=\"G10B\">", "</font>", "psf"); echo "</td>\n"; echo "</tr>\n"; *************** *** 236,243 **** ?> ! </table> ! </td> ! </tr> ! </table> <?php } ?> <?php include (BASE.'includes/footer.inc.php'); ?> --- 232,236 ---- ?> ! </table> <?php } ?> <?php include (BASE.'includes/footer.inc.php'); ?> |
From: <cl...@us...> - 2003-09-19 21:21:24
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1:/tmp/cvs-serv21013/calendars Modified Files: Home.ics Log Message: Fixed month display bugs, cleaned up HTML on bottom month table, added new data to calendar for debugging. Index: Home.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/Home.ics,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Home.ics 15 Sep 2003 06:28:50 -0000 1.9 --- Home.ics 19 Sep 2003 21:21:19 -0000 1.10 *************** *** 166,170 **** RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1MO END:VEVENT ! END:VCALENDAR --- 166,183 ---- RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=1MO END:VEVENT ! BEGIN:VEVENT ! UID:200...@lb... ! DTSTAMP:20030425T113850Z ! DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/America/Chicago: ! 20030515T183000 ! DTEND;TZID=/softwarestudio.org/Olson_20011030_5/America/Chicago: ! 20030515T210000 ! SUMMARY:Meeting ! SEQUENCE:4 ! LAST-MODIFIED:20030425T023611Z ! CLASS:PUBLIC ! TRANSP:OPAQUE ! RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TH;BYSETPOS=3 ! END:VEVENT END:VCALENDAR |
From: <cl...@us...> - 2003-09-19 21:21:24
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv21013/includes Modified Files: footer.inc.php Log Message: Fixed month display bugs, cleaned up HTML on bottom month table, added new data to calendar for debugging. Index: footer.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/footer.inc.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** footer.inc.php 13 Aug 2003 06:04:37 -0000 1.7 --- footer.inc.php 19 Sep 2003 21:21:20 -0000 1.8 *************** *** 1,5 **** <?php ! echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.3</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; --- 1,5 ---- <?php ! echo "<center><font class=\"V9\"><br>$powered_by_lang <a class=\"psf\" href=\"http://phpicalendar.sourceforge.net/nuke/\">PHP iCalendar 0.9.4</a>"; if ($enable_rss == 'yes') { echo "<br>\n"; |
From: <cl...@us...> - 2003-09-19 20:37:23
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv12046/functions Modified Files: ical_parser.php Log Message: Workaround for timezones created in Evolution. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** ical_parser.php 18 Sep 2003 00:32:19 -0000 1.102 --- ical_parser.php 19 Sep 2003 20:36:58 -0000 1.103 *************** *** 617,620 **** --- 617,621 ---- // case 'DUE': + $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; *************** *** 663,666 **** --- 664,668 ---- case 'COMPLETED': + $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; *************** *** 730,733 **** --- 732,736 ---- case 'DTSTART': + $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; *************** *** 777,780 **** --- 780,784 ---- case 'DTEND'; + $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); $zulu_time = false; if (substr($data,-1) == 'Z') $zulu_time = true; |
From: <jo...@us...> - 2003-09-18 00:49:17
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv27979 Modified Files: day.php week.php Log Message: Feature Request [795115] Graphical Event Status Events which have one of the RFC defined status values of confirmed, tentative, or cancelled will display a small icon in the upper-right corner of the event block shown on the calendar. Only applies to non-all-day events on the day and week views. Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** day.php 17 Sep 2003 05:18:23 -0000 1.95 --- day.php 18 Sep 2003 00:49:03 -0000 1.96 *************** *** 233,236 **** --- 233,237 ---- $event_end = date ($timeFormat, $event_end); $event_calno = $this_time_arr[($event_length[$i]['key'])]['calnumber']; + $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']); if ($event_calno < 1) $event_calno=1; if ($event_calno > 7) $event_calno=7; *************** *** 240,246 **** echo '<tr>'."\n"; echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n"; echo '</tr>'."\n"; echo '<tr>'."\n"; ! echo '<td>'."\n"; echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n"; echo '<tr>'."\n"; --- 241,251 ---- echo '<tr>'."\n"; echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n"; + echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">'; + if ($event_status == '') echo ' '; + else echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">'; + echo '</font></td>'."\n"; echo '</tr>'."\n"; echo '<tr>'."\n"; ! echo '<td colspan="2">'."\n"; echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n"; echo '<tr>'."\n"; Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** week.php 17 Sep 2003 05:18:23 -0000 1.96 --- week.php 18 Sep 2003 00:49:03 -0000 1.97 *************** *** 286,289 **** --- 286,290 ---- $event_start = date ($timeFormat, $event_start); $event_calno = $this_time_arr[($event_length[$thisday][$i]['key'])]['calnumber']; + $event_status = strtolower($this_time_arr[($event_length[$thisday][$i]['key'])]['status']); if ($event_calno < 1) $event_calno=1; if ($event_calno > 7) $event_calno=7; *************** *** 292,298 **** echo "<tr>\n"; echo "<td class=\"eventborder\"><font class=\"V10WB\"><b>$event_start</b></font></td>\n"; echo "</tr>\n"; echo "<tr>\n"; ! echo "<td>\n"; echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n"; echo "<tr>\n"; --- 293,303 ---- echo "<tr>\n"; echo "<td class=\"eventborder\"><font class=\"V10WB\"><b>$event_start</b></font></td>\n"; + echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">'; + if ($event_status == '') echo ' '; + else echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">'; + echo "</font></td>\n"; echo "</tr>\n"; echo "<tr>\n"; ! echo "<td colspan=\"2\">\n"; echo "<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"0\">\n"; echo "<tr>\n"; |
From: <jo...@us...> - 2003-09-18 00:49:14
|
Update of /cvsroot/phpicalendar/phpicalendar/images In directory sc8-pr-cvs1:/tmp/cvs-serv27979/images Added Files: cancelled.gif confirmed.gif tentative.gif Log Message: Feature Request [795115] Graphical Event Status Events which have one of the RFC defined status values of confirmed, tentative, or cancelled will display a small icon in the upper-right corner of the event block shown on the calendar. Only applies to non-all-day events on the day and week views. --- NEW FILE: cancelled.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: confirmed.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tentative.gif --- (This appears to be a binary file; contents omitted.) |
From: <jo...@us...> - 2003-09-18 00:32:24
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv25272 Modified Files: ical_parser.php Log Message: Removed leftover debugging output for YEARLY events. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** ical_parser.php 17 Sep 2003 20:38:12 -0000 1.101 --- ical_parser.php 18 Sep 2003 00:32:19 -0000 1.102 *************** *** 482,487 **** break; case 'YEARLY': - echo $summary; - print_r($bymonth); if (!isset($bymonth)) $bymonth[] = date('m', $start_date_time); foreach($bymonth as $month) { --- 482,485 ---- |
From: <jo...@us...> - 2003-09-17 20:38:17
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv10656/functions Modified Files: ical_parser.php Log Message: Bug Tracker [795795] Fix event data variable handling. Applied submitted patch. Calendar parsing code reuses variables to populate calendar event data. The code was not clearing those variables before reuse, causing event data to carry over from one event to another if the second event did not overwrite the previous value. Also adds organizer, location, and attendee event fields to the recurring event data. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** ical_parser.php 17 Sep 2003 04:34:20 -0000 1.100 --- ical_parser.php 17 Sep 2003 20:38:12 -0000 1.101 *************** *** 563,572 **** } $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'calnumber' => $calnumber); $start_tmp = strtotime('+1 day',$start_tmp); } } else { $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid); ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'calnumber' => $calnumber); } } --- 563,572 ---- } $nbrOfOverlaps = checkOverlap($start_date_tmp, $start_time_tmp, $end_time_tmp, $uid); ! $master_array[$start_date_tmp][$time_tmp][$uid] = array ('event_start' => $start_time_tmp, 'event_end' => $end_time_tmp, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => true, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber); $start_tmp = strtotime('+1 day',$start_tmp); } } else { $nbrOfOverlaps = checkOverlap($recur_data_date, $start_time, $end_time, $uid); ! $master_array[($recur_data_date)][($hour.$minute)][$uid] = array ('event_start' => $start_time, 'event_end' => $end_time, 'start_unixtime' => $start_unixtime_tmp, 'end_unixtime' => $end_unixtime_tmp, 'event_text' => $summary, 'event_length' => $length, 'event_overlap' => $nbrOfOverlaps, 'description' => $description, 'status' => $status, 'class' => $class, 'spans_day' => false, 'location' => $location, 'organizer' => serialize($organizer), 'attendee' => serialize($attendee), 'calnumber' => $calnumber); } } *************** *** 580,583 **** --- 580,586 ---- } } + + // Clear event data now that it's been saved. + unset($start_time, $start_time_tmp, $end_time, $end_time_tmp, $start_unixtime, $start_unixtime_tmp, $end_unixtime, $end_unixtime_tmp, $summary, $length, $nbrOfOverlaps, $description, $status, $class, $location, $organizer, $attendee); // Begin VTODO Support |
From: <jo...@us...> - 2003-09-17 19:23:35
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv27862 Modified Files: date_functions.php Log Message: Moved $fclic inside the anchor tag to ensure tags remain balanced. Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** date_functions.php 14 Sep 2003 21:01:34 -0000 1.15 --- date_functions.php 17 Sep 2003 19:23:30 -0000 1.16 *************** *** 208,215 **** echo $res[1]; } ! echo '">'.$clic.$event_text.'</a>'.$fclic; } } ! ?> \ No newline at end of file --- 208,215 ---- echo $res[1]; } ! echo '">'.$clic.$event_text.$fclic.'</a>'; } } ! ?> |
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv28204 Modified Files: admin.php config.inc.php day.php month.php preferences.php print.php week.php year.php Log Message: Moved all html head/meta data/body/ect to 'header.inc.php' so people can more easily modify the top to fit their site. Index: admin.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** admin.php 30 May 2003 00:45:20 -0000 1.4 --- admin.php 17 Sep 2003 05:18:23 -0000 1.5 *************** *** 41,60 **** } } ?> - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> - <html> - <head> - <meta http-equiv="content-type" content="text/html;charset=UTF-8"> - <title><?php echo "$admin_header_lang"; ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> - </head> - <body bgcolor="#FFFFFF"> <center> - - <?php include (BASE.'includes/header.inc.php'); ?> - <table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> --- 41,48 ---- } } + include (BASE.'includes/header.inc.php'); ?> <center> <table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder"> <tr> Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.108 retrieving revision 1.109 diff -C2 -d -r1.108 -r1.109 *** config.inc.php 16 Sep 2003 05:38:33 -0000 1.108 --- config.inc.php 17 Sep 2003 05:18:23 -0000 1.109 *************** *** 41,45 **** $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. $printview_default = 'no'; // Set print view as the default view. day, week, and month only supported views for $default_view (listed well above). --- 41,44 ---- Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** day.php 16 Sep 2003 05:38:33 -0000 1.94 --- day.php 17 Sep 2003 05:18:23 -0000 1.95 *************** *** 43,66 **** } } ! ?> ! ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> ! <html> ! <head> ! <meta http-equiv="content-type" content="text/html;charset=UTF-8"> ! <title><?php echo "$calendar_name - $display_date"; ?></title> ! <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> ! <?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\">"; ! } ! ?> ! <?php if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); ?> ! </head> ! <body bgcolor="#FFFFFF"> ! <?php include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> --- 43,49 ---- } } ! include (BASE.'includes/header.inc.php'); ! ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** month.php 15 Sep 2003 06:28:50 -0000 1.96 --- month.php 17 Sep 2003 05:18:23 -0000 1.97 *************** *** 35,39 **** $prev_month = date("Ymd", $prev_month_time); ! $display_month = localizeDate ($dateFormat_month, $date); $parse_month = date ("Ym", $date); $first_of_month = $this_year.$this_month."01"; --- 35,39 ---- $prev_month = date("Ymd", $prev_month_time); ! $display_date = localizeDate ($dateFormat_month, $date); $parse_month = date ("Ym", $date); $first_of_month = $this_year.$this_month."01"; *************** *** 42,64 **** $num_of_events = 0; ?> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> - <html> - <head> - <meta http-equiv="content-type" content="text/html;charset=UTF-8"> - <title><?php echo "$calendar_name - $display_month"; ?></title> - <link rel="stylesheet" type="text/css" href="styles/<?php echo "$style_sheet/default.css"; ?>"> - <?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=month\">"; - } - ?> - </head> - <body> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> --- 42,48 ---- $num_of_events = 0; + include (BASE.'includes/header.inc.php'); ?> <center> <table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder"> Index: preferences.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/preferences.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** preferences.php 15 Sep 2003 01:00:44 -0000 1.30 --- preferences.php 17 Sep 2003 05:18:23 -0000 1.31 *************** *** 65,79 **** } ?> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> - <html> - <head> - <meta http-equiv="content-type" content="text/html;charset=UTF-8"> - <title><?php echo "$calendar_lang - $preferences_lang"; ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> - </head> - <body bgcolor="#FFFFFF"> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> --- 65,71 ---- } + include (BASE.'includes/header.inc.php'); + ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0"> Index: print.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/print.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** print.php 29 May 2003 18:28:00 -0000 1.16 --- print.php 17 Sep 2003 05:18:23 -0000 1.17 *************** *** 9,62 **** } ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! $parse_month = date ("Ym", strtotime($getdate)); ! $printview = $HTTP_GET_VARS['printview']; ! $cal_displayname = str_replace("32", " ", $cal); ! $events_week = 0; ! $unix_time = strtotime("$getdate"); if ($printview == 'day') { ! $print_title = localizeDate ($dateFormat_day, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 day", $unix_time)); ! $prev = date("Ymd", strtotime("-1 day", $unix_time)); ! $zero_events = $no_events_day_lang; $print_next_nav = $next_day_lang; $print_prev_nav = $last_day_lang; ! $week_start = ''; ! $week_end = ''; } elseif ($printview == 'week') { ! $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = localizeDate($dateFormat_week, $end_week_time); ! $print_title = "$start_week - $end_week"; ! $week_start = date("Ymd", $start_week_time); ! $week_end = date("Ymd", $end_week_time); ! $next = date("Ymd", strtotime("+1 week", $unix_time)); ! $prev = date("Ymd", strtotime("-1 week", $unix_time)); ! $zero_events = $no_events_week_lang; $print_next_nav = $next_week_lang; $print_prev_nav = $last_week_lang; } elseif ($printview == 'month') { ! $print_title = localizeDate ($dateFormat_month, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 month", $unix_time)); ! $prev = date("Ymd", strtotime("-1 month", $unix_time)); ! $zero_events = $no_events_month_lang; $print_next_nav = $next_month_lang; $print_prev_nav = $last_month_lang; ! $week_start = ''; ! $week_end = ''; } ! ?> ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> ! <html> ! <head> ! <meta http-equiv="content-type" content="text/html;charset=UTF-8"> ! <title><?php echo "$calendar_name: $print_title"; ?></title> ! <link rel="stylesheet" type="text/css" href="styles/<?php echo $style_sheet.'/default.css'; ?>"> ! </head> ! <body bgcolor="#FFFFFF"> ! <?php if ($header_always == 'yes') include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> --- 9,54 ---- } ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! $parse_month = date ("Ym", strtotime($getdate)); ! $printview = $HTTP_GET_VARS['printview']; ! $cal_displayname = str_replace("32", " ", $cal); ! $events_week = 0; ! $unix_time = strtotime("$getdate"); if ($printview == 'day') { ! $display_date = localizeDate ($dateFormat_day, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 day", $unix_time)); ! $prev = date("Ymd", strtotime("-1 day", $unix_time)); ! $zero_events = $no_events_day_lang; $print_next_nav = $next_day_lang; $print_prev_nav = $last_day_lang; ! $week_start = ''; ! $week_end = ''; } elseif ($printview == 'week') { ! $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = localizeDate($dateFormat_week, $end_week_time); ! $display_date = "$start_week - $end_week"; ! $week_start = date("Ymd", $start_week_time); ! $week_end = date("Ymd", $end_week_time); ! $next = date("Ymd", strtotime("+1 week", $unix_time)); ! $prev = date("Ymd", strtotime("-1 week", $unix_time)); ! $zero_events = $no_events_week_lang; $print_next_nav = $next_week_lang; $print_prev_nav = $last_week_lang; } elseif ($printview == 'month') { ! $print_title = localizeDate ($dateFormat_month, strtotime($getdate)); ! $next = date("Ymd", strtotime("+1 month", $unix_time)); ! $prev = date("Ymd", strtotime("-1 month", $unix_time)); ! $zero_events = $no_events_month_lang; $print_next_nav = $next_month_lang; $print_prev_nav = $last_month_lang; ! $week_start = ''; ! $week_end = ''; } ! include (BASE.'includes/header.inc.php'); ! ! ?> <center> <table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder"> *************** *** 70,74 **** <tr> <td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$prev&printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$print_prev_nav]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $print_title; ?></font></td> <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$next&printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$print_next_nav]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> --- 62,66 ---- <tr> <td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$prev&printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$print_prev_nav]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td> <td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$next&printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$print_next_nav]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.95 retrieving revision 1.96 diff -C2 -d -r1.95 -r1.96 *** week.php 17 Sep 2003 04:36:40 -0000 1.95 --- week.php 17 Sep 2003 05:18:23 -0000 1.96 *************** *** 43,65 **** $thisdate = ($thisdate + (25 * 60 * 60)); } ?> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> - <html> - <head> - <meta http-equiv="content-type" content="text/html;charset=UTF-8"> - <title><?php echo "$calendar_name - $display_date"; ?></title> - <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> - <?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=week\">"; - } - ?> - <?php if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); ?> - </head> - <body bgcolor="#FFFFFF"> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table border="0" width="720" cellspacing="0" cellpadding="0"> --- 43,50 ---- $thisdate = ($thisdate + (25 * 60 * 60)); } + include (BASE.'includes/header.inc.php'); + ?> <center> <table border="0" width="720" cellspacing="0" cellpadding="0"> Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** year.php 30 Nov 2002 21:05:39 -0000 1.22 --- year.php 17 Sep 2003 05:18:23 -0000 1.23 *************** *** 8,12 **** $this_month = $day_array2[2]; $this_year = $day_array2[1]. '01'. '01'; ! $this_year2 = $day_array2[1]; $unix_time = strtotime($getdate); --- 8,12 ---- $this_month = $day_array2[2]; $this_year = $day_array2[1]. '01'. '01'; ! $display_date = $day_array2[1]; $unix_time = strtotime($getdate); *************** *** 21,37 **** $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ?> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> - <html> - <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title><?php echo "$calendar_name - $this_year2"; ?></title> - <link rel="stylesheet" type="text/css" href="styles/<?php echo $style_sheet.'/default.css'; ?>"> - <meta name="generator" content="BBEdit 6.5.3"> - </head> - <body> - <?php include (BASE.'includes/header.inc.php'); ?> <center> <table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder"> --- 21,27 ---- $thisday2 = localizeDate($dateFormat_week_list, $unix_time); + include (BASE.'includes/header.inc.php'); ?> <center> <table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder"> *************** *** 45,49 **** <tr> <td align="right" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$prev_year\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$last_year_lang]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="10%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $this_year2; ?></font></td> <td align="left" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$next_year\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$next_year_lang]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> --- 35,39 ---- <tr> <td align="right" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$prev_year\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$last_year_lang]\" border=\"0\" align=\"right\"></a>"; ?></td> ! <td align="center" width="10%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td> <td align="left" width="45%" class="navback"><?php echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$next_year\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$next_year_lang]\" border=\"0\" align=\"left\"></a>"; ?></td> </tr> |
From: <cl...@us...> - 2003-09-17 05:18:27
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv28204/includes Modified Files: header.inc.php Log Message: Moved all html head/meta data/body/ect to 'header.inc.php' so people can more easily modify the top to fit their site. Index: header.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/header.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** header.inc.php 12 Mar 2003 01:56:40 -0000 1.2 --- header.inc.php 17 Sep 2003 05:18:24 -0000 1.3 *************** *** 1,4 **** ! <?php /* Begin Custom Header */ ?> ! ! <?php /* End Custom Header */ ?> --- 1,20 ---- ! <? if ($current_view == 'preferences') $display_date = $preferences_lang; ?> ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> ! <html> ! <head> ! <meta http-equiv="content-type" content="text/html;charset=UTF-8"> ! <title><?php echo "$calendar_name - $display_date"; ?></title> ! <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> ! <?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=week\">"; ! } ! if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); ! ! ?> ! </head> ! <body bgcolor="#FFFFFF"> \ No newline at end of file |
From: <cl...@us...> - 2003-09-17 04:36:44
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv21953 Modified Files: week.php Log Message: Fixed oopsie. Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** week.php 16 Sep 2003 06:14:16 -0000 1.94 --- week.php 17 Sep 2003 04:36:40 -0000 1.95 *************** *** 18,22 **** $end_week_time = $start_week_time + (6 * 25 * 60 * 60); $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = ocalizeDate($dateFormat_week, $end_week_time); $display_date = "$start_week - $end_week"; --- 18,22 ---- $end_week_time = $start_week_time + (6 * 25 * 60 * 60); $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = localizeDate($dateFormat_week, $end_week_time); $display_date = "$start_week - $end_week"; |
From: <cl...@us...> - 2003-09-17 04:34:27
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv21652/functions Modified Files: ical_parser.php Log Message: Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** ical_parser.php 17 Sep 2003 04:03:33 -0000 1.99 --- ical_parser.php 17 Sep 2003 04:34:20 -0000 1.100 *************** *** 386,389 **** --- 386,392 ---- // if $until isn't set yet, we set it to the end of our range we're looking at + // The FREQ switch array will always kick our early, so lets try this workaround. + if (isset($until)) $until = strtotime('+'.$interval.' '.$freq_type, $until);; + if (!isset($until)) $until = $end_range_time; $end_date_time = $until; |
From: <cl...@us...> - 2003-09-17 04:03:40
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1:/tmp/cvs-serv17003/functions Modified Files: ical_parser.php Log Message: Fix for #668697. Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** ical_parser.php 15 Sep 2003 06:28:51 -0000 1.98 --- ical_parser.php 17 Sep 2003 04:03:33 -0000 1.99 *************** *** 479,482 **** --- 479,484 ---- break; case 'YEARLY': + echo $summary; + print_r($bymonth); if (!isset($bymonth)) $bymonth[] = date('m', $start_date_time); foreach($bymonth as $month) { *************** *** 498,503 **** } } else { ! $day = date('d', $start_date_time); ! $next_date_time = mktime(0,0,0,$month,$day,$year); } $recur_data[] = $next_date_time; --- 500,505 ---- } } else { ! $day = date('d', $start_date_time); ! $next_date_time = mktime(0,0,0,$month,$day,$this_year); } $recur_data[] = $next_date_time; |
From: <cl...@us...> - 2003-09-16 06:47:53
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv13356/includes Modified Files: sidebar.php Log Message: Fixed IE Bug. Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** sidebar.php 16 Sep 2003 06:14:16 -0000 1.16 --- sidebar.php 16 Sep 2003 06:47:50 -0000 1.17 *************** *** 45,49 **** <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> ! <td align="center" class="sideback"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td> </tr> <tr> --- 45,49 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> ! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$jump_lang"; ?></div></td> </tr> <tr> *************** *** 79,83 **** <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> ! <td align="center" class="sideback"><font class="G10BOLD"><?php echo "$tomorrows_lang"; ?></font></td> </tr> <tr> --- 79,83 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> ! <td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$tomorrows_lang"; ?></div></td> </tr> <tr> *************** *** 141,145 **** <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> --- 141,145 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> ! <td align="center" width="98%" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD"><?php echo "$todo_lang"; ?></div></td> </tr> <tr> |
From: <cl...@us...> - 2003-09-16 06:14:19
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory sc8-pr-cvs1:/tmp/cvs-serv7186/includes Modified Files: sidebar.php Log Message: more code lightening. Index: sidebar.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** sidebar.php 16 Sep 2003 05:38:34 -0000 1.15 --- sidebar.php 16 Sep 2003 06:14:16 -0000 1.16 *************** *** 26,60 **** <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="3" cellspacing="0" class="calborder"> <tr height="20"> <td align="center" class="sideback"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td> --- 26,47 ---- <tr> <td colspan="3" bgcolor="#FFFFFF" align="left"> ! <?php ! echo '<div style="padding: 5px;">'; ! echo '<font class="G10BOLD">'.$cal_displayname2.'</font><br>'; ! echo '<span class="G10">'; ! echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$really_today_today\">$goday_lang</a><br>\n"; ! echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$really_today_today\">$goweek_lang</a><br>\n"; ! echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$really_today_today\">$gomonth_lang</a><br>\n"; ! echo "<a class=\"psf\" href=\"year.php?cal=$cal&getdate=$really_today_today\">$goyear_lang</a><br>\n"; ! echo "<a class=\"psf\" href=\"print.php?cal=$cal&getdate=$getdate&printview=$current_view\">$goprint_lang</a><br>\n"; ! if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&getdate=$getdate\">$preferences_lang</a><br>\n"; ! if ($cal != 'all_calenders_combined971') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a> | <a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n"; ! echo '</span></div>'; ! ?> </td> </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> ! <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> <td align="center" class="sideback"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td> *************** *** 64,68 **** <?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'); --- 51,55 ---- <?php ! echo '<div style="padding: 5px;">'; 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'); *************** *** 70,74 **** include('./functions/list_months.php'); include('./functions/list_weeks.php'); ! echo "</form>"; if ($show_search == 'yes') { echo $search_box; --- 57,61 ---- include('./functions/list_months.php'); include('./functions/list_weeks.php'); ! //echo "</form>"; if ($show_search == 'yes') { echo $search_box; *************** *** 81,90 **** echo '</form>'; } ! ?> </td> </tr> </table> ! <br> <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?> --- 68,77 ---- echo '</form>'; } ! echo '</div>'; ?> </td> </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?> *************** *** 92,96 **** <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> --- 79,83 ---- <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> <tr height="20"> ! <td align="center" class="sideback"><font class="G10BOLD"><?php echo "$tomorrows_lang"; ?></font></td> </tr> <tr> *************** *** 147,151 **** </tr> </table> ! <br> <?php } --- 134,138 ---- </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <?php } *************** *** 225,229 **** </table> ! <br> <?php } $fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15'); --- 212,216 ---- </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <?php } $fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15'); *************** *** 284,288 **** </tr> </table> ! <br> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> --- 271,275 ---- </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> *************** *** 339,343 **** </tr> </table> ! <br> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> --- 326,330 ---- </tr> </table> ! <img src="images/spacer.gif" width="1" height="10" alt=" "><br> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr height="20"> |
From: <cl...@us...> - 2003-09-16 06:14:19
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1:/tmp/cvs-serv7186 Modified Files: week.php Log Message: more code lightening. Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** week.php 14 Sep 2003 21:01:34 -0000 1.93 --- week.php 16 Sep 2003 06:14:16 -0000 1.94 *************** *** 6,23 **** if ($minical_view == "current") $minical_view = "week"; ! $starttime = "0500"; ! $weekstart = 1; ! $unix_time = strtotime($getdate); ! $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ! $today_today = date('Ymd', strtotime("now + $second_offset seconds")); ! $next_week = date("Ymd", strtotime("+1 week", $unix_time)); ! $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); ! $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); ! $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = localizeDate($dateFormat_week, $end_week_time); ! $display_date = "$start_week - $end_week"; // For the side months --- 6,23 ---- if ($minical_view == "current") $minical_view = "week"; ! $starttime = "0500"; ! $weekstart = 1; ! $unix_time = strtotime($getdate); ! $thisday2 = localizeDate($dateFormat_week_list, $unix_time); ! $today_today = date('Ymd', strtotime("now + $second_offset seconds")); ! $next_week = date("Ymd", strtotime("+1 week", $unix_time)); ! $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); ! $tomorrows_date = date( "Ymd", strtotime("+1 day", $unix_time)); ! $yesterdays_date = date( "Ymd", strtotime("-1 day", $unix_time)); ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); ! $end_week_time = $start_week_time + (6 * 25 * 60 * 60); ! $start_week = localizeDate($dateFormat_week, $start_week_time); ! $end_week = ocalizeDate($dateFormat_week, $end_week_time); ! $display_date = "$start_week - $end_week"; // For the side months *************** *** 51,59 **** <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title><?php echo "$calendar_name - $display_date"; ?></title> ! <link rel="stylesheet" type="text/css" href="styles/<?php echo "$style_sheet/default.css"; ?>"> <?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=week\">"; } --- 51,58 ---- <meta http-equiv="content-type" content="text/html;charset=UTF-8"> <title><?php echo "$calendar_name - $display_date"; ?></title> ! <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>"> <?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=week\">"; } *************** *** 367,372 **** </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'); ?> --- 366,371 ---- </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'); ?> |