Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv20462/functions
Modified Files:
ical_parser.php template.php
Log Message:
new rss icons;allow subweek calendars
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.234
retrieving revision 1.235
diff -C2 -d -r1.234 -r1.235
*** ical_parser.php 27 Dec 2008 10:58:51 -0000 1.234
--- ical_parser.php 27 Dec 2008 23:18:07 -0000 1.235
***************
*** 12,16 ****
if ($phpiCal_config->save_parsed_cals == 'yes') {
if (sizeof ($cal_filelist) > 1) {
! $parsedcal = $tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
if (file_exists($parsedcal)) {
$fd = fopen($parsedcal, 'r');
--- 12,16 ----
if ($phpiCal_config->save_parsed_cals == 'yes') {
if (sizeof ($cal_filelist) > 1) {
! $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
if (file_exists($parsedcal)) {
$fd = fopen($parsedcal, 'r');
***************
*** 52,56 ****
foreach ($cal_filelist as $filename) {
$realcal_mtime = filemtime($filename);
! $parsedcal = $tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
if (file_exists($parsedcal)) {
$parsedcal_mtime = filemtime($parsedcal);
--- 52,56 ----
foreach ($cal_filelist as $filename) {
$realcal_mtime = filemtime($filename);
! $parsedcal = $phpiCal_config->tmp_dir.'/parsedcal-'.urlencode($cpath.'::'.$cal_filename).'-'.$this_year;
if (file_exists($parsedcal)) {
$parsedcal_mtime = filemtime($parsedcal);
Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** template.php 27 Dec 2008 11:42:41 -0000 1.105
--- template.php 27 Dec 2008 23:18:07 -0000 1.106
***************
*** 270,274 ****
$thisdate = ($thisdate + (25 * 60 * 60));
}
!
// Replaces the allday events
preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
--- 270,274 ----
$thisdate = ($thisdate + (25 * 60 * 60));
}
! #echo "<pre>";print_r($nbrGridCols);
// Replaces the allday events
preg_match("!<\!-- loop allday on -->(.*)<\!-- loop allday off -->!Uis", $this->page, $match1);
***************
*** 511,515 ****
$start_wt = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
$start_day = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
! for ($i=0; $i<7; $i++) {
$day_num = date("w", $start_day);
$daylink = date('Ymd', $start_wt);
--- 511,515 ----
$start_wt = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
$start_day = strtotime(dateOfWeek($getdate, $phpiCal_config->week_start_day));
! for ($i=0; $i<$phpiCal_config->week_length; $i++) {
$day_num = date("w", $start_day);
$daylink = date('Ymd', $start_wt);
***************
*** 884,888 ****
$weekday_loop = '';
$middle = '';
! for ($i=0; $i<7; $i++) {
$day_num = date("w", $start_day);
$weekday = $langtype[$day_num];
--- 884,888 ----
$weekday_loop = '';
$middle = '';
! for ($i=0; $i< $phpiCal_config->week_length; $i++) {
$day_num = date("w", $start_day);
$weekday = $langtype[$day_num];
***************
*** 911,915 ****
$temp = $t_month[2];
}
! if (isset($master_array[$daylink])) {
if ($type != 'small') {
foreach ($master_array[$daylink] as $cal_time => $event_times) {
--- 911,915 ----
$temp = $t_month[2];
}
! if (isset($master_array[$daylink]) && $i <= $phpiCal_config->week_length) {
if ($type != 'small') {
foreach ($master_array[$daylink] as $cal_time => $event_times) {
***************
*** 954,958 ****
$start_day = strtotime("+1 day", $start_day);
! if ($i == 7) {
$i = 0;
$middle .= $endweek;
--- 954,961 ----
$start_day = strtotime("+1 day", $start_day);
! if ($i == $phpiCal_config->week_length) {
! if ($phpiCal_config->week_length != 7) {
! $start_day = strtotime("+".(7-$phpiCal_config->week_length)." day", $start_day);
! }
$i = 0;
$middle .= $endweek;
|
