Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar day.php, 1.134, 1.135 month.php, 1.143, 1.144 week.php, 1.134, 1.135
|
From: <ji...@us...> - 2008-12-15 17:25:33
|
Update of /cvsroot/phpicalendar/phpicalendar In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11278 Modified Files: day.php month.php week.php Log Message: big changes to recurrence; trying to get closer to the spec Index: day.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** day.php 12 Dec 2008 06:22:57 -0000 1.134 --- day.php 15 Dec 2008 17:25:27 -0000 1.135 *************** *** 1,19 **** <?php if (isset($_GET['jumpto_day'])) { $jumpto_day_time = strtotime($_GET['jumpto_day']); if ($jumpto_day_time == -1) { ! $getdate = date('Ymd', time() + $second_offset); } else { $getdate = date('Ymd', $jumpto_day_time); } } - $current_view = 'day'; - if (!defined('BASE')) define('BASE', './'); require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); - header("Content-Type: text/html; charset=$charset"); ! if ($minical_view == 'current') $minical_view = 'day'; $weekstart = 1; --- 1,20 ---- <?php + $current_view = 'day'; + if (!defined('BASE')) define('BASE', './'); + require_once(BASE.'functions/init.inc.php'); + header("Content-Type: text/html; charset=$phpiCal_config->charset"); if (isset($_GET['jumpto_day'])) { $jumpto_day_time = strtotime($_GET['jumpto_day']); if ($jumpto_day_time == -1) { ! $getdate = date('Ymd', time() + $phpiCal_config->second_offset); } else { $getdate = date('Ymd', $jumpto_day_time); } } require_once(BASE.'functions/ical_parser.php'); require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); ! if ($phpiCal_config->minical_view == 'current') $minical_view = 'day'; $weekstart = 1; *************** *** 25,29 **** $display_date = localizeDate($dateFormat_day, $unix_time); $sidebar_date = localizeDate($dateFormat_week_list, $unix_time); ! $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day)); --- 26,30 ---- $display_date = localizeDate($dateFormat_day, $unix_time); $sidebar_date = localizeDate($dateFormat_week_list, $unix_time); ! $start_week_time = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day)); Index: month.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** month.php 13 Dec 2008 23:42:30 -0000 1.143 --- month.php 15 Dec 2008 17:25:27 -0000 1.144 *************** *** 6,13 **** require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$charset"); ! if ($minical_view == 'current') $minical_view = 'month'; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', time() + $second_offset); $tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time)); $yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time)); --- 6,13 ---- require_once(BASE.'functions/template.php'); header("Content-Type: text/html; charset=$charset"); ! if ($phpiCal_config->minical_view == 'current') $minical_view = 'month'; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', time() + $phpiCal_config->second_offset); $tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time)); $yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time)); *************** *** 34,38 **** $parse_month = date ("Ym", $unix_time); $first_of_month = $this_year.$this_month."01"; ! $start_month_day = dateOfWeek($first_of_month, $week_start_day); $thisday2 = localizeDate($dateFormat_week_list, $unix_time); $num_of_events2 = 0; --- 34,38 ---- $parse_month = date ("Ym", $unix_time); $first_of_month = $this_year.$this_month."01"; ! $start_month_day = dateOfWeek($first_of_month, $phpiCal_config->week_start_day); $thisday2 = localizeDate($dateFormat_week_list, $unix_time); $num_of_events2 = 0; *************** *** 71,75 **** 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => $show_search, 'next_month' => $next_month, 'prev_month' => $prev_month, --- 71,75 ---- 'rss_available' => '', 'rss_valid' => '', ! 'show_search' => $phpiCal_config->show_search, 'next_month' => $next_month, 'prev_month' => $prev_month, Index: week.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** week.php 13 Dec 2008 23:42:31 -0000 1.134 --- week.php 15 Dec 2008 17:25:27 -0000 1.135 *************** *** 5,15 **** require_once(BASE.'functions/list_functions.php'); require_once(BASE.'functions/template.php'); ! header("Content-Type: text/html; charset=$charset"); ! if ($minical_view == "current") $minical_view = "week"; $starttime = "0500"; $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', time() + $second_offset); $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); --- 5,15 ---- 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 = "week"; $starttime = "0500"; $weekstart = 1; $unix_time = strtotime($getdate); ! $today_today = date('Ymd', time() + $second_offset); $next_week = date("Ymd", strtotime("+1 week", $unix_time)); $prev_week = date("Ymd", strtotime("-1 week", $unix_time)); *************** *** 89,93 **** 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => $style_select, 'l_goprint' => $lang['l_goprint'], 'l_preferences' => $lang['l_preferences'], --- 89,93 ---- 'list_jumps' => $list_jumps, 'legend' => $list_calcolors, ! 'style_select' => '', 'l_goprint' => $lang['l_goprint'], 'l_preferences' => $lang['l_preferences'], |
