[geeklog-cvs] geeklog-1.3/public_html calendar.php,1.37,1.38
dhaun at iowaoutdoors.org
dhaun at iowaoutdoors.org
Mon Aug 2 15:44:00 EDT 2004
Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv1965/public_html
Modified Files:
calendar.php
Log Message:
Introduced a couple of CSS class names so that themes can style the small calendars in month view
Index: calendar.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/calendar.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** calendar.php 26 Jul 2004 14:32:42 -0000 1.37
--- calendar.php 2 Aug 2004 19:43:56 -0000 1.38
***************
*** 159,190 ****
* Gets a small, text-only version of a calendar
*
! * $m int Month to display
! * $y int Year to display
*
*/
! function getSmallCalendar($m, $y, $mode='')
{
global $_CONF, $LANG30;
$retval = '';
! $mycal = new Calendar();
setCalendarLanguage ($mycal);
! $mycal->setCalendarMatrix($m,$y);
! if (!empty($mode)) {
$mode = '&mode=' . $mode;
}
! $retval .= '<font size="-2">' . LB . '<table>' . LB
! . '<tr><td align="center" colspan="7"><a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m . '&year=' . $y . $mode . '">'
! . $mycal->getMonthName($m) . '</a></td></tr>'
! . makeDaysHeadline() . LB;
for ($i = 1; $i <= 6; $i++) {
! $retval .= '<tr>' . LB;
for ($j = 1; $j <= 7; $j++) {
! $retval .= '<td align="right">' . LB;
! $curday = $mycal->getDayData($i, $j);
! if (!empty($curday)) {
$retval .= $curday->daynumber;
} else {
--- 159,201 ----
* Gets a small, text-only version of a calendar
*
! * @param int $m Month to display
! * @param int $y Year to display
! * @return string HTML for small calendar
*
*/
! function getSmallCalendar ($m, $y, $mode = '')
{
global $_CONF, $LANG30;
$retval = '';
! $mycal = new Calendar ();
setCalendarLanguage ($mycal);
! $mycal->setCalendarMatrix ($m, $y);
! if (!empty ($mode)) {
$mode = '&mode=' . $mode;
}
! $retval .= '<table class="smallcal">' . LB
! . '<tr class="smallcal-headline"><td align="center" colspan="7">'
! . '<a href="' . $_CONF['site_url'] . '/calendar.php?month=' . $m
! . '&year=' . $y . $mode . '">' . $mycal->getMonthName ($m)
! . '</a></td></tr>' . makeDaysHeadline () . LB;
for ($i = 1; $i <= 6; $i++) {
! if ($i % 2 == 0) {
! $retval .= '<tr class="smallcal-week-even">' . LB;
! } else {
! $retval .= '<tr class="smallcal-week-odd">' . LB;
! }
for ($j = 1; $j <= 7; $j++) {
! $retval .= '<td align="right"';
! $curday = $mycal->getDayData ($i, $j);
! if (!empty ($curday)) {
! if ($j % 2 == 0) {
! $retval .= ' class="smallcal-day-even">' . LB;
! } else {
! $retval .= ' class="smallcal-day-odd">' . LB;
! }
$retval .= $curday->daynumber;
} else {
***************
*** 193,204 ****
$j = 8;
}
! $retval .= " ";
}
! $retval .= "</td>".LB;
}
! $retval .= "</tr>".LB;
}
! $retval .= '</table></font>'.LB;
return $retval;
--- 204,215 ----
$j = 8;
}
! $retval .= '> ';
}
! $retval .= '</td>' . LB;
}
! $retval .= '</tr>' . LB;
}
! $retval .= '</table>' . LB;
return $retval;
***************
*** 448,454 ****
$cal_templates->set_var('week_num',strftime('%V',$thedate[1]));
if ($mode == 'personal') {
! $calsql = "SELECT * FROM {$_TABLES["personal_events"]} WHERE (uid = {$_USER["uid"]}) AND ((allday=1 AND datestart = \"$year-$month-$day\") OR (datestart >= \"$year-$month-$day 00:00:00\" AND datestart <= \"$year-$month-$day 23:59:59\") OR (dateend >= \"$year-$month-$day 00:00:00\" AND dateend <= \"$year-$month-$day 23:59:59\") OR (\"$year-$month-$day\" between datestart and dateend)) ORDER BY datestart,timestart";
} else {
! $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((allday=1 AND datestart = \"$year-$month-$day\") OR (datestart >= \"$year-$month-$day 00:00:00\" AND datestart <= \"$year-$month-$day 23:59:59\") OR (dateend >= \"$year-$month-$day 00:00:00\" AND dateend <= \"$year-$month-$day 23:59:59\") OR (\"$year-$month-$day\" between datestart and dateend)) ORDER BY datestart,timestart";
}
$result = DB_query($calsql);
--- 459,465 ----
$cal_templates->set_var('week_num',strftime('%V',$thedate[1]));
if ($mode == 'personal') {
! $calsql = "SELECT * FROM {$_TABLES['personal_events']} WHERE (uid = {$_USER["uid"]}) AND ((allday=1 AND datestart = \"$year-$month-$day\") OR (datestart >= \"$year-$month-$day 00:00:00\" AND datestart <= \"$year-$month-$day 23:59:59\") OR (dateend >= \"$year-$month-$day 00:00:00\" AND dateend <= \"$year-$month-$day 23:59:59\") OR (\"$year-$month-$day\" between datestart and dateend)) ORDER BY datestart,timestart";
} else {
! $calsql = "SELECT * FROM {$_TABLES['events']} WHERE ((allday=1 AND datestart = \"$year-$month-$day\") OR (datestart >= \"$year-$month-$day 00:00:00\" AND datestart <= \"$year-$month-$day 23:59:59\") OR (dateend >= \"$year-$month-$day 00:00:00\" AND dateend <= \"$year-$month-$day 23:59:59\") OR (\"$year-$month-$day\" between datestart and dateend)) ORDER BY datestart,timestart";
}
$result = DB_query($calsql);
***************
*** 513,518 ****
$colsleft = $colsleft - 1;
next($thedata);
! }
! $cal_templates->set_var ($i . '_time', strftime ($_CONF['timeonly'], mktime ($i, 0)));
$cal_templates->parse($i.'_cols','column',true);
if ($nrows > 0) {
--- 524,530 ----
$colsleft = $colsleft - 1;
next($thedata);
! }
! $cal_templates->set_var ($i . '_hour',
! strftime ($_CONF['timeonly'], mktime ($i, 0)));
$cal_templates->parse($i.'_cols','column',true);
if ($nrows > 0) {
***************
*** 615,624 ****
}
$monthname = $cal->getMonthName($monthnum);
! $cal_templates->set_var('day'.$i,$dayname . ", <a href=\"{$_CONF['site_url']}/calendar.php?mode=$mode&view=day&day=$daynum&month=$monthnum&year=$yearnum\">" . strftime ("%x", $thedate[1]) . '</a>');
$cal_templates->set_var('langlink_addevent'.$i, '<a href="' . $_CONF['site_url'] . "/submit.php?type=event&mode=$mode&day=$daynum&month=$monthnum&year=$yearnum" . '">' . $LANG30[8] . '</a>');
if ($mode == 'personal') {
! $calsql = "SELECT * FROM {$_TABLES["personal_events"]} WHERE (uid = {$_USER["uid"]}) AND ((allday=1 AND datestart = \"$yearnum-$monthnum-$daynum\") OR (datestart >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND datestart <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (dateend >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND dateend <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (\"$yearnum-$monthnum-$daynum\" between datestart and dateend)) ORDER BY datestart,timestart";
} else {
! $calsql = "SELECT * FROM {$_TABLES["events"]} WHERE ((allday=1 AND datestart = \"$yearnum-$monthnum-$daynum\") OR (datestart >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND datestart <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (dateend >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND dateend <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (\"$yearnum-$monthnum-$daynum\" between datestart and dateend)) ORDER BY datestart,timestart";
}
$result = DB_query($calsql);
--- 627,636 ----
}
$monthname = $cal->getMonthName($monthnum);
! $cal_templates->set_var('day'.$i,$dayname . ", <a href=\"{$_CONF['site_url']}/calendar.php?mode=$mode&view=day&day=$daynum&month=$monthnum&year=$yearnum\">" . strftime ('%x', $thedate[1]) . '</a>');
$cal_templates->set_var('langlink_addevent'.$i, '<a href="' . $_CONF['site_url'] . "/submit.php?type=event&mode=$mode&day=$daynum&month=$monthnum&year=$yearnum" . '">' . $LANG30[8] . '</a>');
if ($mode == 'personal') {
! $calsql = "SELECT * FROM {$_TABLES['personal_events']} WHERE (uid = {$_USER["uid"]}) AND ((allday=1 AND datestart = \"$yearnum-$monthnum-$daynum\") OR (datestart >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND datestart <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (dateend >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND dateend <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (\"$yearnum-$monthnum-$daynum\" between datestart and dateend)) ORDER BY datestart,timestart";
} else {
! $calsql = "SELECT * FROM {$_TABLES['events']} WHERE ((allday=1 AND datestart = \"$yearnum-$monthnum-$daynum\") OR (datestart >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND datestart <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (dateend >= \"$yearnum-$monthnum-$daynum 00:00:00\" AND dateend <= \"$yearnum-$monthnum-$daynum 23:59:59\") OR (\"$yearnum-$monthnum-$daynum\" between datestart and dateend)) ORDER BY datestart,timestart";
}
$result = DB_query($calsql);
***************
*** 689,700 ****
$cal_templates->set_var('mode', $mode);
if ($mode == 'personal') {
! $cal_templates->set_var ('start_block', COM_startBlock ($LANG30[12]));
! $cal_templates->set_var ('end_block', COM_endBlock ());
} else {
! $cal_templates->set_var ('start_block', COM_startBlock ($LANG30[11]));
! $cal_templates->set_var ('end_block', COM_endBlock ());
}
! $cal_templates->set_var('previous_months_cal',getSmallCalendar($prevmonth, $prevyear, $mode));
! $cal_templates->set_var('next_months_cal',getSmallCalendar($nextmonth, $nextyear, $mode));
$cal_templates->set_var('cal_prevmo_num', $prevmonth);
$cal_templates->set_var('cal_prevyr_num', $prevyear);
--- 701,721 ----
$cal_templates->set_var('mode', $mode);
if ($mode == 'personal') {
! $cal_templates->set_var ('start_block', COM_startBlock ($LANG30[12]));
! $cal_templates->set_var ('end_block', COM_endBlock ());
} else {
! $cal_templates->set_var ('start_block', COM_startBlock ($LANG30[11]));
! $cal_templates->set_var ('end_block', COM_endBlock ());
}
!
! $smallcal_prev = getSmallCalendar ($prevmonth, $prevyear, $mode);
! $cal_templates->set_var ('previous_months_calendar', $smallcal_prev);
! $cal_templates->set_var ('previous_months_cal',
! '<font size="-2">' . LB . $smallcal_prev . '</font>');
!
! $smallcal_next = getSmallCalendar ($nextmonth, $nextyear, $mode);
! $cal_templates->set_var ('next_months_calendar', $smallcal_next);
! $cal_templates->set_var ('next_months_cal',
! '<font size="-2">' . LB . $smallcal_next . '</font>');
!
$cal_templates->set_var('cal_prevmo_num', $prevmonth);
$cal_templates->set_var('cal_prevyr_num', $prevyear);
***************
*** 799,808 ****
$month = '0' . $month;
}
! $calsql = "SELECT * FROM {$_TABLES["personal_events"]} WHERE (uid = {$_USER["uid"]}) AND ((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";
} else {
if (strlen($month) == 1) {
$month = '0' . $month;
}
! $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";
}
--- 820,829 ----
$month = '0' . $month;
}
! $calsql = "SELECT * FROM {$_TABLES['personal_events']} WHERE (uid = {$_USER["uid"]}) AND ((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";
} else {
if (strlen($month) == 1) {
$month = '0' . $month;
}
! $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";
}
More information about the geeklog-cvs
mailing list