[geeklog-cvs] geeklog-1.3/public_html calendar_event.php,1.23,1.24

[dhaun at geeklog.net]

Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory internal.geeklog.net:/tmp/cvs-serv8421

Modified Files:
	calendar_event.php 
Log Message:
Fixed localised display of all-day events, fixed <br> tags for event address.


Index: calendar_event.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/calendar_event.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** calendar_event.php	27 Nov 2002 18:11:26 -0000	1.23
--- calendar_event.php	29 Mar 2003 20:44:24 -0000	1.24
***************
*** 9,17 ****
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000,2001 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs       - tony at tonybibbs.com                            |
! // |          Mark Limburg     - mlimburg at users.sourceforge.net                |
! // |          Jason Wittenburg - jwhitten at securitygeeks.com                    |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
--- 9,17 ----
  // |                                                                           |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
! // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
! // |          Mark Limburg      - mlimburg at users.sourceforge.net               |
! // |          Jason Whittenburg - jwhitten at securitygeeks.com                   |
  // +---------------------------------------------------------------------------+
  // |                                                                           |
***************
*** 50,54 ****
  {
      global $_USER, $LANG02, $_CONF, $_TABLES;
! 	
      $retval .= COM_startBlock($LANG02[11]);
      $eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
--- 50,54 ----
  {
      global $_USER, $LANG02, $_CONF, $_TABLES;
! 
      $retval .= COM_startBlock($LANG02[11]);
      $eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
***************
*** 499,503 ****
                      
                  } else {
!                     $thedatetime = strftime('%A, %B %e %Y',strtotime($A['start'] . ' ' . $A['timestart']));
                      $cal_templates->set_var('event_start', $thedatetime);
                      $cal_templates->set_var('event_end', $LANG30[26]);
--- 499,503 ----
                      
                  } else {
!                     $thedatetime = strftime("%A, " . $_CONF['shortdate'],strtotime($A['start']));
                      $cal_templates->set_var('event_start', $thedatetime);
                      $cal_templates->set_var('event_end', $LANG30[26]);
***************
*** 516,520 ****
                      $cal_templates->set_var('event_address2','');
                  }
!                 if (empty($A['event_city']) && empty($A['event_state']) && empty($A['event_zip'])) {
                      $cal_templates->set_var('br2','');
                  } else {
--- 516,520 ----
                      $cal_templates->set_var('event_address2','');
                  }
!                 if (empty($A['city']) && empty($A['state']) && empty($A['zip'])) {
                      $cal_templates->set_var('br2','');
                  } else {
***************
*** 531,534 ****
--- 531,541 ----
                  }
                  $cal_templates->set_var('event_zip', $A['zipcode']);
+                 if (!empty ($A['address1']) || !empty ($A['address2']) ||
+                     !empty ($A['city']) || !empty ($A['state']) ||
+                     !empty($A['zip'])) {
+                     $cal_templates->set_var ('br0', '<br>');
+                 } else {
+                     $cal_templates->set_var ('br0', '');
+                 }
                  $cal_templates->set_var('event_location', stripslashes ($A['location']));
                  $cal_templates->set_var('lang_description', $LANG02[5]);