[geeklog-cvs] geeklog-1.3/public_html calendar_event.php,1.33,1.34
dhaun at iowaoutdoors.org
dhaun at iowaoutdoors.org
Tue Aug 31 15:00:25 EDT 2004
- Previous message (by thread): [geeklog-cvs] geeklog-1.3/language english.php,1.124,1.125 english_utf-8.php,1.6,1.7 german.php,1.103,1.104 german_formal.php,1.23,1.24 german_utf-8.php,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv16235
Modified Files:
calendar_event.php
Log Message:
Rewrote the code that decides which of the {br0}, {br1}, and {br2} variables to set.
Index: calendar_event.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/calendar_event.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** calendar_event.php 9 Aug 2004 18:36:29 -0000 1.33
--- calendar_event.php 31 Aug 2004 19:00:22 -0000 1.34
***************
*** 49,53 ****
function adduserevent($eid)
{
! global $_CONF, $_TABLES, $_USER, $_STATES, $LANG01, $LANG02;
$eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
--- 49,53 ----
function adduserevent($eid)
{
! global $_CONF, $_TABLES, $_USER, $LANG01, $LANG02;
$eventsql = "SELECT *, datestart AS start, dateend AS end, timestart, timeend, allday FROM {$_TABLES['events']} WHERE eid='$eid'";
***************
*** 534,614 ****
$cal_templates->set_var('lang_when', $LANG02[3]);
if ($A['allday'] == 0 OR ($A['allday'] == 1 AND $A['start'] <> $A['end'])) {
! $thedatetime = COM_getUserDateTimeFormat($A['start'] . ' ' . $A['timestart']);
! $cal_templates->set_var('event_start', $thedatetime[0]);
! if( $A['start'] == $A['end'] )
! {
! $thedatetime[0] = strftime( $_CONF['timeonly'], strtotime($A['dateend'].' '.$A['timeend']) );
! }
! else
! {
! $thedatetime = COM_getUserDateTimeFormat($A['end'] . ' ' . $A['timeend']);
}
!
!
! $cal_templates->set_var('event_end', $thedatetime[0]);
!
!
!
! } else {
! $thedatetime = strftime('%A, ' . $_CONF['shortdate'],strtotime($A['start']));
! $cal_templates->set_var('event_start', $thedatetime);
! $cal_templates->set_var('event_end', $LANG30[26]);
! }
! $cal_templates->set_var('lang_where', $LANG02[4]);
! if (!empty($A['address1'])) {
! $cal_templates->set_var('event_address1', stripslashes ($A['address1']));
! } else {
! $cal_templates->set_var('event_address1','');
! }
! if (!empty($A['address2'])) {
! $cal_templates->set_var('br1', '<br>');
! $cal_templates->set_var('event_address2', stripslashes ($A['address2']));
} else {
! $cal_templates->set_var('br1', '');
! $cal_templates->set_var('event_address2','');
}
! if (empty($A['city']) && empty($A['state']) && empty($A['zip'])) {
! $cal_templates->set_var('br2','');
} else {
! $cal_templates->set_var('br2','<br>');
! }
! $cal_templates->set_var('event_city', stripslashes($A['city']));
! if (empty($A['state']) or ($A['state'] == '--'))
! {
! $cal_templates->set_var('event_state', '');
! $cal_templates->set_var('event_state_name', '');
! $cal_templates->set_var('event_state_only', '');
! $cal_templates->set_var('event_state_name_only', '');
! }
! else
! {
! $cal_templates->set_var('event_state', ', ' . $A['state']);
! $cal_templates->set_var('event_state_name',
! ', ' . $_STATES[$A['state']]);
! $cal_templates->set_var('event_state_only', $A['state']);
! $cal_templates->set_var('event_state_name_only',
! $_STATES[$A['state']]);
}
! $cal_templates->set_var('event_zip', $A['zipcode']);
! if (!empty ($A['location']) && (!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]);
! $cal_templates->set_var('event_description',
nl2br (stripslashes ($A['description'])));
! $cal_templates->set_var('lang_event_type', $LANG12[49]);
! $cal_templates->set_var('event_type', $A['event_type']);
! $cal_templates->parse('event_details', 'details', true);
! //$cal_templates->parse('output','events');
! //$display .= $cal_templates->finish($cal_templates->get_var('output'));
! } else {
! //$display .= '<br><b>'.$LANG_ACCESS['accessdenied'].'</b>'
! // .'<p>'.$LANG_ACCESS['eventdenialmsg'] . COM_endBlock() . COM_siteFooter();
}
}
--- 534,614 ----
$cal_templates->set_var('lang_when', $LANG02[3]);
if ($A['allday'] == 0 OR ($A['allday'] == 1 AND $A['start'] <> $A['end'])) {
! $thedatetime = COM_getUserDateTimeFormat ($A['start'] . ' '
! . $A['timestart']);
! $cal_templates->set_var ('event_start', $thedatetime[0]);
! if ($A['start'] == $A['end']) {
! $thedatetime[0] = strftime ($_CONF['timeonly'],
! strtotime ($A['dateend'] . ' ' . $A['timeend']));
! } else {
! $thedatetime = COM_getUserDateTimeFormat ($A['end']
! . ' ' . $A['timeend']);
}
! $cal_templates->set_var ('event_end', $thedatetime[0]);
} else {
! $thedatetime = strftime ('%A, ' . $_CONF['shortdate'],
! strtotime ($A['start']));
! $cal_templates->set_var ('event_start', $thedatetime);
! $cal_templates->set_var ('event_end', $LANG30[26]);
}
!
! // set the location variables
! $cal_templates->set_var ('lang_where', $LANG02[4]);
! $cal_templates->set_var ('event_location',
! stripslashes ($A['location']));
! $cal_templates->set_var ('event_address1',
! stripslashes ($A['address1']));
! $cal_templates->set_var ('event_address2',
! stripslashes ($A['address2']));
! $cal_templates->set_var ('event_zip', $A['zipcode']);
! $cal_templates->set_var ('event_city',
! stripslashes ($A['city']));
! $cal_templates->set_var ('event_state_only', $A['state']);
! if (empty ($A['state']) || ($A['state'] == '--')) {
! $cal_templates->set_var ('event_state', '');
! $cal_templates->set_var ('event_state_name', '');
! $cal_templates->set_var ('event_state_name_only', '');
} else {
! $cal_templates->set_var ('event_state', ', ' . $A['state']);
! $cal_templates->set_var ('event_state_name',
! ', ' . $_STATES[$A['state']]);
! $cal_templates->set_var ('event_state_name_only',
! $_STATES[$A['state']]);
}
!
! // now figure out which of the {brX} variables to set ...
! $hasCityEtc = (!empty ($A['city']) || !empty ($A['zip']) ||
! !empty ($A['state']));
! if (empty ($A['location']) && empty ($A['address1']) &&
! empty ($A['address2']) && !$hasCityEtc) {
$cal_templates->set_var ('br0', '');
+ $cal_templates->set_var ('br1', '');
+ $cal_templates->set_var ('br2', '');
+ } else {
+ if (empty ($A['location']) || (empty ($A['address1']) &&
+ empty ($A['address2']) && !$hasCityEtc)) {
+ $cal_templates->set_var ('br0', '');
+ } else {
+ $cal_templates->set_var ('br0', '<br>');
+ }
+ if (empty ($A['address1']) || (empty ($A['address2']) &&
+ !$hasCityEtc)) {
+ $cal_templates->set_var ('br1', '');
+ } else {
+ $cal_templates->set_var ('br1', '<br>');
+ }
+ if (empty ($A['address2']) || !$hasCityEtc) {
+ $cal_templates->set_var ('br2', '');
+ } else {
+ $cal_templates->set_var ('br2', '<br>');
+ }
}
!
! $cal_templates->set_var ('lang_description', $LANG02[5]);
! $cal_templates->set_var ('event_description',
nl2br (stripslashes ($A['description'])));
! $cal_templates->set_var ('lang_event_type', $LANG12[49]);
! $cal_templates->set_var ('event_type', $A['event_type']);
! $cal_templates->parse ('event_details', 'details', true);
}
}
***************
*** 630,635 ****
}
! $cal_templates->parse('output','events');
! $display .= $cal_templates->finish($cal_templates->get_var('output'));
}
--- 630,635 ----
}
! $cal_templates->parse ('output', 'events');
! $display .= $cal_templates->finish ($cal_templates->get_var ('output'));
}
***************
*** 638,642 ****
} // end switch
! echo $display
?>
--- 638,642 ----
} // end switch
! echo $display;
?>
- Previous message (by thread): [geeklog-cvs] geeklog-1.3/language english.php,1.124,1.125 english_utf-8.php,1.6,1.7 german.php,1.103,1.104 german_formal.php,1.23,1.24 german_utf-8.php,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list