[PHPiCalendar-Commits] phpicalendar/functions template.php,1.46,1.47

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16355/functions

Modified Files:
	template.php 
Log Message:
Updates to CSS, speed tweeks to template.php



Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** template.php	23 May 2004 05:36:30 -0000	1.46
--- template.php	23 May 2004 23:31:21 -0000	1.47
***************
*** 23,28 ****
  		
  		foreach($master_array as $key => $val) {
! 			ereg ("([0-9]{6})([0-9]{2})", $key, $regs);
! 			if ((($regs[1] == $parse_month) && ($printview == "month")) || (($key == $getdate) && ($printview == "day")) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == "week"))) {
  				$events_week++;
  				$dayofmonth = strtotime ($key);
--- 23,28 ----
  		
  		foreach($master_array as $key => $val) {
! 			preg_match ('/([0-9]{6})([0-9]{2})/', $key, $regs);
! 			if ((($regs[1] == $parse_month) && ($printview == 'month')) || (($key == $getdate) && ($printview == 'day')) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == 'week'))) {
  				$events_week++;
  				$dayofmonth = strtotime ($key);
***************
*** 35,48 ****
  				foreach ($val as $new_val) {
  					foreach ($new_val as $new_key2 => $new_val2) {
! 					if ($new_val2["event_text"]) {	
! 						$event_text 	= stripslashes(urldecode($new_val2["event_text"]));
! 						$description 	= stripslashes(urldecode($new_val2["description"]));
! 						$event_start 	= $new_val2["event_start"];
! 						$event_end 		= $new_val2["event_end"];
! 						if (isset($new_val2["display_end"])) $event_end = $new_val2["display_end"];
  							$event_start 	= date ($timeFormat, strtotime ($event_start));
  							$event_end 		= date ($timeFormat, strtotime ($event_end));
! 							$event_start 	= "$event_start - $event_end";
! 							if (!$new_val2["event_start"]) { 
  								$event_start = $lang['l_all_day'];
  								$event_start2 = '';
--- 35,48 ----
  				foreach ($val as $new_val) {
  					foreach ($new_val as $new_key2 => $new_val2) {
! 					if ($new_val2['event_text']) {	
! 						$event_text 	= stripslashes(urldecode($new_val2['event_text']));
! 						$description 	= stripslashes(urldecode($new_val2['description']));
! 						$event_start 	= $new_val2['event_start'];
! 						$event_end 		= $new_val2['event_end'];
! 						if (isset($new_val2['display_end'])) $event_end = $new_val2['display_end'];
  							$event_start 	= date ($timeFormat, strtotime ($event_start));
  							$event_end 		= date ($timeFormat, strtotime ($event_end));
! 							$event_start 	= $event_start .' - '.$event_end;
! 							if (!$new_val2['event_start']) { 
  								$event_start = $lang['l_all_day'];
  								$event_start2 = '';
***************
*** 122,127 ****
  					if ($event_calno < 1) $event_calno=1;
  					if ($event_calno > 7) $event_calno=7;
! 					$event 			= openevent($event_calna, '', '', $allday, 1, 11, '<span class="V9W">', '</span>', 'psf', $event_url);
! 					$loop_tmp 		= str_replace('{EVENT}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  					$replace		.= $loop_tmp;
--- 122,127 ----
  					if ($event_calno < 1) $event_calno=1;
  					if ($event_calno > 7) $event_calno=7;
! 					$event 			= openevent($event_calna, '', '', $allday, 1, 11, '', '', 'psf', $event_url);
! 					$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  					$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  					$replace		.= $loop_tmp;
***************
*** 174,178 ****
  		$event_length = array ();
  		$border = 0;
! 		ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
--- 174,178 ----
  		$event_length = array ();
  		$border = 0;
! 		preg_match ('/([0-9]{4})([0-9]{2})([0-9]{2})/', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
***************
*** 186,190 ****
  		foreach ($day_array as $key) {
  			$cal_time = $key;	
! 			ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp);
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
  			$key = date ($timeFormat, $key);
--- 186,190 ----
  		foreach ($day_array as $key) {
  			$cal_time = $key;	
! 			preg_match('/([0-9]{2})([0-9]{2})/', $key, $regs_tmp);
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
  			$key = date ($timeFormat, $key);
***************
*** 217,221 ****
  				}
  					
! 				if ("$day_start" == "$cal_time" && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
  					foreach($master_array[$thisday] as $time_key => $time_arr) {
  						if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
--- 217,221 ----
  				}
  					
! 				if ($day_start == $cal_time && isset($master_array[$thisday]) && is_array($master_array[$thisday])) {
  					foreach($master_array[$thisday] as $time_key => $time_arr) {
  						if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
***************
*** 346,351 ****
  				if ($event_calno < 1) $event_calno=1;
  				if ($event_calno > 7) $event_calno=7;
! 				$event 			= openevent($event_calna, '', '', $allday, 0, '', '<span class="V10WB">', '</span>', 'psf', $event_url);
! 				$loop_tmp 		= str_replace('{EVENT}', $event, $loop_ad);
  				$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  				$replace		.= $loop_tmp;
--- 346,351 ----
  				if ($event_calno < 1) $event_calno=1;
  				if ($event_calno > 7) $event_calno=7;
! 				$event 			= openevent($event_calna, '', '', $allday, 0, '', '', '', '', $event_url);
! 				$loop_tmp 		= str_replace('{ALLDAY}', $event, $loop_ad);
  				$loop_tmp 		= str_replace('{CALNO}', $event_calno, $loop_tmp);
  				$replace		.= $loop_tmp;
***************
*** 405,414 ****
  		$event_length = array ();
  		$border = 0;
! 		ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
  		$this_year = $day_array2[1];
  		foreach ($day_array as $key) {
! 			ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp);
  			$cal_time = $key;
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
--- 405,414 ----
  		$event_length = array ();
  		$border = 0;
! 		preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})/', $getdate, $day_array2);
  		$this_day = $day_array2[3]; 
  		$this_month = $day_array2[2];
  		$this_year = $day_array2[1];
  		foreach ($day_array as $key) {
! 			preg_match('/([0-9]{2})([0-9]{2})/', $key, $regs_tmp);
  			$cal_time = $key;
  			$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
***************
*** 453,461 ****
  				}
  			}
! 			if (ereg('([0-9]{1,2}):00', $key)) {
  				$daydisplay .= '<tr>'."\n";
  				$daydisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
  				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'."\n";
! 			} elseif("$cal_time" == "$day_start") {
  				$size_tmp = 60 - (int)substr($cal_time,2,2);
  				$daydisplay .= '<tr>'."\n";
--- 453,461 ----
  				}
  			}
! 			if (preg_match('/([0-9]{1,2}):00/', $key)) {
  				$daydisplay .= '<tr>'."\n";
  				$daydisplay .= '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
  				$daydisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $gridLength . '"></td>'."\n";
! 			} elseif($cal_time == $day_start) {
  				$size_tmp = 60 - (int)substr($cal_time,2,2);
  				$daydisplay .= '<tr>'."\n";