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...> - 2008-12-20 00:12:00
|
Update of /cvsroot/phpicalendar/phpicalendar/rss In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22048/rss Modified Files: rss1.0.php rss2.0.php rss_common.php Log Message: fix rss link and dates Index: rss1.0.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss1.0.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** rss1.0.php 11 Dec 2008 21:54:53 -0000 1.7 --- rss1.0.php 20 Dec 2008 00:11:56 -0000 1.8 *************** *** 49,54 **** /* End guid modification */ $rss_item .= '<title>'.$rss_title.'</title>'."\n"; ! $rss_item .= '<ev:startdate>'.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).'</ev:startdate>'."\n"; ! $rss_item .= '<ev:enddate>'.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).'</ev:enddate>'."\n"; $rss_item .= '<link>'.$rss_link.'</link>'."\n"; --- 49,54 ---- /* End guid modification */ $rss_item .= '<title>'.$rss_title.'</title>'."\n"; ! $rss .= '<ev:startdate>'.date("Y-m-d\TH:i:s", $val["start_unixtime"]).'</ev:startdate>'."\n"; ! $rss .= '<ev:enddate>'.date("Y-m-d\TH:i:s", $val["end_unixtime"]).'</ev:enddate>'."\n"; $rss_item .= '<link>'.$rss_link.'</link>'."\n"; Index: rss2.0.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss2.0.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** rss2.0.php 11 Dec 2008 21:54:53 -0000 1.6 --- rss2.0.php 20 Dec 2008 00:11:56 -0000 1.7 *************** *** 61,66 **** /* End guid modification */ $rss .= '<title>'.$rss_title.'</title>'."\n"; ! $rss .= '<ev:startdate>'.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).'</ev:startdate>'."\n"; ! $rss .= '<ev:enddate>'.date("Y-m-d", strtotime($thisdate)).'T'.date("h:m:s",$val["event_start"]).'</ev:enddate>'."\n"; $rss .= '<link>'.$rss_link.'</link>'."\n"; --- 61,66 ---- /* End guid modification */ $rss .= '<title>'.$rss_title.'</title>'."\n"; ! $rss .= '<ev:startdate>'.date("Y-m-d\TH:i:s", $val["start_unixtime"]).'</ev:startdate>'."\n"; ! $rss .= '<ev:enddate>'.date("Y-m-d\TH:i:s", $val["end_unixtime"]).'</ev:enddate>'."\n"; $rss .= '<link>'.$rss_link.'</link>'."\n"; Index: rss_common.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/rss/rss_common.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rss_common.php 11 Dec 2008 21:56:09 -0000 1.1 --- rss_common.php 20 Dec 2008 00:11:56 -0000 1.2 *************** *** 182,188 **** if (isset($rss_link_to_event) && $rss_link_to_event == 'yes'){ $event_data = urlencode(serialize($val)); ! $rss_link = "$default_path/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data"; }else{ ! $rss_link = ("$default_path/day.php?getdate=$thisdate&cal=$urlcal"); } --- 182,188 ---- if (isset($rss_link_to_event) && $rss_link_to_event == 'yes'){ $event_data = urlencode(serialize($val)); ! $rss_link = $phpiCal_config->default_path."/includes/event.php?getdate=$thisdate&cal=$cal&event_data=$event_data"; }else{ ! $rss_link = ($phpiCal_config->default_path."/day.php?getdate=$thisdate&cal=$urlcal"); } |
|
From: <ji...@us...> - 2008-12-20 00:12:00
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22048 Modified Files: AUTHORS README Log Message: fix rss link and dates Index: AUTHORS =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/AUTHORS,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AUTHORS 15 Nov 2003 21:54:40 -0000 1.6 --- AUTHORS 20 Dec 2008 00:11:55 -0000 1.7 *************** *** 2,41 **** ------- This file is a list of all people who have contributed their time to the ! PHP iCalendar project. Each section is sorted alphabetically. Thanks to ! all who are listed here. PROJECT ADMINS -------------- ! Chad Little <chad at chadsdomain dot com> ! Patrick Crowley <patrick at icalshare dot com> DEVELOPERS ---------- ! Patrick Berry <pberry at mac dot com> ! Bill Fenner <fenner at research dot att dot com> ! David Reindl <dre at andare dot ch> ! Jared Wangen <xeo at silter dot org> CODE CONTRIBUTORS ----------------- ! Greg Westin <phpicalendar at gregwestin dot com> ! Blaine Cook <lattice at resist dot ca> ! Mike Traum <mtraum at yahoo dot com> TRANSLATORS ----------- ! Braz. Port. Bennet Wilton <suporte at bennetworks dot com dot br> ! Danish Henrik Højmark <styxx at worldonline dot dk> ! Jakob Peterhänsel <marook at creepers dot org> ! Dutch Lieven Gekiere <Lieven at gekiere dot com> ! English Chad Little <chad at chadsdomain dot com> ! Finnish Kari Somby <kari dot somby at ramk dot fi> ! French La Shampouineuse <info at lashampoo dot com> ! German David Reindl <dre at andare dot ch> ! Italian Luca Cacciagrano <clooka at clac dot it> ! Japanese Jared Wangen <jared at silter dot org> ! Norwegian Geir Kielland <geir dot kielland at jus dot uio dot no> ! Polish Stanislaw Cieslicki <stahoo at poczta dot onet dot pl> ! Portuguese Rui Costa <ruicosta at ubi dot pt> ! Spanish Javier Navarro <jnavarro at xips dot es> ! Swedish Jonas Hjelm <jonas at hnet dot se> --- 2,59 ---- ------- This file is a list of all people who have contributed their time to the ! PHP iCalendar project. Each section is sorted alphabetically dot Thanks to ! all who are listed here. ! ! PHP iCalendar was originally written and administered by Chad Little dot Jim Hu has been the main project admin since PROJECT ADMINS -------------- ! Jim Hu <phpicalendar at gmail dot com> DEVELOPERS ---------- ! Patrick Berry <pberry at mac dot com> ! Patrick Crowley <patrick at icalshare dot com> ! Bill Fenner <fenner at research dot att dot com> ! Jim Hu <phpicalendar at gmail dot com> ! Chad Little <chad at chadsdomain dot com> ! David Reindl <dre at andare dot ch> ! Jared Wangen <xeo at silter dot org> CODE CONTRIBUTORS ----------------- ! Greg Westin <phpicalendar at gregwestin dot com> ! Blaine Cook <lattice at resist dot ca> ! Mike Traum <mtraum at yahoo dot com> TRANSLATORS ----------- ! Braz.Port. Bennet Wilton <suporte at bennetworks dot com dot br> ! Bulgarian Georgi Kodinov <kgeorge at progem dot bg ! Croation Tihomir Cvetkovic <tihomir dot cvetkovic at gmail dot com> ! Danish Henrik Højmark <styxx at worldonline dot dk> ! Jakob Peterhänsel <marook at creepers dot org> ! Franck <reply at fronck dot dk> ! Dutch Lieven Gekiere <Lieven at gekiere dot com> ! English Chad Little <chad at chadsdomain dot com> ! English (UK) Markus Kuhn <Markus dot Kuhn at cl dot cam dot ac dot uk> ! Estonian Mikk Lainvoo <mikk at digesto dot ee> ! Finnish Kari Somby <kari dot somby at ramk dot fi> ! French La Shampouineuse <info at lashampoo dot com> ! Galego Manel Rives <ceipsigueiro at mac dot com ! German David Reindl <dre at andare dot ch> ! Markus Kuhn <Markus dot Kuhn at cl dot cam dot ac dot uk> ! Hungarian Gyula <meszaros dot gyula at mgyhardsoft dot hu> ! Italian Luca Cacciagrano <clooka at clac dot it> ! Indonesian Ronny as-Salafi <ronny dot assalafi at gmail dot com> ! Japanese Jared Wangen <jared at silter dot org> ! Korean Sang-un Chan <gomibak at gmail dot com> ! Norwegian Geir Kielland <geir dot kielland at jus dot uio dot no> ! Polish Stanislaw Cieslicki <stahoo at poczta dot onet dot pl> ! Portuguese Rui Costa <ruicosta at ubi dot pt> ! Luciano Antonio Costa <bits dot e dot bytes at gmail dot com> ! Slovak Jan Michalicka co...@ji... ! Spanish Javier Navarro <jnavarro at xips dot es> ! Luis Fernando Rocha <ludwig_von_rocht at yahoo dot com> ! Russian Sergey <1c@3555686 dot com> ! Swedish Jonas Hjelm <jonas at hnet dot se> Index: README =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/README,v retrieving revision 1.113 retrieving revision 1.114 diff -C2 -d -r1.113 -r1.114 *** README 22 May 2007 01:35:20 -0000 1.113 --- README 20 Dec 2008 00:11:55 -0000 1.114 *************** *** 89,92 **** --- 89,97 ---- Changes: -------- + 2.3 Major changes to recurrence handling + Added more languages + Added login to month view + Consolidated common rss functions + 2.24 Fix bug 1681711 - change how todo popups are handled |
|
From: <ji...@us...> - 2008-12-19 21:16:02
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554/includes Modified Files: login.php Log Message: add login to month view Index: login.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/login.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** login.php 2 Sep 2004 18:43:34 -0000 1.10 --- login.php 19 Dec 2008 21:15:53 -0000 1.11 *************** *** 2,6 **** // Hide the login block if logged in, there are no lock usernames, // or if authenticated via HTTP. ! if ($username == '' && $allow_login == 'yes' && !isset($_SERVER['PHP_AUTH_USER'])) { // Set the login table width if not set. if (!isset($login_width)) $login_width = "100%"; --- 2,6 ---- // Hide the login block if logged in, there are no lock usernames, // or if authenticated via HTTP. ! if ($username == '' && $phpiCal_config->allow_login == 'yes' && !isset($_SERVER['PHP_AUTH_USER'])) { // Set the login table width if not set. if (!isset($login_width)) $login_width = "100%"; |
|
From: <ji...@us...> - 2008-12-19 21:16:01
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554 Modified Files: month.php year.php Log Message: add login to month view Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.146 retrieving revision 1.147 diff -C2 -d -r1.146 -r1.147 *** month.php 17 Dec 2008 06:58:52 -0000 1.146 --- month.php 19 Dec 2008 21:15:53 -0000 1.147 *************** *** 47,50 **** --- 47,56 ---- $list_icals_pick = display_ical_list(availableCalendars($username, $password, $phpiCal_config->ALL_CALENDARS_COMBINED), TRUE); + // login/logout + $is_logged_in = ($username != '' && !$invalid_login) ? true : false; + $show_user_login = (!$is_logged_in && $phpiCal_config->allow_login == 'yes'); + $login_querys = login_querys(); + $logout_querys = logout_querys(); + $page = new Page(BASE.'templates/'.$phpiCal_config->template.'/month.tpl'); *************** *** 75,79 **** 'prev_month' => $prev_month, 'show_goto' => '', ! 'is_logged_in' => '', 'list_jumps' => $list_jumps, 'list_icals' => $list_icals, --- 81,90 ---- 'prev_month' => $prev_month, 'show_goto' => '', ! 'show_user_login' => $show_user_login, ! 'invalid_login' => $invalid_login, ! 'login_querys' => $login_querys, ! 'is_logged_in' => $is_logged_in, ! 'username' => $username, ! 'logout_querys' => $logout_querys, 'list_jumps' => $list_jumps, 'list_icals' => $list_icals, Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** year.php 16 Dec 2008 15:46:24 -0000 1.49 --- year.php 19 Dec 2008 21:15:53 -0000 1.50 *************** *** 37,41 **** // login/logout $is_logged_in = ($username != '' && !$invalid_login) ? true : false; ! $show_user_login = (!$is_logged_in && $allow_login == 'yes'); $login_querys = login_querys(); $logout_querys = logout_querys(); --- 37,41 ---- // login/logout $is_logged_in = ($username != '' && !$invalid_login) ? true : false; ! $show_user_login = (!$is_logged_in && $phpiCal_config->allow_login == 'yes'); $login_querys = login_querys(); $logout_querys = logout_querys(); *************** *** 79,83 **** 'prev_year' => $prev_year, 'show_goto' => '', ! 'show_user_login' => $phpiCal_config->show_user_login, 'invalid_login' => $invalid_login, 'login_querys' => $login_querys, --- 79,83 ---- 'prev_year' => $prev_year, 'show_goto' => '', ! 'show_user_login' => $show_user_login, 'invalid_login' => $invalid_login, 'login_querys' => $login_querys, |
|
From: <ji...@us...> - 2008-12-19 21:16:00
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554/functions Modified Files: userauth_functions.php Log Message: add login to month view Index: userauth_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/userauth_functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** userauth_functions.php 11 Dec 2008 21:54:52 -0000 1.6 --- userauth_functions.php 19 Dec 2008 21:15:53 -0000 1.7 *************** *** 97,101 **** // Check to make sure the username and password is valid. ! if (!array_key_exists("$username:$password", $phpiCal_config->locked_map)) { // Remember the invalid login, because we may want to display // a message elsewhere or check validity. --- 97,101 ---- // Check to make sure the username and password is valid. ! if (!array_key_exists("$username:$password", $locked_map)) { // Remember the invalid login, because we may want to display // a message elsewhere or check validity. |
|
From: <ji...@us...> - 2008-12-19 21:16:00
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/tan In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554/templates/tan Modified Files: calendar_nav.tpl Log Message: add login to month view Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/tan/calendar_nav.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calendar_nav.tpl 18 May 2007 19:03:09 -0000 1.1 --- calendar_nav.tpl 19 Dec 2008 21:15:53 -0000 1.2 *************** *** 66,69 **** --- 66,107 ---- </td> <td width="160" valign="top"> + <!-- switch show_user_login on --> + <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post"> + <input type="hidden" name="action" value="login" /> + <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> + <tr> + <td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td> + </tr> + <!-- switch invalid_login on --> + <tr> + <td colspan="2" bgcolor="#FFFFFF" align="left"> + <div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;"> + <font color="red">{L_INVALID_LOGIN}</font> + </div> + </td> + </tr> + <!-- switch invalid_login off --> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td> + </tr> + </table> + </form> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> + <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> + <!-- switch show_user_login off --> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr> *************** *** 83,87 **** <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a> <!-- switch is_logged_in off --> </div> --- 121,125 ---- <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a> <!-- switch is_logged_in off --> </div> |
|
From: <ji...@us...> - 2008-12-19 21:16:00
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/green In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554/templates/green Modified Files: calendar_nav.tpl Log Message: add login to month view Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/green/calendar_nav.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calendar_nav.tpl 18 May 2007 19:03:07 -0000 1.1 --- calendar_nav.tpl 19 Dec 2008 21:15:53 -0000 1.2 *************** *** 66,69 **** --- 66,107 ---- </td> <td width="160" valign="top"> + <!-- switch show_user_login on --> + <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post"> + <input type="hidden" name="action" value="login" /> + <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> + <tr> + <td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td> + </tr> + <!-- switch invalid_login on --> + <tr> + <td colspan="2" bgcolor="#FFFFFF" align="left"> + <div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;"> + <font color="red">{L_INVALID_LOGIN}</font> + </div> + </td> + </tr> + <!-- switch invalid_login off --> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td> + </tr> + </table> + </form> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> + <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> + <!-- switch show_user_login off --> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr> *************** *** 83,87 **** <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a> <!-- switch is_logged_in off --> </div> --- 121,125 ---- <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a> <!-- switch is_logged_in off --> </div> |
|
From: <ji...@us...> - 2008-12-19 21:15:59
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/red In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554/templates/red Modified Files: calendar_nav.tpl Log Message: add login to month view Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/red/calendar_nav.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calendar_nav.tpl 18 May 2007 19:03:08 -0000 1.1 --- calendar_nav.tpl 19 Dec 2008 21:15:53 -0000 1.2 *************** *** 66,69 **** --- 66,107 ---- </td> <td width="160" valign="top"> + <!-- switch show_user_login on --> + <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post"> + <input type="hidden" name="action" value="login" /> + <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> + <tr> + <td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td> + </tr> + <!-- switch invalid_login on --> + <tr> + <td colspan="2" bgcolor="#FFFFFF" align="left"> + <div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;"> + <font color="red">{L_INVALID_LOGIN}</font> + </div> + </td> + </tr> + <!-- switch invalid_login off --> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td> + </tr> + </table> + </form> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> + <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> + <!-- switch show_user_login off --> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr> *************** *** 83,87 **** <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a> <!-- switch is_logged_in off --> </div> --- 121,125 ---- <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a> <!-- switch is_logged_in off --> </div> |
|
From: <ji...@us...> - 2008-12-19 21:15:59
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/default In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554/templates/default Modified Files: calendar_nav.tpl Log Message: add login to month view Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/default/calendar_nav.tpl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** calendar_nav.tpl 16 Mar 2006 06:15:12 -0000 1.16 --- calendar_nav.tpl 19 Dec 2008 21:15:53 -0000 1.17 *************** *** 66,69 **** --- 66,107 ---- </td> <td width="160" valign="top"> + <!-- switch show_user_login on --> + <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post"> + <input type="hidden" name="action" value="login" /> + <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> + <tr> + <td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td> + </tr> + <!-- switch invalid_login on --> + <tr> + <td colspan="2" bgcolor="#FFFFFF" align="left"> + <div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;"> + <font color="red">{L_INVALID_LOGIN}</font> + </div> + </td> + </tr> + <!-- switch invalid_login off --> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td> + </tr> + </table> + </form> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> + <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> + <!-- switch show_user_login off --> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr> *************** *** 83,87 **** <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a> <!-- switch is_logged_in off --> </div> --- 121,125 ---- <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a> <!-- switch is_logged_in off --> </div> |
|
From: <ji...@us...> - 2008-12-19 21:15:59
|
Update of /cvsroot/phpicalendar/phpicalendar/templates/grey In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32554/templates/grey Modified Files: calendar_nav.tpl Log Message: add login to month view Index: calendar_nav.tpl =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/templates/grey/calendar_nav.tpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** calendar_nav.tpl 18 May 2007 19:03:08 -0000 1.1 --- calendar_nav.tpl 19 Dec 2008 21:15:53 -0000 1.2 *************** *** 66,69 **** --- 66,107 ---- </td> <td width="160" valign="top"> + <!-- switch show_user_login on --> + <form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post"> + <input type="hidden" name="action" value="login" /> + <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder"> + <tr> + <td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td> + </tr> + <!-- switch invalid_login on --> + <tr> + <td colspan="2" bgcolor="#FFFFFF" align="left"> + <div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;"> + <font color="red">{L_INVALID_LOGIN}</font> + </div> + </td> + </tr> + <!-- switch invalid_login off --> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td> + <td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td> + </tr> + <tr> + <td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style=padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td> + </tr> + </table> + </form> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + <td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td> + </tr> + </table> + <img src="images/spacer.gif" width="1" height="10" alt=" " /><br /> + <!-- switch show_user_login off --> <table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder"> <tr> *************** *** 83,87 **** <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a> <!-- switch is_logged_in off --> </div> --- 121,125 ---- <!-- switch display_download off --> <!-- switch is_logged_in on --> ! <a class="psf" href="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_LOGOUT} {USERNAME}</a> <!-- switch is_logged_in off --> </div> |
|
From: <ji...@us...> - 2008-12-18 09:22:29
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21010/functions Modified Files: ical_parser.php template.php Log Message: recurrence changes, add recur_tests calendars subdirectory, fix cpath Index: ical_parser.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v retrieving revision 1.225 retrieving revision 1.226 diff -C2 -d -r1.225 -r1.226 *** ical_parser.php 15 Dec 2008 17:25:27 -0000 1.225 --- ical_parser.php 18 Dec 2008 09:22:23 -0000 1.226 *************** *** 149,153 **** $url = ''; $type = ''; ! $wkst = 'SU'; $except_dates = array(); --- 149,153 ---- $url = ''; $type = ''; ! $wkst = 'MO'; $except_dates = array(); Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** template.php 15 Dec 2008 17:25:27 -0000 1.97 --- template.php 18 Dec 2008 09:22:23 -0000 1.98 *************** *** 947,951 **** $start2 = date($timeFormat_small, $val['start_unixtime']); if ($type == 'large') { ! $switch['EVENT'] .= '<div class="V9"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />'; $switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 10, 'ps3', "$start2 ").''; $switch['EVENT'] .= (isset($val['location']) && $val['location'] != '') ? "<br />".$val['location']."<br />" : ''; --- 947,951 ---- $start2 = date($timeFormat_small, $val['start_unixtime']); if ($type == 'large') { ! @$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$phpiCal_config->template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />'; $switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 10, 'ps3', "$start2 ").''; $switch['EVENT'] .= (isset($val['location']) && $val['location'] != '') ? "<br />".$val['location']."<br />" : ''; |
|
From: <ji...@us...> - 2008-12-18 09:22:29
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/init In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21010/functions/init Modified Files: cpaths.php Log Message: recurrence changes, add recur_tests calendars subdirectory, fix cpath Index: cpaths.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/cpaths.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cpaths.php 12 Dec 2008 00:08:47 -0000 1.2 --- cpaths.php 18 Dec 2008 09:22:23 -0000 1.3 *************** *** 29,30 **** --- 29,31 ---- $list_webcals = array_merge($phpiCal_config->list_webcals, $phpiCal_config->more_webcals["$cpath"]); } + $phpiCal_config->setProperty('calendar_path',$calendar_path); \ No newline at end of file |
|
From: <ji...@us...> - 2008-12-18 09:22:29
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21010/functions/parse Modified Files: end_vevent.php recur_functions.php Log Message: recurrence changes, add recur_tests calendars subdirectory, fix cpath Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** end_vevent.php 17 Dec 2008 09:58:30 -0000 1.8 --- end_vevent.php 18 Dec 2008 09:22:23 -0000 1.9 *************** *** 243,247 **** $recur_data = array(); while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { ! $year = date('Y', $next_range_unixtime); $month = date('m', $next_range_unixtime); $time = mktime(12,0,0,$month,date("d",$start_unixtime),$year); --- 243,247 ---- $recur_data = array(); while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { ! $year = date("Y", $next_range_unixtime); $month = date('m', $next_range_unixtime); $time = mktime(12,0,0,$month,date("d",$start_unixtime),$year); *************** *** 254,258 **** break; case 'month': ! $times = expand_bymonthday(array($time)); foreach($times as $time){ add_recur(expand_byday($time)); --- 254,259 ---- break; case 'month': ! if(!empty($bymonthday)) $time = mktime(12,0,0,$month,1,$year); ! $times = expand_bymonthday(array($time));#echo "\n $month exp bymonthday";dump_times($times); foreach($times as $time){ add_recur(expand_byday($time)); *************** *** 261,267 **** case 'year': $times = expand_bymonth($time); #echo "exp bymonth";dump_times($times); ! $times = expand_byweekno($times); #echo "exp bymonth";dump_times($times); ! $times = expand_byyearday($times); #echo "exp bymonth";dump_times($times); ! $times = expand_bymonthday($times); #echo "exp bymonthday";dump_times($times); foreach($times as $time){ add_recur(expand_byday($time)); --- 262,268 ---- case 'year': $times = expand_bymonth($time); #echo "exp bymonth";dump_times($times); ! $times = expand_byweekno($times); #echo "exp byweekno";dump_times($times); ! $times = expand_byyearday($times); #echo "exp byyearday";dump_times($times); ! $times = expand_bymonthday($times); #echo "\nexp bymonthday";dump_times($times); foreach($times as $time){ add_recur(expand_byday($time)); Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** recur_functions.php 17 Dec 2008 09:58:30 -0000 1.7 --- recur_functions.php 18 Dec 2008 09:22:23 -0000 1.8 *************** *** 28,62 **** global $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$end_range_unixtime; if (!is_array($times)) $times = array($times); - #echo "add_recur";dump_times($times); /*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS*/ $times = restrict_bymonth($times,$freq); ! $times = restrict_byweekno($times,$freq); $times = restrict_byyearday($times,$freq); $times = restrict_bymonthday($times,$freq); $times = restrict_byday($times,$freq); - $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos"; if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime; $times = array_unique($times); sort($times); $until_date = date("Ymd",$end_range_unixtime); - #dump_times($times); - #dump_times($recur_data); foreach ($times as $time){ #echo "time:". date("Ymd",$time)."\n"; $date = date("Ymd",$time); $time = strtotime("$date 12:00:00"); ! if(isset($time) && !in_array($time, $recur_data) && !in_array($date, $except_dates) && $time >= $start_date_unixtime && $date <= $until_date){ ! $count--; #echo "."; ! if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time; } } return; } function expand_bymonth($time){ ! global $bymonth, $year, $start_unixtime; if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); foreach ($bymonth as $m){ ! $time = mktime(12,0,0,$m,date("d",$start_unixtime),$year); #echo "exm:".date("Ymd",$time)."\n"; $times[] = $time; } --- 28,67 ---- global $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$end_range_unixtime; if (!is_array($times)) $times = array($times); /*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS*/ $times = restrict_bymonth($times,$freq); ! # $times = restrict_byweekno($times,$freq); $times = restrict_byyearday($times,$freq); $times = restrict_bymonthday($times,$freq); $times = restrict_byday($times,$freq); if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime; + $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos"; $times = array_unique($times); sort($times); $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ #echo "time:". date("Ymd",$time)."\n"; $date = date("Ymd",$time); $time = strtotime("$date 12:00:00"); ! if(isset($time) && !in_array($time, $recur_data) && ! !in_array($date, $except_dates) && $time >= $start_date_unixtime && $date <= $until_date){ ! $count--; #echo "\n.$count\n"; ! if($time >= $mArray_begin && ! $time <= $mArray_end ! && $count >= 0 ! ) $recur_data[] = $time; } } + #dump_times($recur_data); return; } function expand_bymonth($time){ ! global $bymonth, $byweekno, $bymonthday, $year, $start_unixtime, $freq_type; ! if(!empty($byweekno)) return $times; if(empty($bymonth)) $bymonth = array(date("m", $start_unixtime)); + $d = date("d",$start_unixtime); + if (!empty($bymonthday)) $d = 1; foreach ($bymonth as $m){ ! $time = mktime(12,0,0,$m,$d,$year); #echo "exm:".date("Ymd",$time)."\n"; $times[] = $time; } *************** *** 64,78 **** } function expand_byweekno($times){ ! global $byweekno, $year; if (empty($byweekno)) return $times; ! $py = $year-1; ! $ny = $year+1; ! foreach($times as $time){ ! foreach($byweekno as $weekno){ ! if($yearday >= 0) $day = strtotime("Jan 1 $year +$weekno weeks"); ! else $day = strtotime("Jan 1 $year $weekno weeks"); ! if(date("Y",$day == $year)) $new_times[] = $day; ! } ! } return $new_times; } --- 69,86 ---- } function expand_byweekno($times){ ! global $byweekno, $year, $freq_type, $wkst, $wkst3char; ! # byweekno is only used when repeat is yearly ! # when it's set, the input times are irrelevant ! # it also needs a byday. ! if ($freq_type != 'year') return $times; if (empty($byweekno)) return $times; ! $total_weeks = date("W",mktime(12,0,0,12,24,$year) ) +1; ! $w1_start = strtotime("this $wkst3char", mktime(12,0,0,1,1,$year) ); ! foreach($byweekno as $weekno){ ! if($weekno < 0) $weekno = $weekno + $total_weeks; ! #echo "\n $wkst3char w1st:".date("Ymd", $w1_start)." ".date("Ymd", mktime(12,0,0,1,1,$year))." weekno:$weekno"; ! $new_times[] = strtotime("+".(($weekno-1)*7)."days",$w1_start); ! } ! #dump_times($new_times); return $new_times; } *************** *** 83,93 **** $py = $year-1; $ny = $year+1; foreach($times as $time){ foreach($byyearday as $yearday){ ! if($yearday > 0) $day = strtotime("Dec 31 $py +$yearday days"); ! else $day = strtotime("Jan 1 $ny $yearday days"); if(date("Y",$day == $year)) $new_times[] = $day; } ! } return $new_times; } --- 91,103 ---- $py = $year-1; $ny = $year+1; + $new_times = array(); foreach($times as $time){ foreach($byyearday as $yearday){ ! if($yearday > 0){ $day = strtotime("+$yearday days Dec 31, $py");#echo "\n".date("Ymd",$day)." = +$yearday days Dec 31, $py"; ! }else $day = strtotime("Jan 1 $ny $yearday days"); if(date("Y",$day == $year)) $new_times[] = $day; } ! } ! # dump_times($new_times); return $new_times; } *************** *** 108,112 **** function expand_byday($time){ ! global $freq_type, $byday, $wkst3char, $year, $month, $start_unixtime,$summary; if (empty($byday)) return array($time); $times = array(); --- 118,122 ---- function expand_byday($time){ ! global $freq_type, $byday, $bymonth,$byweekno, $wkst3char, $year, $month, $start_unixtime, $summary; if (empty($byday)) return array($time); $times = array(); *************** *** 120,124 **** [3] => TH day abbr */ ! ereg ('([-\+]{0,1})?([0-9]{1})?([A-Z]{2})', $day, $byday_arr); $on_day = two2threeCharDays($byday_arr[3]); switch($freq_type){ --- 130,134 ---- [3] => TH day abbr */ ! ereg ('([-\+]{0,1})?([0-9]+)?([A-Z]{2})', $day, $byday_arr); $on_day = two2threeCharDays($byday_arr[3]); switch($freq_type){ *************** *** 129,143 **** break; case 'month': case 'year': ! $week_arr = array(1,2,3,4,5); ! if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); ! $month_start = strtotime(date("Ym00",$time)); ! $month_end = strtotime(date("Ymt",$time))+ (36 * 60 * 60); ! foreach($week_arr as $week){ ! # echo "<pre>$summary".$byday_arr[1].$week.$on_day,date("Ymd",$month_start)."\n"; ! if($byday_arr[1] == '-') $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_end); ! else $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start); ! # check that we're still in the same month ! if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; } break; --- 139,164 ---- break; case 'month': + $time = mktime(12,0,0,$month,1,$year); case 'year': ! if(empty($byweekno)){ ! $week_arr = array(1,2,3,4,5); ! if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); ! $month_start = strtotime(date("Ym00",$time)); ! $month_end = strtotime(date("Ymt",$time))+ (36 * 60 * 60); ! if($freq_type == 'year' && empty($bymonth)){ ! $month_start = mktime(12,0,0,1,0,$year); ! $month_end = mktime(12,0,0,1,1,$year+1); ! } ! foreach($week_arr as $week){ ! #echo "<pre>$summary ".$byday_arr[1].$week.$on_day." st:".date("Ymd",$month_start)." t:".date("Ymd",$time)."\n"; ! if($byday_arr[1] == '-') $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_end); ! else $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start); ! # check that we're still in the same month ! if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; ! } ! }else{ ! # byweekno should act like freq_type = week ! $next_date_time = strtotime("this $on_day",strtotime($the_sunday)) + (12 * 60 * 60); ! $times[] = $next_date_time; } break; *************** *** 153,158 **** function restrict_bymonth($times,$freq=''){ ! global $bymonth; ! if (empty($bymonth)) return $times; $new_times=array(); foreach ($times as $time){ --- 174,179 ---- function restrict_bymonth($times,$freq=''){ ! global $bymonth, $byyearday; ! if (empty($bymonth) || !empty($byyearday)) return $times; $new_times=array(); foreach ($times as $time){ *************** *** 180,185 **** } $yearday_arr[] = $yearday; ! } ! if(in_array(date("z", $time), $yearday_arr)) $new_times[] = $time; } return $new_times; --- 201,207 ---- } $yearday_arr[] = $yearday; ! } ! # date(z,$time) gives 0 for Jan 1 ! if(in_array((date("z", $time)+1), $yearday_arr)) $new_times[] = $time; } return $new_times; *************** *** 218,227 **** function restrict_bysetpos($times,$freq=''){ ! global $rrule_array, $bysetpos; if(empty($bysetpos)) return $times; ! $new_times=array(); ! $n = count($times); foreach($bysetpos as $setpos){ ! $new_times[] = array_slice($times, $setpos, 1); } return $new_times; --- 240,249 ---- function restrict_bysetpos($times,$freq=''){ ! global $bysetpos; if(empty($bysetpos)) return $times; ! sort($times); ! $new_times=array(); foreach($bysetpos as $setpos){ ! $new_times[] = implode('',array_slice($times, $setpos, 1)); } return $new_times; *************** *** 232,236 **** global $summary; echo "<pre>$summary times:"; ! var_dump($times); foreach($times as $time) echo "\ndate:".date("Ymd his",$time); echo "</pre>"; --- 254,258 ---- global $summary; echo "<pre>$summary times:"; ! #var_dump($times); foreach($times as $time) echo "\ndate:".date("Ymd his",$time); echo "</pre>"; |
Update of /cvsroot/phpicalendar/phpicalendar/calendars/recur_tests In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21010/calendars/recur_tests Added Files: ex_set1.ics ex_set2.ics ex_set3.ics ex_set4.ics ex_set5.ics ex_set6.ics Log Message: recurrence changes, add recur_tests calendars subdirectory, fix cpath --- NEW FILE: ex_set1.ics --- BEGIN:VCALENDAR VERSION:2.0 X-WR-CALNAME:recur example set 1 PRODID:-//Apple Computer\, Inc//iCal 2.0//EN X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD X-WR-TIMEZONE:US/Pacific CALSCALE:GREGORIAN METHOD:PUBLISH BEGIN:VTIMEZONE TZID:US/Pacific LAST-MODIFIED:20081210T165454Z BEGIN:STANDARD DTSTART:20081102T090000 TZOFFSETTO:-0800 TZOFFSETFROM:+0000 TZNAME:PST END:STANDARD BEGIN:DAYLIGHT DTSTART:20090308T010000 TZOFFSETTO:-0700 TZOFFSETFROM:-0800 TZNAME:PDT END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Daily for 10 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=DAILY;COUNT=10 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Daily until December 24, 1997 STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=DAILY;UNTIL=19971224T000000Z END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every other day - forever STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=DAILY;INTERVAL=2 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every 10 days, 5 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=DAILY;INTERVAL=10;COUNT=5 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every day in Jan 3 years STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19980101T090000 RRULE:FREQ=YEARLY;UNTIL=20000131T090000Z; BYMONTH=1;BYDAY=SU,MO,TU,WE,TH,FR,SA END:VEVENT END:VCALENDAR --- NEW FILE: ex_set2.ics --- BEGIN:VCALENDAR VERSION:2.0 X-WR-CALNAME:recur example set 2 PRODID:-//Apple Computer\, Inc//iCal 2.0//EN X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD X-WR-TIMEZONE:US/Pacific CALSCALE:GREGORIAN METHOD:PUBLISH BEGIN:VTIMEZONE TZID:US/Pacific LAST-MODIFIED:20081210T165454Z BEGIN:STANDARD DTSTART:20081102T090000 TZOFFSETTO:-0800 TZOFFSETFROM:+0000 TZNAME:PST END:STANDARD BEGIN:DAYLIGHT DTSTART:20090308T010000 TZOFFSETTO:-0700 TZOFFSETFROM:-0800 TZNAME:PDT END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every day in Jan 3 years (alt) STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19980101T090000 RRULE:FREQ=DAILY;UNTIL=20000131T090000Z;BYMONTH=1 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Weekly for 10 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=WEEKLY;COUNT=10 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Weekly until December 24, 1997 STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=WEEKLY;UNTIL=19971224T000000Z END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every other week - forever STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=WEEKLY;INTERVAL=2;WKST=SU END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Weekly on Tuesday and Thursday for 5 weeks - goes 1 extra? STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=WEEKLY;UNTIL=19971007T000000Z;WKST=SU;BYDAY=TU,TH END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Weekly on Tuesday and Thursday for 5 weeks (alt) STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=WEEKLY;COUNT=10;WKST=SU;BYDAY=TU,TH END:VEVENT END:VCALENDAR --- NEW FILE: ex_set3.ics --- BEGIN:VCALENDAR VERSION:2.0 X-WR-CALNAME:recur example set 3 PRODID:-//Apple Computer\, Inc//iCal 2.0//EN X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD X-WR-TIMEZONE:US/Pacific CALSCALE:GREGORIAN METHOD:PUBLISH BEGIN:VTIMEZONE TZID:US/Pacific LAST-MODIFIED:20081210T165454Z BEGIN:STANDARD DTSTART:20081102T090000 TZOFFSETTO:-0800 TZOFFSETFROM:+0000 TZNAME:PST END:STANDARD BEGIN:DAYLIGHT DTSTART:20090308T010000 TZOFFSETTO:-0700 TZOFFSETFROM:-0800 TZNAME:PDT END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every other week on Monday, Wednesday and Friday until December 24, 1997, but starting on Tuesday, September 2, 1997 STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;WKST=SU;BYDAY=MO,WE,FR END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every other week on Tuesday and Thursday, for 8 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Pacific:19970902T090000 RRULE:FREQ=WEEKLY;INTERVAL=2;COUNT=8;WKST=SU;BYDAY=TU,TH END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Monthly on the 1st Friday for ten occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970905T090000 RRULE:FREQ=MONTHLY;COUNT=10;BYDAY=1FR END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Monthly on the 1st Friday until December 24, 1997 STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970905T090000 RRULE:FREQ=MONTHLY;UNTIL=19971224T000000Z;BYDAY=1FR END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every other month on the 1st and last Sunday of the month for 10 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970907T090000 RRULE:FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU END:VEVENT END:VCALENDAR BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Monthly on the second to last Monday of the month for 6 months STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970922T090000 RRULE:FREQ=MONTHLY;COUNT=6;BYDAY=-2MO END:VEVENT END:VCALENDAR --- NEW FILE: ex_set4.ics --- BEGIN:VCALENDAR VERSION:2.0 X-WR-CALNAME:recur example set 4 PRODID:-//Apple Computer\, Inc//iCal 2.0//EN X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD X-WR-TIMEZONE:US/Pacific CALSCALE:GREGORIAN METHOD:PUBLISH BEGIN:VTIMEZONE TZID:US/Pacific LAST-MODIFIED:20081210T165454Z BEGIN:STANDARD DTSTART:20081102T090000 TZOFFSETTO:-0800 TZOFFSETFROM:+0000 TZNAME:PST END:STANDARD BEGIN:DAYLIGHT DTSTART:20090308T010000 TZOFFSETTO:-0700 TZOFFSETFROM:-0800 TZNAME:PDT END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Monthly on the third to the last day of the month, forever STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970928T090000 RRULE:FREQ=MONTHLY;BYMONTHDAY=-3 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Monthly on the 2nd and 15th of the month for 10 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=MONTHLY;COUNT=10;BYMONTHDAY=2,15 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every 18 months on the 10th thru 15th of the month for 10 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970910T090000 RRULE:FREQ=MONTHLY;INTERVAL=18;COUNT=10;BYMONTHDAY=10,11,12,13,14,15 END:VEVENT END:VCALENDAR BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every Tuesday, every other month STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970902T090000 RRULE:FREQ=MONTHLY;INTERVAL=2;BYDAY=TU END:VEVENT END:VCALENDAR BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Yearly in June and July for 10 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970610T090000 RRULE:FREQ=YEARLY;COUNT=10;BYMONTH=6,7 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every other year on January, February, and March for 10 occurrences STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970310T090000 RRULE:FREQ=YEARLY;INTERVAL=2;COUNT=10;BYMONTH=1,2,3 END:VEVENT END:VCALENDAR --- NEW FILE: ex_set5.ics --- BEGIN:VCALENDAR VERSION:2.0 X-WR-CALNAME:recur example set 5 PRODID:-//Apple Computer\, Inc//iCal 2.0//EN X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD X-WR-TIMEZONE:US/Pacific CALSCALE:GREGORIAN METHOD:PUBLISH BEGIN:VTIMEZONE TZID:US/Pacific LAST-MODIFIED:20081210T165454Z BEGIN:STANDARD DTSTART:20081102T090000 TZOFFSETTO:-0800 TZOFFSETFROM:+0000 TZNAME:PST END:STANDARD BEGIN:DAYLIGHT DTSTART:20090308T010000 TZOFFSETTO:-0700 TZOFFSETFROM:-0800 TZNAME:PDT END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every 3rd year on the 1st, 100th and 200th day for 10 occurrences: STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970101T090000 RRULE:FREQ=YEARLY;INTERVAL=3;COUNT=10;BYYEARDAY=1,100,200 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every 20th Monday of the year, forever: STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970519T090000 RRULE:FREQ=YEARLY;BYDAY=20MO END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Monday of week number 20 (where the default start of the week is Monday), forever STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970512T090000 RRULE:FREQ=YEARLY;BYWEEKNO=20;BYDAY=MO END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every Thursday in March, forever: STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970313T090000 RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=TH END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every Thursday, but only during June, July, and August, forever STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970605T090000 RRULE:FREQ=YEARLY;BYDAY=TH;BYMONTH=6,7,8 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every Friday the 13th, forever STATUS:CONFIRMED DURATION:PT1H30M EXDATE;TZID=US/Eastern:19970902T090000 RRULE:FREQ=MONTHLY;BYDAY=FR;BYMONTHDAY=13 END:VEVENT END:VCALENDAR --- NEW FILE: ex_set6.ics --- BEGIN:VCALENDAR VERSION:2.0 X-WR-CALNAME:recur example set 6 PRODID:-//Apple Computer\, Inc//iCal 2.0//EN X-WR-RELCALID:E47AF849-67C8-49F0-AA36-9FD7495400FD X-WR-TIMEZONE:US/Pacific CALSCALE:GREGORIAN METHOD:PUBLISH BEGIN:VTIMEZONE TZID:US/Pacific LAST-MODIFIED:20081210T165454Z BEGIN:STANDARD DTSTART:20081102T090000 TZOFFSETTO:-0800 TZOFFSETFROM:+0000 TZNAME:PST END:STANDARD BEGIN:DAYLIGHT DTSTART:20090308T010000 TZOFFSETTO:-0700 TZOFFSETFROM:-0800 TZNAME:PDT END:DAYLIGHT END:VTIMEZONE BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:The first Saturday that follows the first Sunday of the month, forever STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970913T090000 RRULE:FREQ=MONTHLY;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13 END:VEVENT BEGIN:VEVENT SEQUENCE:7 DTSTAMP:20020918T224617Z SUMMARY:Every four years, the first Tuesday after a Monday in November, forever (U.S. Presidential Election day): STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19961105T090000 RRULE:FREQ=YEARLY;INTERVAL=4;BYMONTH=11;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8 END:VEVENT BEGIN:VEVENT DTSTAMP:20020918T224617Z SUMMARY:The 3rd instance into the month of one of Tuesday, Wednesday or Thursday, for the next 3 months STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970904T090000 RRULE:FREQ=MONTHLY;COUNT=3;BYDAY=TU,WE,TH;BYSETPOS=3 END:VEVENT BEGIN:VEVENT DTSTAMP:20020918T224617Z SUMMARY:The 2nd to last weekday of the month STATUS:CONFIRMED DURATION:PT1H30M DTSTART;TZID=US/Eastern:19970929T090000 RRULE:FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2 END:VEVENT END:VCALENDAR |
|
From: <ji...@us...> - 2008-12-18 09:15:49
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars/recur_tests In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20097/calendars/recur_tests Log Message: Directory /cvsroot/phpicalendar/phpicalendar/calendars/recur_tests added to the repository |
|
From: <ji...@us...> - 2008-12-17 09:58:37
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14616/functions/parse Modified Files: end_vevent.php recur_functions.php Log Message: progress on recurrence handle some negative values in byxxx rules Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** end_vevent.php 17 Dec 2008 06:58:53 -0000 1.7 --- end_vevent.php 17 Dec 2008 09:58:30 -0000 1.8 *************** *** 278,283 **** /* ============================ Use $recur_data array to write the master array ============================*/ // This used to use 5 different blocks to write the array... can it be reduced further? ! $recur_data_hour = @substr($start_unixtime,0,2); ! $recur_data_minute = @substr($start_unixtime,2,2); foreach($recur_data as $recur_data_unixtime) { $recur_data_year = date('Y', $recur_data_unixtime); --- 278,283 ---- /* ============================ Use $recur_data array to write the master array ============================*/ // This used to use 5 different blocks to write the array... can it be reduced further? ! $recur_data_hour = @substr($start_time,0,2); ! $recur_data_minute = @substr($start_time,2,2); foreach($recur_data as $recur_data_unixtime) { $recur_data_year = date('Y', $recur_data_unixtime); Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** recur_functions.php 17 Dec 2008 07:07:57 -0000 1.6 --- recur_functions.php 17 Dec 2008 09:58:30 -0000 1.7 *************** *** 1,3 **** ! <?php /* from the std --- 1,3 ---- ! <?php /* from the std *************** *** 25,29 **** function add_recur($times,$freq=''){ ! global $recur_data, $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$end_range_unixtime; if (!is_array($times)) $times = array($times); #echo "add_recur";dump_times($times); --- 25,30 ---- function add_recur($times,$freq=''){ ! global $recur_data; ! global $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$end_range_unixtime; if (!is_array($times)) $times = array($times); #echo "add_recur";dump_times($times); *************** *** 35,48 **** $times = restrict_bymonthday($times,$freq); $times = restrict_byday($times,$freq); ! $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";dump_times($times); ! $times[] = $start_date_unixtime; $times = array_unique($times); sort($times); $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ ! #echo "time:". date("Ymd",$time); $date = date("Ymd",$time); ! if(isset($time) && !in_array($date, $except_dates) && $time >= $start_date_unixtime && $date <= $until_date){ ! $count--; if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time; } --- 36,52 ---- $times = restrict_bymonthday($times,$freq); $times = restrict_byday($times,$freq); ! $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos"; ! if($start_date_unixtime > $mArray_begin) $times[] = $start_date_unixtime; $times = array_unique($times); sort($times); $until_date = date("Ymd",$end_range_unixtime); + #dump_times($times); + #dump_times($recur_data); foreach ($times as $time){ ! #echo "time:". date("Ymd",$time)."\n"; $date = date("Ymd",$time); ! $time = strtotime("$date 12:00:00"); ! if(isset($time) && !in_array($time, $recur_data) && !in_array($date, $except_dates) && $time >= $start_date_unixtime && $date <= $until_date){ ! $count--; #echo "."; if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time; } *************** *** 95,98 **** --- 99,103 ---- $month = date('m',$time); foreach($bymonthday as $monthday){ + if($monthday < 0) $monthday = date("t",$time) + $monthday +1; $new_times[] = mktime(12,0,0,$month,$monthday,$year); #echo "monthday:$monthday\n"; *************** *** 128,134 **** if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); $month_start = strtotime(date("Ym00",$time)); foreach($week_arr as $week){ ! #echo "<pre>$summary".$byday_arr[1].$week.$on_day,date("Ymd",$month_start)."\n"; ! $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start); # check that we're still in the same month if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; --- 133,141 ---- if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); $month_start = strtotime(date("Ym00",$time)); + $month_end = strtotime(date("Ymt",$time))+ (36 * 60 * 60); foreach($week_arr as $week){ ! # echo "<pre>$summary".$byday_arr[1].$week.$on_day,date("Ymd",$month_start)."\n"; ! if($byday_arr[1] == '-') $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_end); ! else $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start); # check that we're still in the same month if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; *************** *** 166,170 **** if(empty($byyearday)) return $times; $new_times=array(); ! foreach ($times as $time) if(in_array(date("z", $time), $byyearday)) $new_times[] = $time; return $new_times; } --- 173,186 ---- if(empty($byyearday)) return $times; $new_times=array(); ! foreach ($times as $time){ ! foreach ($byyearday as $yearday){ ! if($yearday < 0){ ! $yearday = 365 + $yearday +1; ! if(date("L",$time)) $yearday += 1; ! } ! $yearday_arr[] = $yearday; ! } ! if(in_array(date("z", $time), $yearday_arr)) $new_times[] = $time; ! } return $new_times; } *************** *** 174,178 **** if(empty($bymonthday)) return $times; $new_times=array(); ! foreach ($times as $time) if(in_array(date("j", $time), $bymonthday)) $new_times[] = $time; return $new_times; } --- 190,200 ---- if(empty($bymonthday)) return $times; $new_times=array(); ! foreach ($times as $time){ ! foreach ($bymonthday as $monthday){ ! if($monthday < 0) $monthday = date("t",$time) + $monthday +1; ! $monthday_arr[] = $monthday; ! } ! if(in_array(date("j", $time), $monthday_arr)) $new_times[] = $time; ! } return $new_times; } |
|
From: <ji...@us...> - 2008-12-17 09:58:37
|
Update of /cvsroot/phpicalendar/phpicalendar/includes In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14616/includes Modified Files: event.php Log Message: progress on recurrence handle some negative values in byxxx rules Index: event.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** event.php 16 Feb 2007 07:54:43 -0000 1.41 --- event.php 17 Dec 2008 09:58:30 -0000 1.42 *************** *** 76,79 **** --- 76,81 ---- $event['status'] = $lang['l_status_tentative'] ; break; + default: + $event['status'] = '' ; } |
|
From: <ji...@us...> - 2008-12-17 07:08:02
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6194/functions/parse Modified Files: recur_functions.php Log Message: progress on recurrence until Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** recur_functions.php 17 Dec 2008 06:58:53 -0000 1.5 --- recur_functions.php 17 Dec 2008 07:07:57 -0000 1.6 *************** *** 25,29 **** function add_recur($times,$freq=''){ ! global $recur_data, $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$until_unixtime; if (!is_array($times)) $times = array($times); #echo "add_recur";dump_times($times); --- 25,29 ---- function add_recur($times,$freq=''){ ! global $recur_data, $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$end_range_unixtime; if (!is_array($times)) $times = array($times); #echo "add_recur";dump_times($times); *************** *** 39,43 **** $times = array_unique($times); sort($times); ! $until_date = date("Ymd",$until_unixtime); foreach ($times as $time){ #echo "time:". date("Ymd",$time); --- 39,43 ---- $times = array_unique($times); sort($times); ! $until_date = date("Ymd",$end_range_unixtime); foreach ($times as $time){ #echo "time:". date("Ymd",$time); |
|
From: <ji...@us...> - 2008-12-17 06:58:59
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5407/functions/parse Modified Files: end_vevent.php recur_functions.php Log Message: progress on recurrence:until and byday changes Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** end_vevent.php 16 Dec 2008 19:48:23 -0000 1.6 --- end_vevent.php 17 Dec 2008 06:58:53 -0000 1.7 *************** *** 213,217 **** #conditions where we can not iterate over the whole range ! if($count == 1000000 && $interval == 1) $next_range_unixtime = $mArray_begin; // if the beginning of our range is less than the start of the item, we may as well set it equal to it if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime; --- 213,228 ---- #conditions where we can not iterate over the whole range ! if($count == 1000000){ ! if($interval == 1) { ! $next_range_unixtime = $mArray_begin; ! }else{ ! # can we calculate the right start time? ! # pick the right compare function from date_functions.php ! # $diff is the number of occurrences between start_date and next_range_time ! # $func = $freq_type.'Compare'; ! # $diff = $func(date('Ymd',strtotime($getdate)), $start_date); ! # $next_range_unixtime = strtotime('+'.$diff*$interval.' '.$freq_type, $start_date_unixtime); echo "<pre>$summary\nnext $freq_type $diff $freq_type".date("Ymd",$start_date_unixtime)."\n"; ! } ! } // if the beginning of our range is less than the start of the item, we may as well set it equal to it if ($next_range_unixtime < $start_date_unixtime) $next_range_unixtime = $start_date_unixtime; *************** *** 219,223 **** if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; if($freq_type == 'year') $end_range_unixtime += 366*24*60*60; ! if(!isset($rrule_array['FREQ'])){ $end_range_unixtime = strtotime($end_date); $count = 1; --- 230,234 ---- if(isset($until) && $end_range_unixtime > $until_unixtime) $end_range_unixtime = $until_unixtime; if($freq_type == 'year') $end_range_unixtime += 366*24*60*60; ! if(!isset($rrule_array['FREQ']) && isset($end_date)){ $end_range_unixtime = strtotime($end_date); $count = 1; *************** *** 229,241 **** one $next_range_time per repeat, but the BYXXX rules may write more than one event in that repeat cycle $next_date_time handles those instances within a $freq_type */ ! #echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tstart range time:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n"; $recur_data = array(); while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { $year = date('Y', $next_range_unixtime); $month = date('m', $next_range_unixtime); - # pick the right compare function from date_functions.php - # $diff is the number of occurrences between start_date and next_range_time - $func = $freq_type.'Compare'; - $diff = $func(date('Ymd',$next_range_time), $start_date); $time = mktime(12,0,0,$month,date("d",$start_unixtime),$year); switch ($freq_type){ --- 240,248 ---- one $next_range_time per repeat, but the BYXXX rules may write more than one event in that repeat cycle $next_date_time handles those instances within a $freq_type */ ! #echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tnext_range_unixtime:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n"; $recur_data = array(); while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { $year = date('Y', $next_range_unixtime); $month = date('m', $next_range_unixtime); $time = mktime(12,0,0,$month,date("d",$start_unixtime),$year); switch ($freq_type){ Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** recur_functions.php 16 Dec 2008 19:48:23 -0000 1.4 --- recur_functions.php 17 Dec 2008 06:58:53 -0000 1.5 *************** *** 25,37 **** function add_recur($times,$freq=''){ ! global $recur_data, $count, $mArray_begin, $mArray_end, $except_dates; if (!is_array($times)) $times = array($times); - $times = array_unique($times); - sort($times); #echo "add_recur";dump_times($times); /*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS*/ $times = restrict_bymonth($times,$freq); - $times = restrict_byweekno($times,$freq); $times = restrict_byyearday($times,$freq); --- 25,34 ---- function add_recur($times,$freq=''){ ! global $recur_data, $count, $mArray_begin, $mArray_end, $except_dates, $start_date_unixtime,$until_unixtime; if (!is_array($times)) $times = array($times); #echo "add_recur";dump_times($times); /*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS*/ $times = restrict_bymonth($times,$freq); $times = restrict_byweekno($times,$freq); $times = restrict_byyearday($times,$freq); *************** *** 39,47 **** $times = restrict_byday($times,$freq); $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";dump_times($times); ! foreach ($times as $time){ #echo "time:". date("Ymd",$time); ! if(isset($time) && !in_array(date("Ymd",$time), $except_dates)) $count--; ! if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time; } return; --- 36,50 ---- $times = restrict_byday($times,$freq); $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";dump_times($times); ! $times[] = $start_date_unixtime; ! $times = array_unique($times); ! sort($times); ! $until_date = date("Ymd",$until_unixtime); foreach ($times as $time){ #echo "time:". date("Ymd",$time); ! $date = date("Ymd",$time); ! if(isset($time) && !in_array($date, $except_dates) && $time >= $start_date_unixtime && $date <= $until_date){ ! $count--; ! if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time; ! } } return; *************** *** 102,107 **** global $freq_type, $byday, $wkst3char, $year, $month, $start_unixtime,$summary; if (empty($byday)) return array($time); $the_sunday = dateOfWeek(date("Ymd",$time), $wkst3char); ! # echo "$freq_type, ".print_r($byday,true)."$wkst3char $the_sunday"; foreach($byday as $key=>$day) { /* set $byday_arr --- 105,111 ---- global $freq_type, $byday, $wkst3char, $year, $month, $start_unixtime,$summary; if (empty($byday)) return array($time); + $times = array(); $the_sunday = dateOfWeek(date("Ymd",$time), $wkst3char); ! #echo "<pre>$summary $freq_type ".print_r($byday,true)."$wkst3char $the_sunday</pre>"; foreach($byday as $key=>$day) { /* set $byday_arr *************** *** 115,124 **** switch($freq_type){ case 'week': ! #need to find the first day of the appropriate week. ! if ($key == 0){ ! $next_date_time = strtotime("next $on_day",strtotime($the_sunday)) + (12 * 60 * 60); ! }else{ ! $next_date_time = strtotime("next $on_day",$next_date_time) + (12 * 60 * 60); ! } $times[] = $next_date_time; break; --- 119,124 ---- switch($freq_type){ case 'week': ! #need to find the first day of the appropriate week. ! $next_date_time = strtotime("this $on_day",strtotime($the_sunday)) + (12 * 60 * 60); $times[] = $next_date_time; break; |
|
From: <ji...@us...> - 2008-12-17 06:58:59
|
Update of /cvsroot/phpicalendar/phpicalendar/calendars In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5407/calendars Modified Files: Home.ics Log Message: progress on recurrence:until and byday changes Index: Home.ics =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/calendars/Home.ics,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Home.ics 2 Dec 2003 17:31:27 -0000 1.13 --- Home.ics 17 Dec 2008 06:58:52 -0000 1.14 *************** *** 70,73 **** --- 70,74 ---- RRULE:FREQ=MONTHLY;UNTIL=20021223T075959;INTERVAL=1;BYMONTHDAY=19 END:VEVENT + BEGIN:VEVENT SEQUENCE:7 *************** *** 80,83 **** --- 81,85 ---- RRULE:FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR END:VEVENT + BEGIN:VTODO SUMMARY:This is a todo item |
|
From: <ji...@us...> - 2008-12-17 06:58:59
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5407 Modified Files: month.php Log Message: progress on recurrence:until and byday changes Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** month.php 16 Dec 2008 15:46:24 -0000 1.145 --- month.php 17 Dec 2008 06:58:52 -0000 1.146 *************** *** 126,130 **** } ! if ($this_months_events == 'yes') { $page->monthbottom($page); } else { --- 126,130 ---- } ! if ($phpiCal_config->this_months_events == 'yes') { $page->monthbottom($page); } else { |
|
From: <ji...@us...> - 2008-12-16 19:48:28
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/parse In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28037/functions/parse Modified Files: end_vevent.php recur_functions.php Log Message: progress on recurrence Index: end_vevent.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/end_vevent.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** end_vevent.php 16 Dec 2008 15:46:24 -0000 1.5 --- end_vevent.php 16 Dec 2008 19:48:23 -0000 1.6 *************** *** 229,233 **** one $next_range_time per repeat, but the BYXXX rules may write more than one event in that repeat cycle $next_date_time handles those instances within a $freq_type */ ! echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tstart range time:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n"; $recur_data = array(); while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { --- 229,233 ---- one $next_range_time per repeat, but the BYXXX rules may write more than one event in that repeat cycle $next_date_time handles those instances within a $freq_type */ ! #echo "<pre>$summary\n\tstart mArray time:".date("Ymd his",$mArray_begin)."\n\tstart range time:".date("Ymd his",$next_range_unixtime)."\n\tend range time ".date("Ymd his",$end_range_unixtime)."\n"; $recur_data = array(); while ($next_range_unixtime <= $end_range_unixtime && $count > 0) { *************** *** 238,241 **** --- 238,242 ---- $func = $freq_type.'Compare'; $diff = $func(date('Ymd',$next_range_time), $start_date); + $time = mktime(12,0,0,$month,date("d",$start_unixtime),$year); switch ($freq_type){ case 'day': *************** *** 246,250 **** break; case 'month': - $time = mktime(12,0,0,$month,date("d",$start_unixtime),$year); $times = expand_bymonthday(array($time)); foreach($times as $time){ --- 247,250 ---- *************** *** 253,260 **** break; case 'year': ! $times = expand_bymonth($next_range_unixtime); ! $times = expand_byweekno($times); ! $times = expand_byyearday($times); ! $times = expand_bymonthday($times); foreach($times as $time){ add_recur(expand_byday($time)); --- 253,260 ---- break; case 'year': ! $times = expand_bymonth($time); #echo "exp bymonth";dump_times($times); ! $times = expand_byweekno($times); #echo "exp bymonth";dump_times($times); ! $times = expand_byyearday($times); #echo "exp bymonth";dump_times($times); ! $times = expand_bymonthday($times); #echo "exp bymonthday";dump_times($times); foreach($times as $time){ add_recur(expand_byday($time)); *************** *** 265,269 **** break 2; } ! $next_range_unixtime = strtotime('+'.$interval.' '.$freq_type, $next_range_unixtime); echo "\nnext $interval $freq_type".date("Ymd",$next_range_unixtime)."\n"; } #end while loop sort($recur_data); --- 265,269 ---- break 2; } ! $next_range_unixtime = strtotime('+'.$interval.' '.$freq_type, $next_range_unixtime); #echo "\nnext $interval $freq_type".date("Ymd",$next_range_unixtime)."\n"; } #end while loop sort($recur_data); Index: recur_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/parse/recur_functions.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** recur_functions.php 16 Dec 2008 15:46:24 -0000 1.3 --- recur_functions.php 16 Dec 2008 19:48:23 -0000 1.4 *************** *** 29,43 **** $times = array_unique($times); sort($times); /*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS*/ ! $times = restrict_bymonth($times,$freq); $times = restrict_byweekno($times,$freq); $times = restrict_byyearday($times,$freq); $times = restrict_bymonthday($times,$freq); $times = restrict_byday($times,$freq); ! $times = restrict_bysetpos($times,$freq); foreach ($times as $time){ ! echo "time:". date("Ymd",$time); if(isset($time) && !in_array(date("Ymd",$time), $except_dates)) $count--; if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time; --- 29,45 ---- $times = array_unique($times); sort($times); + #echo "add_recur";dump_times($times); /*BYMONTH, BYWEEKNO, BYYEARDAY, BYMONTHDAY, BYDAY, BYHOUR, BYMINUTE, BYSECOND and BYSETPOS*/ ! $times = restrict_bymonth($times,$freq); ! $times = restrict_byweekno($times,$freq); $times = restrict_byyearday($times,$freq); $times = restrict_bymonthday($times,$freq); $times = restrict_byday($times,$freq); ! $times = restrict_bysetpos($times,$freq);#echo "restrict_bysetpos";dump_times($times); foreach ($times as $time){ ! #echo "time:". date("Ymd",$time); if(isset($time) && !in_array(date("Ymd",$time), $except_dates)) $count--; if($time >= $mArray_begin && $time <= $mArray_end && $count >= 0) $recur_data[] = $time; *************** *** 85,96 **** function expand_bymonthday($times){ ! global $bymonthday, $year, $month; if (empty($bymonthday)) return $times; ! foreach($times as $time) foreach($bymonthday as $monthday) $new_times[] = mktime(12,0,0,$month,$monthday,$year); return $new_times; } function expand_byday($time){ ! global $freq_type, $byday, $wkst3char, $year, $month, $start_unixtime; if (empty($byday)) return array($time); $the_sunday = dateOfWeek(date("Ymd",$time), $wkst3char); --- 87,104 ---- function expand_bymonthday($times){ ! global $bymonthday, $year; if (empty($bymonthday)) return $times; ! foreach($times as $time){ ! $month = date('m',$time); ! foreach($bymonthday as $monthday){ ! $new_times[] = mktime(12,0,0,$month,$monthday,$year); ! #echo "monthday:$monthday\n"; ! } ! } return $new_times; } function expand_byday($time){ ! global $freq_type, $byday, $wkst3char, $year, $month, $start_unixtime,$summary; if (empty($byday)) return array($time); $the_sunday = dateOfWeek(date("Ymd",$time), $wkst3char); *************** *** 118,127 **** case 'year': $week_arr = array(1,2,3,4,5); ! if(isset($byday_arr[2])) $week_arr = array($byday_arr[2]); ! $month_start = strtotime(date("Ym01",$time)); foreach($week_arr as $week){ $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start); # check that we're still in the same month ! if (date("m",$next_date_time) == date("m",$month_start) ) $times[] = $next_date_time; } break; --- 126,136 ---- case 'year': $week_arr = array(1,2,3,4,5); ! if(isset($byday_arr[2]) && $byday_arr[2] !='') $week_arr = array($byday_arr[2]); ! $month_start = strtotime(date("Ym00",$time)); foreach($week_arr as $week){ + #echo "<pre>$summary".$byday_arr[1].$week.$on_day,date("Ymd",$month_start)."\n"; $next_date_time = strtotime($byday_arr[1].$week.$on_day,$month_start); # check that we're still in the same month ! if (date("m",$next_date_time) == date("m",$time) ) $times[] = $next_date_time; } break; *************** *** 131,135 **** } } ! dump_times($times); return $times; } --- 140,144 ---- } } ! #echo "exp byday";dump_times($times); return $times; } *************** *** 197,205 **** } ! function dump_times($recur_data){ global $summary; ! echo "<pre>$summary recur_data:"; ! var_dump($recur_data); ! foreach($recur_data as $time) echo "\n".date("Ymd his",$time); echo "</pre>"; } --- 206,215 ---- } ! # for diagnostics ! function dump_times($times){ global $summary; ! echo "<pre>$summary times:"; ! var_dump($times); ! foreach($times as $time) echo "\ndate:".date("Ymd his",$time); echo "</pre>"; } |
|
From: <ji...@us...> - 2008-12-16 15:46:34
|
Update of /cvsroot/phpicalendar/phpicalendar/functions/init In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2088/functions/init Modified Files: date_range.php Log Message: progress on recurrence Index: date_range.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/init/date_range.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** date_range.php 11 Dec 2008 23:48:39 -0000 1.1 --- date_range.php 16 Dec 2008 15:46:24 -0000 1.2 *************** *** 32,39 **** case 'day': $mArray_begin = mktime (0,0,0,$start_month,21,($start_year)); ! $mArray_end = mktime (0,0,0,$end_month,12,($end_year)); break; default: $mArray_begin = mktime (0,0,0,12,21,($this_year - 1)); ! $mArray_end = mktime (0,0,0,1,12,($this_year + 1)); } --- 32,39 ---- case 'day': $mArray_begin = mktime (0,0,0,$start_month,21,($start_year)); ! $mArray_end = mktime (0,0,0,$end_month,31,($end_year)); break; default: $mArray_begin = mktime (0,0,0,12,21,($this_year - 1)); ! $mArray_end = mktime (0,0,0,1,31,($this_year + 1)); } |
|
From: <ji...@us...> - 2008-12-16 15:46:31
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2088/functions Modified Files: list_functions.php Log Message: progress on recurrence Index: list_functions.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_functions.php,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** list_functions.php 13 Dec 2008 23:42:31 -0000 1.18 --- list_functions.php 16 Dec 2008 15:46:24 -0000 1.19 *************** *** 49,57 **** function list_years() { ! global $getdate, $this_year, $cal, $num_years; $year_time = strtotime($getdate); $return = ''; ! for ($i=0; $i < $num_years; $i++) { ! $offset = $num_years - $i; $prev_time = strtotime("-$offset year", $year_time); $prev_date = date("Ymd", $prev_time); --- 49,57 ---- function list_years() { ! global $getdate, $this_year, $cal, $phpiCal_config; $year_time = strtotime($getdate); $return = ''; ! for ($i=0; $i < $phpiCal_config->num_years; $i++) { ! $offset = $phpiCal_config->num_years - $i; $prev_time = strtotime("-$offset year", $year_time); $prev_date = date("Ymd", $prev_time); *************** *** 64,68 **** $return .= "<option value=\"year.php?cal=$cal&getdate=$getdate_date\" selected=\"selected\">$getdate_year</option>\n"; ! for ($i=0; $i < $num_years; $i++) { $offset = $i + 1; $next_time = strtotime("+$offset year", $year_time); --- 64,68 ---- $return .= "<option value=\"year.php?cal=$cal&getdate=$getdate_date\" selected=\"selected\">$getdate_year</option>\n"; ! for ($i=0; $i < $phpiCal_config->num_years; $i++) { $offset = $i + 1; $next_time = strtotime("+$offset year", $year_time); |
|
From: <ji...@us...> - 2008-12-16 15:46:31
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2088 Modified Files: month.php year.php Log Message: progress on recurrence Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** month.php 15 Dec 2008 17:25:27 -0000 1.144 --- month.php 16 Dec 2008 15:46:24 -0000 1.145 *************** *** 5,9 **** require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); ! header("Content-Type: text/html; charset=$charset"); if ($phpiCal_config->minical_view == 'current') $minical_view = 'month'; --- 5,9 ---- require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); ! header("Content-Type: text/html; charset=$phpiCal_config->charset"); if ($phpiCal_config->minical_view == 'current') $minical_view = 'month'; Index: year.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/year.php,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** year.php 12 Dec 2008 06:22:58 -0000 1.48 --- year.php 16 Dec 2008 15:46:24 -0000 1.49 *************** *** 5,9 **** require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); ! header("Content-Type: text/html; charset=$charset"); ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); --- 5,9 ---- require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); ! header("Content-Type: text/html; charset=$phpiCal_config->charset"); ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2); *************** *** 66,70 **** 'display_date' => $this_year, 'sidebar_date' => $sidebar_date, ! 'rss_powered' => $phpiCal_config->rss_powered, 'rss_available' => '', 'rss_valid' => '', --- 66,70 ---- 'display_date' => $this_year, 'sidebar_date' => $sidebar_date, ! 'rss_powered' => $rss_powered, 'rss_available' => '', 'rss_valid' => '', *************** *** 79,83 **** 'prev_year' => $prev_year, 'show_goto' => '', ! 'show_user_login' => $show_user_login, 'invalid_login' => $invalid_login, 'login_querys' => $login_querys, --- 79,83 ---- 'prev_year' => $prev_year, 'show_goto' => '', ! 'show_user_login' => $phpiCal_config->show_user_login, 'invalid_login' => $invalid_login, 'login_querys' => $login_querys, *************** *** 86,90 **** 'logout_querys' => $logout_querys, 'list_icals' => $list_icals, ! 'list_icals_pick' => $list_icals_pick, 'list_years' => $list_years, 'list_months' => $list_months, --- 86,90 ---- 'logout_querys' => $logout_querys, 'list_icals' => $list_icals, ! 'list_icals_pick' => $list_icals_pick, 'list_years' => $list_years, 'list_months' => $list_months, *************** *** 104,108 **** 'l_month' => $lang['l_month'], 'l_year' => $lang['l_year'], ! 'l_search' => $lang['l_search'], 'l_subscribe' => $lang['l_subscribe'], 'l_download' => $lang['l_download'], --- 104,108 ---- 'l_month' => $lang['l_month'], 'l_year' => $lang['l_year'], ! 'l_search' => $lang['l_search'], 'l_subscribe' => $lang['l_subscribe'], 'l_download' => $lang['l_download'], *************** *** 128,132 **** )); } ! if ($show_search != 'yes') { $page->nosearch($page); } --- 128,132 ---- )); } ! if ($phpiCal_config->show_search != 'yes') { $page->nosearch($page); } |
