[PHPiCalendar-Commits] phpicalendar/includes event.php,1.11,1.12 header.inc.php,1.5,1.6 sidebar.php,1.25,1.26

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

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv11463/includes

Modified Files:
	event.php header.inc.php sidebar.php 
Log Message:
Checked in a new popup system. Also added calname to calendar for popup reference.



Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** event.php	24 Sep 2003 01:27:01 -0000	1.11
--- event.php	19 Nov 2003 07:54:09 -0000	1.12
***************
*** 4,49 ****
  
  // Load vars
! if (isset($HTTP_GET_VARS['event']) && ($HTTP_GET_VARS['event'] !== '') ) {
! 	$event=$HTTP_GET_VARS['event'];
  } else {
  	$event='';
  }
! if (isset($HTTP_GET_VARS['description']) && ($HTTP_GET_VARS['description'] !== '') ) {
! 	$description=$HTTP_GET_VARS['description'];
  } else {
  	$description='';
  }
! if (isset($HTTP_GET_VARS['cal']) && ($HTTP_GET_VARS['cal'] !== '') ) {
! 	$calendar_name=$HTTP_GET_VARS['cal'];
  } else {
  	$calendar_name='';
  }
! if (isset($HTTP_GET_VARS['start']) && ($HTTP_GET_VARS['start'] !== '') ) {
! 	$start=$HTTP_GET_VARS['start'];
  } else {
  	$start='';
  }
! if (isset($HTTP_GET_VARS['end']) && ($HTTP_GET_VARS['end'] !== '') ) {
! 	$end=$HTTP_GET_VARS['end'];
  } else {
  	$end='';
  }
! if (isset($HTTP_GET_VARS['status']) && ($HTTP_GET_VARS['status'] !== '') ) {
! 	$status=$HTTP_GET_VARS['status'];
  } else {
  	$status='';
  }
! if (isset($HTTP_GET_VARS['location']) && ($HTTP_GET_VARS['location'] !== '') ) {
! 	$location=$HTTP_GET_VARS['location'];
  } else {
  	$location='';
  }
! if (isset($HTTP_GET_VARS['organizer']) && ($HTTP_GET_VARS['organizer'] !== '') ) {
! 	$organizer=$HTTP_GET_VARS['organizer'];
  } else {
  	$organizer='';
  }
! if (isset($HTTP_GET_VARS['attendee']) && ($HTTP_GET_VARS['attendee'] !== '') ) {
! 	$attendee=$HTTP_GET_VARS['attendee'];
  } else {
  	$attendee='';
--- 4,49 ----
  
  // Load vars
! if (isset($HTTP_POST_VARS['event']) && ($HTTP_POST_VARS['event'] !== '') ) {
! 	$event=$HTTP_POST_VARS['event'];
  } else {
  	$event='';
  }
! if (isset($HTTP_POST_VARS['description']) && ($HTTP_POST_VARS['description'] !== '') ) {
! 	$description=$HTTP_POST_VARS['description'];
  } else {
  	$description='';
  }
! if (isset($HTTP_POST_VARS['cal']) && ($HTTP_POST_VARS['cal'] !== '') ) {
! 	$calendar_name=$HTTP_POST_VARS['cal'];
  } else {
  	$calendar_name='';
  }
! if (isset($HTTP_POST_VARS['start']) && ($HTTP_POST_VARS['start'] !== '') ) {
! 	$start=$HTTP_POST_VARS['start'];
  } else {
  	$start='';
  }
! if (isset($HTTP_POST_VARS['end']) && ($HTTP_POST_VARS['end'] !== '') ) {
! 	$end=$HTTP_POST_VARS['end'];
  } else {
  	$end='';
  }
! if (isset($HTTP_POST_VARS['status']) && ($HTTP_POST_VARS['status'] !== '') ) {
! 	$status=$HTTP_POST_VARS['status'];
  } else {
  	$status='';
  }
! if (isset($HTTP_POST_VARS['location']) && ($HTTP_POST_VARS['location'] !== '') ) {
! 	$location=$HTTP_POST_VARS['location'];
  } else {
  	$location='';
  }
! if (isset($HTTP_POST_VARS['organizer']) && ($HTTP_POST_VARS['organizer'] !== '') ) {
! 	$organizer=$HTTP_POST_VARS['organizer'];
  } else {
  	$organizer='';
  }
! if (isset($HTTP_POST_VARS['attendee']) && ($HTTP_POST_VARS['attendee'] !== '') ) {
! 	$attendee=$HTTP_POST_VARS['attendee'];
  } else {
  	$attendee='';
***************
*** 180,182 ****
  <!-- End PAGE -->
  
! </html>
\ No newline at end of file
--- 180,182 ----
  <!-- End PAGE -->
  
! </html>

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/header.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** header.inc.php	21 Sep 2003 03:22:09 -0000	1.5
--- header.inc.php	19 Nov 2003 07:54:09 -0000	1.6
***************
*** 13,18 ****
  		} 
  		if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); 
  		
  	?>
  </head>
