Menu
▾
▴
phpicalendar-commits — Mailing list ONLY for CVS commits. This is a listen-only list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(5) |
Feb
(25) |
Mar
(18) |
Apr
|
May
(26) |
Jun
(14) |
Jul
(1) |
Aug
(5) |
Sep
(82) |
Oct
(3) |
Nov
(130) |
Dec
(9) |
| 2004 |
Jan
(4) |
Feb
(62) |
Mar
|
Apr
(3) |
May
(100) |
Jun
|
Jul
(6) |
Aug
(49) |
Sep
(33) |
Oct
(47) |
Nov
(2) |
Dec
(1) |
| 2005 |
Jan
|
Feb
(4) |
Mar
(1) |
Apr
(8) |
May
(17) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(26) |
Oct
(18) |
Nov
(37) |
Dec
(14) |
| 2006 |
Jan
(2) |
Feb
(18) |
Mar
(34) |
Apr
(52) |
May
(7) |
Jun
(3) |
Jul
(2) |
Aug
(10) |
Sep
|
Oct
|
Nov
(18) |
Dec
(4) |
| 2007 |
Jan
|
Feb
(7) |
Mar
(7) |
Apr
(6) |
May
(52) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(250) |
| 2009 |
Jan
(35) |
Feb
(45) |
Mar
|
Apr
(4) |
May
(35) |
Jun
(13) |
Jul
(49) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(11) |
| 2010 |
Jan
(3) |
Feb
(30) |
Mar
|
Apr
(35) |
May
(12) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
|
From: <ji...@us...> - 2006-11-14 07:00:53
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30531/phpicalendar/functions Modified Files: ical_parser.php init.inc.php Log Message: change date calcs to allow rss feeds to go across years Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.216 retrieving revision 1.217 diff -C2 -d -r1.216 -r1.217 *** ical_parser.php 12 Nov 2006 07:34:34 -0000 1.216 --- ical_parser.php 14 Nov 2006 07:00:51 -0000 1.217 *************** *** 25,35 **** } - // what date we want to get data for (for day calendar) - if (!isset($getdate) || $getdate == '') $getdate = date('Ymd'); - preg_match ("/([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]; - // reading the file if it's allowed $parse_file = true; --- 25,28 ---- *************** *** 428,440 **** $start_date_time = strtotime($start_date); ! $this_month_start_time = strtotime($this_year.$this_month.'01'); ! if ($current_view == 'year' || ($save_parsed_cals == 'yes' && !$is_webcal)|| $current_view == 'print' && $printview == 'year') { ! $start_range_time = strtotime($this_year.'-01-01 -2 weeks'); ! $end_range_time = strtotime($this_year.'-12-31 +2 weeks'); ! } else { ! $start_range_time = strtotime('-1 month -2 day', $this_month_start_time); ! $end_range_time = strtotime('+2 month +2 day', $this_month_start_time); } - foreach ($rrule_array as $key => $val) { switch($key) { --- 421,438 ---- $start_date_time = strtotime($start_date); ! if (!isset($fromdate)){ ! #this should happen if not in one of the rss views ! $this_month_start_time = strtotime($this_year.$this_month.'01'); ! if ($current_view == 'year' || ($save_parsed_cals == 'yes' && !$is_webcal)|| $current_view == 'print' && $printview == 'year') { ! $start_range_time = strtotime($this_year.'-01-01 -2 weeks'); ! $end_range_time = strtotime($this_year.'-12-31 +2 weeks'); ! } else { ! $start_range_time = strtotime('-1 month -2 day', $this_month_start_time); ! $end_range_time = strtotime('+2 month +2 day', $this_month_start_time); ! } ! }else{ ! $start_range_time = strtotime($fromdate); ! $end_range_time = strtotime($todate)+60*60*24; } foreach ($rrule_array as $key => $val) { switch($key) { Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** init.inc.php 12 Nov 2006 08:06:30 -0000 1.104 --- init.inc.php 14 Nov 2006 07:00:51 -0000 1.105 *************** *** 1,4 **** <?php ! $phpicalendar_version = '2.22'; // uncomment when developing, comment for shipping version //error_reporting (E_ERROR | E_WARNING | E_PARSE); --- 1,4 ---- <?php ! $phpicalendar_version = '2.23 rc1'; // uncomment when developing, comment for shipping version //error_reporting (E_ERROR | E_WARNING | E_PARSE); *************** *** 95,98 **** --- 95,103 ---- } + preg_match ("/([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]; + if (ini_get('max_execution_time') < 60) { @ini_set('max_execution_time', '60'); |
|
From: <ji...@us...> - 2006-11-14 07:00:53
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30531/phpicalendar/rss Modified Files: rss.php Log Message: change date calcs to allow rss feeds to go across years Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** rss.php 25 Jul 2006 00:58:42 -0000 1.44 --- rss.php 14 Nov 2006 07:00:51 -0000 1.45 *************** *** 112,116 **** } $filemodtime = date("r", $filemod); ! //send relevant headers header ("Last-Modified: $filemodtime"); --- 112,116 ---- } $filemodtime = date("r", $filemod); ! /* //send relevant headers header ("Last-Modified: $filemodtime"); |
|
From: <ji...@us...> - 2006-11-12 08:12:23
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6655/phpicalendar Modified Files: README Log Message: update readme Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** README 12 Nov 2006 08:06:30 -0000 1.103 --- README 12 Nov 2006 08:12:21 -0000 1.104 *************** *** 86,89 **** --- 86,96 ---- Bug fixes Fixed error in german language file + Change naming of saved parsed cals to allow same calname with different cpath + Changes to calculation of next datetimes to work with php5.1 variants + Fix index.php to allow year as default view + display version on admin index page + fix overlapping events bug + fix path problems in template.php + 2.22 template.php will look in templates/default if a file is missing from templates/$template |
|
From: <ji...@us...> - 2006-11-12 08:07:53
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4844/phpicalendar Modified Files: index.php Log Message: roll back experimental feature Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** index.php 2 Nov 2006 08:06:03 -0000 1.14 --- index.php 12 Nov 2006 08:07:51 -0000 1.15 *************** *** 2,11 **** if (!isset($ALL_CALENDARS_COMBINED)) $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; ! if (is_file("./config.inc.php")){ ! include "./config.inc.php"; ! }else{ ! header ( "Location:./admin/new.php"); ! exit; ! } if (isset($_COOKIE['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); --- 2,6 ---- if (!isset($ALL_CALENDARS_COMBINED)) $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; ! include "./config.inc.php"; if (isset($_COOKIE['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); |
|
From: <ji...@us...> - 2006-11-12 08:06:32
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4488/phpicalendar Modified Files: README Log Message: roll back experimental feature Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** README 10 Apr 2006 02:21:07 -0000 1.102 --- README 12 Nov 2006 08:06:30 -0000 1.103 *************** *** 83,86 **** --- 83,89 ---- -------- cvs + Fix parsing of timezones to accommodate extra text from Mozilla and other calendars + Bug fixes + Fixed error in german language file 2.22 template.php will look in templates/default if a file is missing from templates/$template |
|
From: <ji...@us...> - 2006-11-12 08:06:32
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4488/phpicalendar/functions Modified Files: date_functions.php init.inc.php Log Message: roll back experimental feature Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** date_functions.php 12 Nov 2006 07:34:34 -0000 1.36 --- date_functions.php 12 Nov 2006 08:06:30 -0000 1.37 *************** *** 245,249 **** if (preg_match('/^'.$property.';TZID=/i', $field)) { $tz_tmp = explode('=', $field); ! $tz_dt = $tz_tmp[1]; unset($tz_tmp); } elseif ($zulu_time) { --- 245,249 ---- if (preg_match('/^'.$property.';TZID=/i', $field)) { $tz_tmp = explode('=', $field); ! $tz_dt = parse_tz($tz_tmp[1]); unset($tz_tmp); } elseif ($zulu_time) { Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.103 retrieving revision 1.104 diff -C2 -d -r1.103 -r1.104 *** init.inc.php 2 Nov 2006 08:06:03 -0000 1.103 --- init.inc.php 12 Nov 2006 08:06:30 -0000 1.104 *************** *** 14,18 **** // Pull in the configuration and some functions. if (!defined('BASE')) define('BASE', './'); - include_once(BASE.'default_config.inc.php'); include_once(BASE.'config.inc.php'); --- 14,17 ---- |
|
From: <ji...@us...> - 2006-11-12 07:34:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25617/phpicalendar/functions Modified Files: date_functions.php ical_parser.php Log Message: create new date function parse_tz to deal with mozilla and other tzids. Apply to ical_parser Index: date_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/date_functions.php,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** date_functions.php 5 Apr 2006 04:43:59 -0000 1.35 --- date_functions.php 12 Nov 2006 07:34:34 -0000 1.36 *************** *** 288,290 **** --- 288,303 ---- return array($unixtime, $date, $time, $allday); } + + //TZIDs in calendars often contain leading information that should be stripped + //Example: TZID=/mozilla.org/20050126_1/Europe/Berlin + //Need to return the last part only + function parse_tz($data){ + $fields = explode("/",$data); + $tz = array_pop($fields); + $tmp = array_pop($fields); + if (isset($tmp) && $tmp != "") $tz = "$tmp/$tz"; + return $tz; + } + + ?> Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.215 retrieving revision 1.216 diff -C2 -d -r1.215 -r1.216 *** ical_parser.php 2 Nov 2006 08:06:03 -0000 1.215 --- ical_parser.php 12 Nov 2006 07:34:34 -0000 1.216 *************** *** 1074,1078 **** // do nothing } elseif ($eachval[0] == 'TZID') { ! $recurrence_id['tzid'] = $eachval[1]; } elseif ($eachval[0] == 'RANGE') { $recurrence_id['range'] = $eachval[1]; --- 1074,1078 ---- // do nothing } elseif ($eachval[0] == 'TZID') { ! $recurrence_id['tzid'] = parse_tz($eachval[1]); } elseif ($eachval[0] == 'RANGE') { $recurrence_id['range'] = $eachval[1]; *************** *** 1120,1124 **** break; case 'X-WR-TIMEZONE': ! $calendar_tz = $data; $master_array['calendar_tz'] = $calendar_tz; break; --- 1120,1124 ---- break; case 'X-WR-TIMEZONE': ! $calendar_tz = parse_tz($data); $master_array['calendar_tz'] = $calendar_tz; break; |
|
From: <ji...@us...> - 2006-11-11 20:25:38
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10860/phpicalendarx Modified Files: config.inc.php Log Message: fix url change webcal to http to get cal name Index: config.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v retrieving revision 1.175 retrieving revision 1.176 diff -C2 -d -r1.175 -r1.176 *** config.inc.php 16 Mar 2006 00:20:53 -0000 1.175 --- config.inc.php 11 Nov 2006 20:25:36 -0000 1.176 *************** *** 39,43 **** $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. ! $allow_login = 'no'; // Set to yes to prompt for login to unlock calendars. $login_cookies = 'no'; // Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions. $support_ical = 'no'; // Set to yes to support the Apple iCal calendar database structure. --- 39,43 ---- $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. ! $allow_login = 'yes'; // Set to yes to prompt for login to unlock calendars. $login_cookies = 'no'; // Set to yes to store authentication information via (unencrypted) cookies. Set to no to use sessions. $support_ical = 'no'; // Set to yes to support the Apple iCal calendar database structure. *************** *** 54,58 **** // Administration settings (/admin/) $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method ! $auth_method = 'ftp'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic. $auth_internal_username = 'admin'; // Only used if $auth_method='internal'. The username for the administrator. $auth_internal_password = 'admin'; // Only used if $auth_method='internal'. The password for the administrator. --- 54,58 ---- // Administration settings (/admin/) $allow_admin = 'yes'; // Set to yes to allow the admin page - remember to change the default password if using 'internal' as the $auth_method ! $auth_method = 'internal'; // Valid values are: 'ftp', 'internal', or 'none'. 'ftp' uses the ftp server's username and password as well as ftp commands to delete and copy files. 'internal' uses $auth_internal_username and $auth_internal_password defined below - CHANGE the password. 'none' uses NO authentication - meant to be used with another form of authentication such as http basic. $auth_internal_username = 'admin'; // Only used if $auth_method='internal'. The username for the administrator. $auth_internal_password = 'admin'; // Only used if $auth_method='internal'. The password for the administrator. *************** *** 82,86 **** #$more_webcals['cpath'][] = '' //add webcals that will show up only for a particular cpath. ! $locked_cals[] = ''; // Fill in-between the quotes the names of the calendars you wish to hide $locked_cals[] = ''; // unless unlocked by a username/password login. This should be the $locked_cals[] = ''; // exact calendar filename without the .ics suffix. --- 82,86 ---- #$more_webcals['cpath'][] = '' //add webcals that will show up only for a particular cpath. ! $locked_cals[] = 'work'; // Fill in-between the quotes the names of the calendars you wish to hide $locked_cals[] = ''; // unless unlocked by a username/password login. This should be the $locked_cals[] = ''; // exact calendar filename without the .ics suffix. |
|
From: <ji...@us...> - 2006-11-11 20:25:38
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10860/phpicalendarx/functions Modified Files: calendar_functions.php Log Message: fix url change webcal to http to get cal name Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.23 retrieving revision 1.25 diff -C2 -d -r1.23 -r1.25 *** calendar_functions.php 14 Aug 2006 03:40:37 -0000 1.23 --- calendar_functions.php 11 Nov 2006 20:25:36 -0000 1.25 *************** *** 220,223 **** --- 220,225 ---- }else{ # pull the name from the $cal_tmp file + $cal_tmp = str_replace('webcal://','http://',$cal_tmp); + $ifile = @fopen($cal_tmp, "r"); if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp)); |
|
From: <ji...@us...> - 2006-11-11 20:25:38
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10860/phpicalendar/functions Modified Files: calendar_functions.php Log Message: fix url change webcal to http to get cal name Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** calendar_functions.php 14 Aug 2006 03:40:37 -0000 1.23 --- calendar_functions.php 11 Nov 2006 20:25:36 -0000 1.24 *************** *** 220,223 **** --- 220,225 ---- }else{ # pull the name from the $cal_tmp file + $cal_tmp = str_replace('webcal://','http://',$cal_tmp); + $ifile = @fopen($cal_tmp, "r"); if ($ifile == FALSE) exit(error($lang['l_error_cantopen'], $cal_tmp)); |
|
From: <jr...@us...> - 2006-11-02 08:36:46
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24520 Added Files: publish.php Log Message: Updated combined publish.php |
|
From: <ji...@us...> - 2006-11-02 08:06:07
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13538/phpicalendar/functions Modified Files: ical_parser.php Log Message: bug fix for repeating events where first day of month is same as repeat day Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.214 retrieving revision 1.215 diff -C2 -d -r1.214 -r1.215 *** ical_parser.php 25 Jul 2006 00:57:19 -0000 1.214 --- ical_parser.php 2 Nov 2006 08:06:03 -0000 1.215 *************** *** 661,665 **** $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); $month = date('m', $next_date_time); if (in_array($month, $bymonth)) { --- 661,665 ---- $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, $next_range_time) - $nth * 604800; $month = date('m', $next_date_time); if (in_array($month, $bymonth)) { *************** *** 683,687 **** } } elseif ((isset($byday_arr[1])) && ($byday_arr[1] != '-')) { ! $next_date_time = strtotime($on_day.' +'.$nth.' week', $next_range_time); $month = date('m', $next_date_time); if (in_array($month, $bymonth)) { --- 683,687 ---- } } elseif ((isset($byday_arr[1])) && ($byday_arr[1] != '-')) { ! $next_date_time = strtotime($on_day, $next_range_time) + $nth * 604800; $month = date('m', $next_date_time); if (in_array($month, $bymonth)) { |
|
From: <ji...@us...> - 2006-11-02 08:06:07
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13538/phpicalendarxx Modified Files: index.php month.php Log Message: bug fix for repeating events where first day of month is same as repeat day Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** index.php 14 Aug 2006 03:32:48 -0000 1.13 --- index.php 2 Nov 2006 08:06:03 -0000 1.14 *************** *** 2,6 **** if (!isset($ALL_CALENDARS_COMBINED)) $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; ! include "./config.inc.php"; if (isset($_COOKIE['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); --- 2,11 ---- if (!isset($ALL_CALENDARS_COMBINED)) $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'; ! if (is_file("./config.inc.php")){ ! include "./config.inc.php"; ! }else{ ! header ( "Location:./admin/new.php"); ! exit; ! } if (isset($_COOKIE['phpicalendar'])) { $phpicalendar = unserialize(stripslashes($_COOKIE['phpicalendar'])); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.137 retrieving revision 1.138 diff -C2 -d -r1.137 -r1.138 *** month.php 10 Apr 2006 02:21:07 -0000 1.137 --- month.php 2 Nov 2006 08:06:03 -0000 1.138 *************** *** 57,62 **** 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'calendar_nav' => BASE.'templates/'.$template.'/calendar_nav.tpl', ! 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' )); --- 57,62 ---- 'event_js' => BASE.'functions/event.js', 'footer' => BASE.'templates/'.$template.'/footer.tpl', ! 'calendar_nav' => BASE.'templates/'.$template.'/calendar_nav.tpl', ! 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' )); |
|
From: <ji...@us...> - 2006-11-02 08:06:07
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13538/phpicalendarxx/functions Modified Files: init.inc.php Log Message: bug fix for repeating events where first day of month is same as repeat day Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** init.inc.php 14 Aug 2006 07:07:46 -0000 1.102 --- init.inc.php 2 Nov 2006 08:06:03 -0000 1.103 *************** *** 14,17 **** --- 14,18 ---- // Pull in the configuration and some functions. if (!defined('BASE')) define('BASE', './'); + include_once(BASE.'default_config.inc.php'); include_once(BASE.'config.inc.php'); |
|
From: <ji...@us...> - 2006-08-14 07:07:48
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18721/phpicalendar/functions Modified Files: init.inc.php Log Message: fix for Bug 1466026 adjust subscribe and download paths Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** init.inc.php 14 Aug 2006 06:29:14 -0000 1.101 --- init.inc.php 14 Aug 2006 07:07:46 -0000 1.102 *************** *** 215,228 **** if (count($local_cals) == 1) { $filename = $local_cals[0]; if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { ! $subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'."$cpath/".$filename; $download_filename = $filename; } elseif ($download_uri != '') { $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'."$cpath/".basename($filename); ! $download_filename = $download_uri.'/'."$cpath/".basename($filename); } else { ! $subscribe_path = "$cpath/"; ! $download_filename = "$cpath/"; } } --- 215,231 ---- if (count($local_cals) == 1) { $filename = $local_cals[0]; + $add_cpath = ''; + if (isset($cpath) && $cpath !='') $add_cpath = "$cpath/"; + if (($download_uri == '') && (preg_match('/(^\/|\.\.\/)/', $filename) == 0)) { ! $subscribe_path = 'webcal://'.$_SERVER['SERVER_NAME'].dirname($_SERVER['PHP_SELF']).'/'.$filename; $download_filename = $filename; } elseif ($download_uri != '') { $newurl = eregi_replace("^(http://)", "", $download_uri); ! $subscribe_path = 'webcal://'.$newurl.'/'.$add_cpath.basename($filename); ! $download_filename = $download_uri.'/'.$add_cpath.basename($filename); } else { ! $subscribe_path = $add_cpath; ! $download_filename = $add_cpath; } } |
|
From: <ji...@us...> - 2006-08-14 06:29:17
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5534/phpicalendar/functions Modified Files: init.inc.php Log Message: fix problem with jumps when using webcals but allow_webcals is no...append .ics to filename Index: init.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init.inc.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** init.inc.php 3 May 2006 04:29:47 -0000 1.100 --- init.inc.php 14 Aug 2006 06:29:14 -0000 1.101 *************** *** 144,147 **** --- 144,149 ---- substr($cal_filename, 0, 9) == 'webcal://') { + #jump sends cal url without .ics extension. Add it if needed. + if (substr($cal_filename, -4) != ".ics") $cal_filename .= ".ics"; $web_cals[] = $cal_filename; } |
|
From: <ji...@us...> - 2006-08-14 05:57:36
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26890/phpicalendar/rss Modified Files: rss1.0.php Log Message: fix missing quote mark Index: rss1.0.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss1.0.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** rss1.0.php 14 Aug 2006 04:48:40 -0000 1.3 --- rss1.0.php 14 Aug 2006 05:57:32 -0000 1.4 *************** *** 227,231 **** } if (($events_count < 1) && ($i == $numdays)) { ! $rss_items .= '<item rdf:about="'.$default_path."\>\n"; $rss_items .= '<title>No events found</title>'."\n"; $rss_items .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; --- 227,231 ---- } if (($events_count < 1) && ($i == $numdays)) { ! $rss_items .= '<item rdf:about="'.$default_path."\">\n"; $rss_items .= '<title>No events found</title>'."\n"; $rss_items .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; |
|
From: <ji...@us...> - 2006-08-14 05:57:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26890/phpicalendar/functions Modified Files: template.php Log Message: fix missing quote mark Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** template.php 10 Apr 2006 01:10:40 -0000 1.85 --- template.php 14 Aug 2006 05:57:32 -0000 1.86 *************** *** 1102,1114 **** foreach ($match[1] as $key => $val) { if ($match[1][$i] == 'SMALL') { ! $template_file = $this->parse('templates/'.$template.'/month_small.tpl'); $type = 'small'; $offset = $match[2][$i].$match[3][$i]; } elseif ($match[1][$i] == 'MEDIUM') { ! $template_file = $this->parse('templates/'.$template.'/month_medium.tpl'); $type = 'medium'; $offset = $match[3][$i]; } else { ! $template_file = $this->parse('templates/'.$template.'/month_large.tpl'); $type = 'large'; $offset = $match[2][$i].$match[3][$i]; --- 1102,1114 ---- foreach ($match[1] as $key => $val) { if ($match[1][$i] == 'SMALL') { ! $template_file = $this->parse(BASE.'templates/'.$template.'/month_small.tpl'); $type = 'small'; $offset = $match[2][$i].$match[3][$i]; } elseif ($match[1][$i] == 'MEDIUM') { ! $template_file = $this->parse(BASE.'templates/'.$template.'/month_medium.tpl'); $type = 'medium'; $offset = $match[3][$i]; } else { ! $template_file = $this->parse(BASE.'templates/'.$template.'/month_large.tpl'); $type = 'large'; $offset = $match[2][$i].$match[3][$i]; |
|
From: <ji...@us...> - 2006-08-14 05:03:42
|
Update of /cvsroot/phpicalendar/phpicalendar/languages In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8177/phpicalendar/languages Modified Files: german.inc.php Log Message: fix for Bug 1502999 Index: german.inc.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/languages/german.inc.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** german.inc.php 21 Mar 2006 09:52:29 -0000 1.31 --- german.inc.php 14 Aug 2006 05:03:40 -0000 1.32 *************** *** 85,90 **** $lang['l_status'] = 'Status'; $lang['l_status_confirmed'] = 'Bestätigt' ; ! $lang['l_status_cancelled'] = 'Vorläufig'; ! $lang['l_status_tentative'] = 'Abgesagt'; $lang['l_todo'] = 'Aufgaben'; $lang['l_unfinished'] = 'Andauernd'; --- 85,90 ---- $lang['l_status'] = 'Status'; $lang['l_status_confirmed'] = 'Bestätigt' ; ! $lang['l_status_cancelled'] = 'Abgesagt'; ! $lang['l_status_tentative'] = 'Vorläufig'; $lang['l_todo'] = 'Aufgaben'; $lang['l_unfinished'] = 'Andauernd'; |
|
From: <ji...@us...> - 2006-08-14 04:57:18
|
Update of /cvsroot/phpicalendar/phpicalendar/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6032/phpicalendar/admin Modified Files: index.php Log Message: fix for Bug 1521264 Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/admin/index.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.php 7 Sep 2005 06:08:02 -0000 1.4 --- index.php 14 Aug 2006 04:57:16 -0000 1.5 *************** *** 98,101 **** --- 98,102 ---- $page->replace_tags(array( + 'version' => $phpicalendar_version, 'event_js' => '', 'charset' => $charset, |
|
From: <ji...@us...> - 2006-08-14 04:48:42
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2942/phpicalendar/rss Modified Files: rss1.0.php rss2.0.php Log Message: fix for Bug 1526598 Index: rss1.0.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss1.0.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rss1.0.php 14 Aug 2006 04:17:50 -0000 1.2 --- rss1.0.php 14 Aug 2006 04:48:40 -0000 1.3 *************** *** 227,231 **** } if (($events_count < 1) && ($i == $numdays)) { ! $rss_items .= '<item>'."\n"; $rss_items .= '<title>No events found</title>'."\n"; $rss_items .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; --- 227,231 ---- } if (($events_count < 1) && ($i == $numdays)) { ! $rss_items .= '<item rdf:about="'.$default_path."\>\n"; $rss_items .= '<title>No events found</title>'."\n"; $rss_items .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; Index: rss2.0.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss2.0.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** rss2.0.php 14 Aug 2006 04:17:50 -0000 1.2 --- rss2.0.php 14 Aug 2006 04:48:40 -0000 1.3 *************** *** 231,234 **** --- 231,235 ---- if (($events_count < 1) && ($i == $numdays)) { $rss .= '<item>'."\n"; + $rss .= '<guid isPermaLink="false">'.$default_path.'&uid='.$thisdate.'</guid>'."\n"; $rss .= '<title>No events found</title>'."\n"; $rss .= '<link>'.htmlspecialchars ("$default_path").'</link>'."\n"; |
|
From: <ji...@us...> - 2006-08-14 04:17:53
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24482/phpicalendar/rss Modified Files: rss1.0.php rss2.0.php Log Message: fix for Bug 1526693 Index: rss1.0.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss1.0.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rss1.0.php 5 Apr 2006 04:59:20 -0000 1.1 --- rss1.0.php 14 Aug 2006 04:17:50 -0000 1.2 *************** *** 217,221 **** $rss_items .= '<description>'.$rss_description.'</description>'."\n"; if (isset($val['location']) && $val['location'] !=''){ ! $rss_items .= '<ev:location>'.$val['location']."</ev:location>\n"; } $rss_items .= '</item>'."\n"; --- 217,223 ---- $rss_items .= '<description>'.$rss_description.'</description>'."\n"; if (isset($val['location']) && $val['location'] !=''){ ! $location = str_replace('&','&',$val['location']); ! $location = str_replace('&amp;','&',$location); ! $rss_items .= '<ev:location>'.$location."</ev:location>\n"; } $rss_items .= '</item>'."\n"; Index: rss2.0.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss2.0.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rss2.0.php 5 Apr 2006 04:59:20 -0000 1.1 --- rss2.0.php 14 Aug 2006 04:17:50 -0000 1.2 *************** *** 220,224 **** $rss .= '<description>'.$rss_description.'</description>'."\n"; if (isset($val['location']) && $val['location'] !=''){ ! $rss .= '<ev:location>'.$val['location']."</ev:location>\n"; } $rss .= '</item>'."\n"; --- 220,226 ---- $rss .= '<description>'.$rss_description.'</description>'."\n"; if (isset($val['location']) && $val['location'] !=''){ ! $location = str_replace('&','&',$val['location']); ! $location = str_replace('&amp;','&',$location); ! $rss .= '<ev:location>'.$location."</ev:location>\n"; } $rss .= '</item>'."\n"; |
|
From: <ji...@us...> - 2006-08-14 03:40:40
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11513/phpicalendar/functions Modified Files: calendar_functions.php Log Message: fix for Bug 1476187 Index: calendar_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/calendar_functions.php,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** calendar_functions.php 20 Mar 2006 01:08:29 -0000 1.22 --- calendar_functions.php 14 Aug 2006 03:40:37 -0000 1.23 *************** *** 240,244 **** if ($line == "BEGIN:VTIMEZONE" ||$line == "BEGIN:VEVENT") break; } - echo "</pre>"; } --- 240,243 ---- |
|
From: <ji...@us...> - 2006-08-14 03:32:51
|
Update of /cvsroot/phpicalendar/phpicalendar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8750/phpicalendar Modified Files: index.php Log Message: add year as OK default for index.php fix for Bug 1539082 Index: index.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/index.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** index.php 11 Nov 2005 01:32:24 -0000 1.12 --- index.php 14 Aug 2006 03:32:48 -0000 1.13 *************** *** 11,15 **** $default_view = "print.php"; } else { ! $check = array ('day', 'week', 'month'); if (in_array($default_view, $check)) { $default_view = $default_view . '.php'; --- 11,15 ---- $default_view = "print.php"; } else { ! $check = array ('day', 'week', 'month', 'year'); if (in_array($default_view, $check)) { $default_view = $default_view . '.php'; |
|
From: <ji...@us...> - 2006-07-25 00:58:45
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31907/phpicalendar/rss Modified Files: rss.php Log Message: increment by time instead of date - avoids strtotime Index: rss.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss.php,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** rss.php 3 May 2006 04:21:14 -0000 1.43 --- rss.php 25 Jul 2006 00:58:42 -0000 1.44 *************** *** 152,160 **** # note that usage of $thisdate is different from distribution # I use it as a date, dist uses it as a time $i = 1; #day counter $uid_arr = array(); do { ! $thisdate=date('Ymd', strtotime($thisdate)); ! #echo "Date: $thisdate<br>\n"; $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { --- 152,161 ---- # note that usage of $thisdate is different from distribution # I use it as a date, dist uses it as a time + $thistime = strtotime($thisdate); $i = 1; #day counter $uid_arr = array(); do { ! $thisdate=date('Ymd', $thistime); ! # echo "Date: $thisdate\ti:$i\tnumdays:$numdays<br>\n"; $dayofweek = localizeDate ("%a %b %e %Y", strtotime($thisdate)); if (isset($master_array[($thisdate)]) && sizeof($master_array[($thisdate)]) > 0) { *************** *** 223,227 **** $rss .= '</item>'."\n"; } ! $thisdate = date("Ymd", strtotime($thisdate)+60*60*24); $i++; } while ($i <= $numdays); --- 224,228 ---- $rss .= '</item>'."\n"; } ! $thistime = $thistime+(60*60*24); # echo "$thisdate: ".strtotime($thisdate)."->$thistime<br>\n"; $i++; } while ($i <= $numdays); |
