[geeklog-cvs] geeklog-1.3/public_html calendar.php,1.46,1.47

[dhaun at iowaoutdoors.org]

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

Modified Files:
	calendar.php 
Log Message:
Fixed two class names (cal-date and cal-event - using a '-' instead of an underscore) and introduced some additional variables.


Index: calendar.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/calendar.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** calendar.php	9 Aug 2004 18:36:29 -0000	1.46
--- calendar.php	29 Aug 2004 14:16:06 -0000	1.47
***************
*** 668,674 ****
  				'addevent'=>'addeventoption.thtml'));
  
! $cal_templates->set_var('site_url', $_CONF['site_url']);
  $cal_templates->set_var ('layout_url', $_CONF['layout_url']);
! $cal_templates->set_var('mode', $mode);
  if ($mode == 'personal') {
      $cal_templates->set_var ('start_block', COM_startBlock ($LANG30[12]));
--- 668,674 ----
  				'addevent'=>'addeventoption.thtml'));
  
! $cal_templates->set_var ('site_url', $_CONF['site_url']);
  $cal_templates->set_var ('layout_url', $_CONF['layout_url']);
! $cal_templates->set_var ('mode', $mode);
  if ($mode == 'personal') {
      $cal_templates->set_var ('start_block', COM_startBlock ($LANG30[12]));
***************
*** 786,790 ****
  
              $cal_templates->set_var('cal_day_anchortags', '<a href="calendar.php?view=day&mode=' . $mode . '&day=' . $curday->daynumber. '&month=' . $month
!                 . '&year=' . $year . '" class="cal_date">' . $curday->daynumber. '</a><hr>');
  
              if ($mode == 'personal') {
--- 786,790 ----
  
              $cal_templates->set_var('cal_day_anchortags', '<a href="calendar.php?view=day&mode=' . $mode . '&day=' . $curday->daynumber. '&month=' . $month
!                 . '&year=' . $year . '" class="cal-date">' . $curday->daynumber. '</a><hr>');
  
              if ($mode == 'personal') {
***************
*** 799,806 ****
                  $calsql = "SELECT * FROM {$_TABLES['events']} WHERE (datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend) ORDER BY datestart,timestart";
              }
!             
              $query2 = DB_query($calsql);
              $q2_numrows = DB_numRows($query2);
!             
              if ($q2_numrows > 0) {
                  $entries = '';
--- 799,806 ----
                  $calsql = "SELECT * FROM {$_TABLES['events']} WHERE (datestart >= \"$year-$month-$curday->daynumber 00:00:00\" AND datestart <= \"$year-$month-$curday->daynumber 23:59:59\") OR (dateend >= \"$year-$month-$curday->daynumber 00:00:00\" AND dateend <= \"$year-$month-$curday->daynumber 23:59:59\") OR (\"$year-$month-$curday->daynumber\" between datestart and dateend) ORDER BY datestart,timestart";
              }
! 
              $query2 = DB_query($calsql);
              $q2_numrows = DB_numRows($query2);
! 
              if ($q2_numrows > 0) {
                  $entries = '';
***************
*** 810,815 ****
                          if ($results['title']) {
                              $cal_templates->set_var('cal_day_entries','');
!                             $entries .= '<a href="calendar_event.php?mode=' . $mode . '&eid=' . $results['eid'] . '" class="cal_event">' 
!                                 . stripslashes($results['title']) . '</a><hr>';
                          }
                      } 
--- 810,814 ----
                          if ($results['title']) {
                              $cal_templates->set_var('cal_day_entries','');
!                             $entries .= '<a href="' . $_CONF['site_url'] . '/calendar_event.php?mode=' . $mode . '&eid=' . $results['eid'] . '" class="cal-event">' . stripslashes ($results['title']) . '</a><hr>';
                          }
                      } 
***************
*** 880,885 ****
--- 879,888 ----
  }
  $cal_templates->set_var('lang_addevent', $LANG30[8]);
+ $cal_templates->set_var('lang_cal_curmo', $LANG30[12 + $currentmonth]);
  $cal_templates->set_var('cal_curmo_num', $currentmonth);
  $cal_templates->set_var('cal_curyr_num', $currentyear);
+ $cal_templates->set_var('lang_cal_displaymo', $LANG30[12 + $month]);
+ $cal_templates->set_var('cal_displaymo_num', $month);
+ $cal_templates->set_var('cal_displayyr_num', $year);
  $cal_templates->parse('add_event_option','addevent',true);