! <body bgcolor="#FFFFFF">
\ No newline at end of file
--- 13,30 ----
  		} 
  		if (isset($master_array['-2'])) include (BASE.'functions/todo.js'); 
+ 		include (BASE.'functions/event.js'); 
  		
  	?>
  </head>
! <body bgcolor="#FFFFFF">
! <form name="eventPopupForm" id="eventPopupForm" method="post" action="includes/event.php" style="display: none;">
!   <input type="hidden" name="event" id="event" value="">
!   <input type="hidden" name="cal" id="cal" value="">
!   <input type="hidden" name="start" id="start" value="">
!   <input type="hidden" name="end" id="end" value="">
!   <input type="hidden" name="description" id="description" value="">
!   <input type="hidden" name="status" id="status" value="">
!   <input type="hidden" name="location" id="location" value="">
!   <input type="hidden" name="organizer" id="organizer" value="">
!   <input type="hidden" name="attendee" id="attendee" value="">
! </form>

Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** sidebar.php	14 Nov 2003 22:03:47 -0000	1.25
--- sidebar.php	19 Nov 2003 07:54:09 -0000	1.26
***************
*** 103,110 ****
  								$event_start 	= @$val["event_start"];
  								$event_end 		= @$val["event_end"];
  								$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
  								$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
- 								$calendar_name2	= addslashes($calendar_name);
- 								$calendar_name2 = urlencode($calendar_name2);
  								$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
  								
--- 103,109 ----
  								$event_start 	= @$val["event_start"];
  								$event_end 		= @$val["event_end"];
+ 								$event_calna 	= @$val["calname"];
  								$event_start 	= date ($timeFormat, @strtotime ("$event_start"));
  								$event_end 		= date ($timeFormat, @strtotime ("$event_end"));
  								$event_text = word_wrap($event_text, 21, $tomorrows_events_lines);
  								
***************
*** 112,120 ****
  									$event_start = $all_day_lang; 
  									$event_end = ''; 
! 									openevent($calendar_name2, $event_start, 
  									$event_end, $val, $tomorrows_events_lines, 21, '<i>', '</i>', 'psf'); 
  									echo "<br>\n"; 
  								} else { 
! 									openevent($calendar_name2, $event_start, 
  									$event_end, $val, $tomorrows_events_lines, 21, '<font class="G10B">&#149; ', '</font>', 'psf'); 
  									echo "<br>\n"; 
--- 111,119 ----
  									$event_start = $all_day_lang; 
  									$event_end = ''; 
! 									openevent($event_calna, $event_start, 
  									$event_end, $val, $tomorrows_events_lines, 21, '<i>', '</i>', 'psf'); 
  									echo "<br>\n"; 
  								} else { 
! 									openevent($event_calna, $event_start, 
  									$event_end, $val, $tomorrows_events_lines, 21, '<font class="G10B">&#149; ', '</font>', 'psf'); 
  									echo "<br>\n";