[geeklog-cvs] geeklog-1.3/public_html/admin event.php,1.53,1.54

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html/admin
In directory www:/tmp/cvs-serv8735/admin

Modified Files:
	event.php 
Log Message:
Various improvements for event handling (12am/pm, personal calendars, quick add form).


Index: event.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/event.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** event.php	10 Dec 2004 09:26:17 -0000	1.53
--- event.php	11 Dec 2004 14:54:49 -0000	1.54
***************
*** 177,201 ****
      $end_day = date('d', $end_stamp);
      $end_year = date('Y', $end_stamp);
!     $start_ampm = '';
!     $end_ampm = '';
      $start_hour = date('H', $start_stamp);
      $start_minute = date('i', $start_stamp);
      if ($start_hour > 12) {
          $start_hour = $start_hour - 12;
!         $event_templates->set_var('startpm_selected','selected="selected"');
!     } else {
!         $event_templates->set_var('startam_selected','selected="selected"');
      }
      $end_hour = date('H', $end_stamp);
      $end_minute = date('i', $end_stamp);
!     $ampm = '';
      if ($end_hour > 12) {
          $end_hour = $end_hour - 12;
!         $ampm = 'pm';
!     }
!     if ($ampm == 'pm') {
!         $event_templates->set_var('endpm_selected', 'selected="selected"');
!     } else {
!         $event_templates->set_var('endam_selected', 'selected="selected"');
      }
  
--- 177,209 ----
      $end_day = date('d', $end_stamp);
      $end_year = date('Y', $end_stamp);
! 
      $start_hour = date('H', $start_stamp);
      $start_minute = date('i', $start_stamp);
+     if ($start_hour >= 12) {
+         $event_templates->set_var ('startam_selected', '');
+         $event_templates->set_var ('startpm_selected', 'selected="selected"');
+     } else {
+         $event_templates->set_var ('startam_selected', 'selected="selected"');
+         $event_templates->set_var ('startpm_selected', '');
+     }
      if ($start_hour > 12) {
          $start_hour = $start_hour - 12;
!     } else if ($start_hour == 0) {
!         $start_hour = 12;
      }
+ 
      $end_hour = date('H', $end_stamp);
      $end_minute = date('i', $end_stamp);
!     if ($end_hour >= 12) {
!         $event_templates->set_var ('endam_selected', '');
!         $event_templates->set_var ('endpm_selected', 'selected="selected"');
!     } else {
!         $event_templates->set_var ('endam_selected', 'selected="selected"');
!         $event_templates->set_var ('endpm_selected', '');
!     }
      if ($end_hour > 12) {
          $end_hour = $end_hour - 12;
!     } else if ($end_hour == 0) {
!         $end_hour = 12;
      }