Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar/functions template.php, 1.100, 1.101
|
From: <ji...@us...> - 2008-12-26 08:26:36
|
Update of /cvsroot/phpicalendar/phpicalendar/functions In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6403/functions Modified Files: template.php Log Message: expand search range;fix todo display Index: template.php =================================================================== RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** template.php 23 Dec 2008 22:02:44 -0000 1.100 --- template.php 26 Dec 2008 08:26:31 -0000 1.101 *************** *** 147,241 **** if (isset($the_arr)){ - // Pull out each event - foreach($the_arr as $key => $val) { - - $events_found++; - $dayofmonth = strtotime($val['date']); - $dayofmonth = localizeDate ('%A, %B %e %Y', $dayofmonth); - $events_tmp = $loop_event; - $recur_tmp = $loop_recur; - - if ($val['event_text']) { - $event_text = stripslashes(urldecode($val['event_text'])); - $description = stripslashes(urldecode($val['description'])); - $location = stripslashes(urldecode($val['location'])); - $event_start = $val['event_start']; - $event_end = $val['event_end']; - if (isset($val['display_end'])) $event_end = $val['display_end']; - if (!$val['event_start']) { - $event_start = $lang['l_all_day']; - $event_start2 = ''; - $event_end = ''; - } else { - $event_start = date ($timeFormat, strtotime ($event_start)); - $event_end = date ($timeFormat, strtotime ($event_end)); - $event_start = $event_start .' - '.$event_end; - } - } - - if ($description == '') { - $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!Uis', '', $events_tmp); - } - if (!isset($val['exceptions'])) { - $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', '', $events_tmp); - }else{ - $some_exceptions = ""; - foreach ($val['exceptions'] as $except_val){ - $except_tmp = $loop_except; - - $except_date = strtotime($except_val['date']); - $except_date = localizeDate ('%A, %B %e %Y', $except_date); - $except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp); - - $except_event_start = date ($timeFormat, strtotime ($except_val['event_start'])); - $except_event_end = date ($timeFormat, strtotime ($except_val['event_end'])); - $except_event_start = $except_event_start .' - '.$except_event_end; - - $except_tmp = str_replace('{EVENT_START}', $except_event_start, $except_tmp); - - $except_event_text = stripslashes(urldecode($except_val['event_text'])); - $except_tmp = str_replace('{EVENT_TEXT}', $except_event_text, $except_tmp); - - #is there a recur in the exception? - if (!$except_val['recur']) { - $except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!Uis', '', $except_tmp); - }else{ - $except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp); - } - #is there a description in the exception? - if (!$except_val['description']) { - $except_tmp = preg_replace('!<\!-- switch except_description on -->(.*)<\!-- switch except_description off -->!Uis', '', $except_tmp); - }else{ - $except_description = stripslashes(urldecode($except_val['description'])); - $except_tmp = str_replace('{EXCEPT_DESCRIPTION}', $except_description, $except_tmp); } ! $some_exceptions .= $except_tmp; ! ! } ! $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', $some_exceptions,$events_tmp ); ! ! } ! ! if (!$val['recur']) { ! $events_tmp = preg_replace('!<\!-- switch recur on -->(.*)<\!-- switch recur off -->!Uis', '', $events_tmp); ! }else{ ! $events_tmp = str_replace('{RECUR}', $val['recur'], $events_tmp); ! } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}','{LOCATION}'); $replace = array($event_start, $event_text, $description, $location); ! $events_tmp = str_replace($search, $replace, $events_tmp); ! $some_events .= $events_tmp; ! $events_tmp = $loop_event; ! ! $some_events = str_replace('{KEY}', $val['date'], $some_events); ! $some_events = str_replace('{DAYOFMONTH}', $dayofmonth, $some_events); ! $final .= $day_tmp.$some_events; ! unset ($day_tmp, $some_events); ! ! } } if ($events_found < 1) { --- 147,239 ---- if (isset($the_arr)){ + // Pull out each event + foreach($the_arr as $key => $val) { + $events_found++; + $dayofmonth = strtotime($val['date']); + $dayofmonth = localizeDate ('%A, %B %e %Y', $dayofmonth); + $events_tmp = $loop_event; + $recur_tmp = $loop_recur; + if ($val['event_text']) { + $event_text = stripslashes(urldecode($val['event_text'])); + $description = stripslashes(urldecode($val['description'])); + $location = stripslashes(urldecode($val['location'])); + $event_start = $val['event_start']; + $event_end = $val['event_end']; + if (isset($val['display_end'])) $event_end = $val['display_end']; + if (!$val['event_start']) { + $event_start = $lang['l_all_day']; + $event_start2 = ''; + $event_end = ''; + } else { + $event_start = date ($timeFormat, strtotime ($event_start)); + $event_end = date ($timeFormat, strtotime ($event_end)); + $event_start = $event_start .' - '.$event_end; + } + } + + if ($description == '') { + $events_tmp = preg_replace('!<\!-- switch description_events on -->(.*)<\!-- switch description_events off -->!Uis', '', $events_tmp); + } + if (!isset($val['exceptions'])) { + $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', '', $events_tmp); + }else{ + $some_exceptions = ""; + foreach ($val['exceptions'] as $except_val){ + $except_tmp = $loop_except; + + $except_date = strtotime($except_val['date']); + $except_date = localizeDate ('%A, %B %e %Y', $except_date); + $except_tmp = str_replace('{DAYOFMONTH}', $except_date, $except_tmp); + + $except_event_start = date ($timeFormat, strtotime ($except_val['event_start'])); + $except_event_end = date ($timeFormat, strtotime ($except_val['event_end'])); + $except_event_start = $except_event_start .' - '.$except_event_end; + + $except_tmp = str_replace('{EVENT_START}', $except_event_start, $except_tmp); + + $except_event_text = stripslashes(urldecode($except_val['event_text'])); + $except_tmp = str_replace('{EVENT_TEXT}', $except_event_text, $except_tmp); + + #is there a recur in the exception? + if (!$except_val['recur']) { + $except_tmp = preg_replace('!<\!-- switch except_recur on -->(.*)<\!-- switch except_recur off -->!Uis', '', $except_tmp); + }else{ + $except_tmp = str_replace('{EXCEPT_RECUR}', $except_val['recur'], $except_tmp); + } + #is there a description in the exception? + if (!$except_val['description']) { + $except_tmp = preg_replace('!<\!-- switch except_description on -->(.*)<\!-- switch except_description off -->!Uis', '', $except_tmp); + }else{ + $except_description = stripslashes(urldecode($except_val['description'])); + $except_tmp = str_replace('{EXCEPT_DESCRIPTION}', $except_description, $except_tmp); + } + $some_exceptions .= $except_tmp; } ! $events_tmp = preg_replace('!<\!-- switch exceptions on -->(.*)<\!-- switch exceptions off -->!Uis', $some_exceptions,$events_tmp ); ! ! } ! ! if (!$val['recur']) { ! $events_tmp = preg_replace('!<\!-- switch recur on -->(.*)<\!-- switch recur off -->!Uis', '', $events_tmp); ! $events_tmp = str_replace('{L_STARTING_ON}', '', $events_tmp); ! }else{ ! $events_tmp = str_replace('{RECUR}', $val['recur'], $events_tmp); ! } ! $search = array('{EVENT_START}', '{EVENT_TEXT}', '{DESCRIPTION}','{LOCATION}'); $replace = array($event_start, $event_text, $description, $location); ! $events_tmp = str_replace($search, $replace, $events_tmp); ! $some_events .= $events_tmp; ! $events_tmp = $loop_event; ! ! $some_events = str_replace('{KEY}', $val['date'], $some_events); ! $some_events = str_replace('{DAYOFMONTH}', $dayofmonth, $some_events); ! $final .= $day_tmp.$some_events; ! unset ($day_tmp, $some_events); ! ! } } if ($events_found < 1) { *************** *** 825,835 **** $vtodo_array = $todo; ! $vtodo_text = word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines); $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); $rep = array ($vtodo_text, $vtodo_array); // Reset this TODO's category. $temp = ''; ! if ($status == 'COMPLETED' || (isset($val['completed_date']) && isset($val['completed_time']))) { if ($phpiCal_config->show_completed == 'yes') { $temp = $completed; --- 823,835 ---- $vtodo_array = $todo; ! $vtodo_text = word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $phpiCal_config->tomorrows_events_lines); $data = array ('{VTODO_TEXT}', '{VTODO_ARRAY}'); $rep = array ($vtodo_text, $vtodo_array); // Reset this TODO's category. + + $temp = ''; ! if ($status == 'COMPLETED' || ($val['completed_date'] !='' && $val['completed_time'] !='')) { if ($phpiCal_config->show_completed == 'yes') { $temp = $completed; |
