loncom/interface/lonannounce.pm - diff

Return to lonannounce.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonannounce.pm between versions 1.62 and 1.87

version 1.62, 2006/11/29 07:46:39	version 1.87, 2013/05/27 00:19:32
Line 37 use Apache::lonnavmaps();	Line 37 use Apache::lonnavmaps();
use Apache::lonrss();	use Apache::lonrss();
use Apache::lonnet;	use Apache::lonnet;
use HTML::Entities();	use HTML::Entities();
	use LONCAPA qw(:match);
	use DateTime;
	use DateTime::TimeZone;

my %todayhash;	my %todayhash;
my %showedcheck;	my %showedcheck;

sub editfield {	sub editfield {
my ($r,$start,$end,$text)=@_;	my ($r,$start,$end,$text,$crstype)=@_;
# Deal with date forms	# Deal with date forms
my $startdateform = &Apache::lonhtmlcommon::date_setter('anno',	my $startdateform = &Apache::lonhtmlcommon::date_setter('anno',
'startdate',	'startdate',
Line 50 sub editfield {	Line 53 sub editfield {
my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',	my $enddateform = &Apache::lonhtmlcommon::date_setter('anno',
'enddate',	'enddate',
$end);	$end);
my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');	#my $help=&Apache::loncommon::help_open_menu('Calendar Add Announcement','Calendar_Add_Announcement',274,'Communication Tools');
my %lt=&Apache::lonlocal::texthash('post' => 'Post Announcement',	my $help=&Apache::loncommon::help_open_topic('Calendar_Add_Announcement');

	my %lt=&Apache::lonlocal::texthash('annon' => 'Course Announcements',
	'post' => 'Post Announcement',
'start' => 'Starting date',	'start' => 'Starting date',
'end' => 'Ending date',	'end' => 'Ending date',
'incrss' => 'Include in course RSS newsfeed');	'incrss' => 'Include in course RSS newsfeed');
	if ($crstype eq 'Community') {
	$lt{'annon'} = &mt('Community Announcements');
	$lt{'incrss'} = &mt('Include in community RSS newsfeed');
	}

$r->print(<<ENDFORM);	$r->print(<<ENDFORM);
$help	<h2>$lt{'annon'} $help</h2>
<form name="anno" method="post">	<form name="anno" method="post" action="">
<input type="hidden" value='' name="action" />	<input type="hidden" value='' name="action" />
<table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>	<table><tr><td>$lt{'start'}:</td><td>$startdateform</td></tr>
<tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>	<tr><td>$lt{'end'}:</td><td>$enddateform</td></tr></table>
<textarea name="msg" rows="4" cols="60">$text</textarea>	<textarea name="msg" rows="4" cols="60">$text</textarea>
<br />	<br />
<label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>	<label><input type="checkbox" name="rsspost" /> $lt{'incrss'}</label>
<br /><input type="button" onClick="trysubmit()" value="$lt{'post'}" /><hr />	<br /><input type="button" onclick="trysubmit()" value="$lt{'post'}" /><hr />
ENDFORM	ENDFORM
}	}

Line 73 sub readcalendar {	Line 83 sub readcalendar {
my $courseid=shift;	my $courseid=shift;
my $coursenum=$env{'course.'.$courseid.'.num'};	my $coursenum=$env{'course.'.$courseid.'.num'};
my $coursedom=$env{'course.'.$courseid.'.domain'};	my $coursedom=$env{'course.'.$courseid.'.domain'};
	if ($coursenum eq '' \|\| $coursedom eq '') {
	my %courseinfo=&Apache::lonnet::coursedescription($courseid);
	if ($coursenum eq '' && exists($courseinfo{'num'})) {
	$coursenum = $courseinfo{'num'};
	}
	if ($coursedom eq '' && exists($courseinfo{'domain'})) {
	$coursedom = $courseinfo{'domain'};
	}
	}

my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);	my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);
my %returnhash=();	my %returnhash=();
foreach my $item (keys(%thiscal)) {	foreach my $item (keys(%thiscal)) {
unless (($item=~/^error\:/) \|\| ($thiscal{$item}=~/^error\:/)) {	unless (($item=~/^error\:/) \|\| ($thiscal{$item}=~/^error\:/)) {
$returnhash{$courseid.'@'.$item}=$thiscal{$item};	my ($start,$end)=split('_',$item);
	$returnhash{join("\0",$courseid,$start,$end)}=$thiscal{$item};
}	}
}	}
my $can_see_hidden = ($env{'request.role.adv'} &&	my $can_see_hidden = ($env{'request.role.adv'} &&
Line 87 sub readcalendar {	Line 108 sub readcalendar {
if ($courseid eq $env{'request.course.id'}) {	if ($courseid eq $env{'request.course.id'}) {
$navmap = Apache::lonnavmaps::navmap->new();	$navmap = Apache::lonnavmaps::navmap->new();
}	}
my %resourcedata=
&Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);	my $resourcedata=
foreach my $thiskey (sort keys %resourcedata) {	&Apache::lonnet::get_courseresdata($coursenum,$coursedom);
if ($resourcedata{$thiskey.'.type'}=~/^date/) {	if (ref($resourcedata) ne 'HASH') {
	return %returnhash;
	}
	foreach my $thiskey (keys(%$resourcedata)) {
	if ($resourcedata->{$thiskey.'.type'}=~/^date/) {
my ($course,$middle,$part,$name)=	my ($course,$middle,$part,$name)=
($thiskey=~/^(\w+)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);	($thiskey=~/^(\Q$courseid\E)\.(?:(.+)\.)*([\w\s]+)\.(\w+)$/);

my %data = ( 'section' => &mt('All Students'));	my %data = ( 'section' => &mt('All Students'));
if ($middle=~/^\[(.*)\]\./) {	if ($middle=~/^\[(.*)\]\./) {
my $sec=$1;	my $sec=$1;
Line 118 sub readcalendar {	Line 144 sub readcalendar {
}	}
if (!$can_see_hidden) {	if (!$can_see_hidden) {
my $res = $navmap->getResourceByUrl($map_url);	my $res = $navmap->getResourceByUrl($map_url);
if ($res && $res->randomout()) { next; }	if ($res && $res->randomout()) {
	next;
	}
}	}
$data{'realm'}=&mt('Folder/Map');	$data{'realm'}=&mt('Folder/Map');
$data{'url'} = $map_url;	$data{'url'} = $map_url;
Line 128 sub readcalendar {	Line 156 sub readcalendar {
}	}
if (!$can_see_hidden) {	if (!$can_see_hidden) {
my $res = $navmap->getBySymb($middle);	my $res = $navmap->getBySymb($middle);
if ($res && $res->randomout()) { next; }	if ($res && $res->randomout()) {
	next;
	}
}	}
$data{'realm'} = &mt('Resource');	$data{'realm'} = &mt('Resource');
$data{'symb'} = $middle;	$data{'symb'} = $middle;
Line 139 sub readcalendar {	Line 169 sub readcalendar {
# see if accidentally answerdate is before duedate	# see if accidentally answerdate is before duedate
my $answerkey=$thiskey;	my $answerkey=$thiskey;
$answerkey=~s/duedate$/answerdate/;	$answerkey=~s/duedate$/answerdate/;
if ($resourcedata{$thiskey}>$resourcedata{$answerkey}) {	if ($resourcedata->{$thiskey}>$resourcedata->{$answerkey}) {
$data{'datetype'} = &mt('Due and Answer Available');	$data{'datetype'} = &mt('Due and Answer Available');
}	}
}	}
Line 154 sub readcalendar {	Line 184 sub readcalendar {
# see if accidentally answerdate is before duedate	# see if accidentally answerdate is before duedate
my $duekey=$thiskey;	my $duekey=$thiskey;
$duekey=~s/answerdate$/duedate/;	$duekey=~s/answerdate$/duedate/;
if ($resourcedata{$duekey}>$resourcedata{$thiskey}) {	if ($resourcedata->{$duekey}>$resourcedata->{$thiskey}) {
# forget it	# forget it
next;	next;
}	}
$data{'datetype'}=&mt('Answer Available');	$data{'datetype'}=&mt('Answer Available');
}	}
$returnhash{$courseid.'@'.$resourcedata{$thiskey}.'_'.	$returnhash{join("\0",$courseid,
$resourcedata{$thiskey}}=\%data;	$resourcedata->{$thiskey},
	$resourcedata->{$thiskey})}=\%data;
}	}
}	}
return %returnhash;	return %returnhash;
Line 197 sub normalcell {	Line 228 sub normalcell {
&& ($env{'form.pickdate'} ne 'yes')	&& ($env{'form.pickdate'} ne 'yes')
&& (!$internalflag)) {	&& (!$internalflag)) {
$output.='<input type="checkbox" name="remove_'.$start.'_'.	$output.='<input type="checkbox" name="remove_'.$start.'_'.
$end.'">';	$end.'" />';
$showedcheck{$start.'_'.$end}=1;	$showedcheck{$start.'_'.$end}=1;
}	}
}	}
Line 270 sub order {	Line 301 sub order {
}	}

sub nextday {	sub nextday {
my %th=@_;	my ($tk,%th)=@_;
$th{'day'}++;	my ($incmonth,$incyear);
	if ($th{'day'} > 27) {
	if ($th{'month'} == 2) {
	if ($th{'day'} == 29) {
	$incmonth = 1;
	} elsif ($th{'day'} == 28) {
	if (!&is_leap_year($tk)) {
	$incmonth = 1;
	}
	}
	} elsif (($th{'month'} == 4) \|\| ($th{'month'} == 6) \|\|
	($th{'month'} == 9) \|\| ($th{'month'} == 11)) {
	if ($th{'day'} == 30) {
	$incmonth = 1;
	}
	} elsif ($th{'day'} == 31) {
	if ($th{'month'} == 12) {
	$incyear = 1;
	} else {
	$incmonth = 1;
	}
	}
	if ($incyear) {
	$th{'day'} = 1;
	$th{'month'} = 1;
	$th{'year'}++;
	} elsif ($incmonth) {
	$th{'day'} = 1;
	$th{'month'}++;
	} else {
	$th{'day'}++;
	}
	} else {
	$th{'day'}++;
	}
return (&Apache::loncommon::maketime(%th),$th{'month'});	return (&Apache::loncommon::maketime(%th),$th{'month'});
}	}

	sub is_leap_year {
	my ($thistime) = @_;
	my ($is_leap,$timezone,$dt);
	$timezone = &Apache::lonlocal::gettimezone();
	eval {
	$dt = DateTime->from_epoch(epoch => $thistime)
	->set_time_zone($timezone);
	};
	if (!$@) {
	$is_leap = $dt->is_leap_year;
	}
	return $is_leap;
	}

sub display_msg {	sub display_msg {
my ($msg) = @_;	my ($msg) = @_;

Line 301 sub display_msg {	Line 380 sub display_msg {
sub showday {	sub showday {
my ($tk,$mode,%allcal)=@_;	my ($tk,$mode,%allcal)=@_;
my %th=&Apache::loncommon::timehash($tk);	my %th=&Apache::loncommon::timehash($tk);
my ($nextday,$nextmonth)=&nextday(%th);	my ($nextday,$nextmonth)=&nextday($tk,%th);
my @outp;	my @outp;
if ($mode) {	if ($mode) {
my $oneday=24*3600;	my $oneday=24*3600;
Line 309 sub showday {	Line 388 sub showday {
$nextday+=$oneday;	$nextday+=$oneday;
}	}
foreach my $item (keys(%allcal)) {	foreach my $item (keys(%allcal)) {
my ($course,$startdate,$enddate)=($item=~/^(\w+)\@(\d+)\_(\d+)$/);	my ($courseid,$startdate,$enddate)= split("\0",$item);
if (($startdate<$nextday) && ($enddate>=$tk)) {	if (($startdate<$nextday) && ($enddate>=$tk)) {
push(@outp,[$course,$startdate,$enddate,$allcal{$item}]);	push(@outp,[$courseid,$startdate,$enddate,$allcal{$item}]);
}	}
}	}
unless ($mode) {	unless ($mode) {
Line 340 sub picklink {	Line 419 sub picklink {

sub dialscript {	sub dialscript {
return (<<ENDDIA);	return (<<ENDDIA);
<script language="Javascript">	<script type="text/javascript" language="JavaScript">
	// <![CDATA[
function dialin(day,month,year) {	function dialin(day,month,year) {
opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;	opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;
var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;	var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;
Line 352 function dialin(day,month,year) {	Line 432 function dialin(day,month,year) {
opener.$env{'form.element'}\_checkday();	opener.$env{'form.element'}\_checkday();
self.close();	self.close();
}	}
	// ]]>
</script>	</script>
ENDDIA	ENDDIA
}	}
Line 375 sub output_ics_file {	Line 456 sub output_ics_file {
$r->print("PRODID:-//LONCAPA//LONCAPA Calendar Output//EN$crlf");	$r->print("PRODID:-//LONCAPA//LONCAPA Calendar Output//EN$crlf");
my %allcal=&get_all_calendars();	my %allcal=&get_all_calendars();
foreach my $event (keys(%allcal)) {	foreach my $event (keys(%allcal)) {
my ($courseid,$startdate,$enddate)=($event=~/^(\w+)\@(\d+)\_(\d+)$/);	my ($courseid,$startdate,$enddate)= split('\0',$event);
my $uid=$event;	my $uid=$event;
$uid=~s/[\W\_]/-/gs;	$uid=~s/[\W\_]/-/gs;
$uid.='@loncapa';	$uid.='@loncapa';
Line 393 sub output_ics_file {	Line 474 sub output_ics_file {
$r->print("END:VCALENDAR$crlf");	$r->print("END:VCALENDAR$crlf");
}	}

	sub show_timezone {
	my $tzone = &Apache::lonlocal::gettimezone();
	my $dt = DateTime->now();
	my $tz = DateTime::TimeZone->new( name => $tzone );
	return &mt('([_1] time zone)',$tz->short_name_for_datetime($dt));
	}

sub handler {	sub handler {
my $r = shift;	my $r = shift;
if ($r->uri=~/\.(ics\|ical)$/) {	if ($r->uri=~/\.(ics\|ical)$/) {
Line 420 sub handler {	Line 508 sub handler {

# ---------------------------------------------- See if we are in pickdate mode	# ---------------------------------------------- See if we are in pickdate mode
my $pickdatemode=($env{'form.pickdate'} eq 'yes');	my $pickdatemode=($env{'form.pickdate'} eq 'yes');
my $pickinfo='&pickdate=yes&formname='.$env{'form.formname'}.	my $pickinfo='&pickdate=yes&formname='.$env{'form.formname'}.
'&element='.$env{'form.element'};	'&element='.$env{'form.element'};
# --------------------------------------------- Find out first day of the month	# --------------------------------------------- Find out first day of the month

my %firstday=&Apache::loncommon::timehash(	my $tk = &Apache::loncommon::maketime( 'day' => 1,
&Apache::loncommon::maketime( 'day' => 1, 'month'=> $month,	'month'=> $month,
'year' => $year, 'hours' => 0,	'year' => $year,
'minutes' => 0, 'seconds' => 0,	'hour' => 0,
'dlsav' => -1 ));	'minute' => 0,
	'second' => 0);
	my %firstday = &Apache::loncommon::timehash($tk);
my $weekday=$firstday{'weekday'};	my $weekday=$firstday{'weekday'};

# ------------------------------------------------------------ Print the screen	# ------------------------------------------------------------ Print the screen
my $js = <<ENDDOCUMENT;	my $js = <<ENDDOCUMENT;
<script type="text/javascript">	<script type="text/javascript" language="JavaScript">
	// <![CDATA[

function trysubmit() {	function trysubmit() {
document.anno.action.value="new";	document.anno.action.value="new";
Line 443 sub handler {	Line 535 sub handler {
document.anno.action.value="del";	document.anno.action.value="del";
document.anno.submit();	document.anno.submit();
}	}
	// ]]>
</script>	</script>
ENDDOCUMENT	ENDDOCUMENT

Line 453 ENDDOCUMENT	Line 546 ENDDOCUMENT
&dialscript().	&dialscript().
'<font size="1">');	'<font size="1">');
} else {	} else {
$r->print(&Apache::loncommon::start_page("Announcements and Calendar",	my $brcrum = [{href=>"/adm/announcements",text=>"Announcements and Calendar"}];
$js));	$r->print(&Apache::loncommon::start_page("Communication",$js,{'bread_crumbs' => $brcrum}));
}	}
# does this user have privileges to post, etc?	# does this user have privileges to post, etc?
my $allowed=0;	my $allowed=0;
Line 476 ENDDOCUMENT	Line 569 ENDDOCUMENT
}	}
# ------------------------------------------------------------ Process commands	# ------------------------------------------------------------ Process commands
if ($serverpost) {	if ($serverpost) {
if ($env{'form.serveraction'}) {	if ($env{'form.serveraction'}) {
foreach my $key (keys(%env)) {	my $rc;
if ($key=~/^form\.postto\_(\w+)/) {	my $message;
$r->print(	foreach my $key (keys(%env)) {
'<br />Posting '.$1.': '.&Apache::lonnet::postannounce	if ($key=~/^form\.postto\_(\w+[\w\-]*)/) {
($1,$env{'form.serverannnounce'}));	$rc = &Apache::lonnet::postannounce
}	($1,$env{'form.serverannnounce'});
}	if ($rc eq 'ok') {
}	$message .=
$r->print(<<SERVERANNOUNCE);	&Apache::lonhtmlcommon::confirm_success(
<form name="serveranno" method="post">	&mt('Announcement posted to [_1]',$1))
<h3>Post Server Announcements</h3>	.'<br />';
Post announcements to the system login and roles screen<br />	} else {
<i>(leave blank to delete announcement)</i><br />	$message .=
<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />	&Apache::lonhtmlcommon::confirm_success(
Check machines:<br />	&mt('Posting announcement to [_1] failed: [_2]'
SERVERANNOUNCE	,$1,$rc), 1)
	.'<br />';
	}
	}
	}
	$r->print(&Apache::loncommon::confirmwrapper($message));
	}
	$r->print('<form name="serveranno" method="post" action="">'
	.'<h2>'.&mt('Post Server Announcements').'</h2>'
	.&mt('Post announcements to the system login and roles screen').'<br />'
	.'<i>'.&mt('(leave blank to delete announcement)').'</i><br />'
	.'<textarea name="serverannnounce" cols="60" rows="5"></textarea><br />'
	.&mt('Check machines:').'<br />'
	);
# list servers	# list servers
foreach my $host (sort(keys(%Apache::lonnet::hostname))) {	my %hostname = &Apache::lonnet::all_hostnames();
if (&Apache::lonnet::allowed('psa',$Apache::lonnet::hostdom{$host})) {	foreach my $host (sort(keys(%hostname))) {
$r->print ('<br /><label><input type="checkbox" name="postto_'.$host.'" /> '.	if (&Apache::lonnet::allowed('psa',
$host.' <tt>'.$Apache::lonnet::hostname{$host}.'</tt> '.	&Apache::lonnet::host_domain($host))) {
'</label><a href="http://'.$Apache::lonnet::hostname{$host}.	$r->print ('<label><input type="checkbox" name="postto_'.$host.'" /> '.
'/announcement.txt" target="annowin">current</a>');	$host.' <tt>'.$hostname{$host}.'</tt> '.
	'</label><a href="http://'.$hostname{$host}.
	'/announcement.txt?time='.time.'" target="annowin">'.
	&mt('Current Announcement').'</a><br />');
}	}
}	}
$r->print(	$r->print(
'<br /><input type="submit" name="serveraction" value="Post"></form><hr />');	'<br /><input type="submit" name="serveraction" value="'.&mt('Post').'" /></form><hr />');
}	}
if ($allowed) {	if ($allowed) {
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};	my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};	my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
	my $crstype = &Apache::loncommon::course_type();
# ----------------------------------------------------- Store new submitted one	# ----------------------------------------------------- Store new submitted one
if ($env{'form.action'} eq 'new') {	if ($env{'form.action'} eq 'new') {
my $startdate =	my $startdate =
Line 525 SERVERANNOUNCE	Line 635 SERVERANNOUNCE
$startdate.'_'.$enddate =>	$startdate.'_'.$enddate =>
$env{'form.msg'} },$coursedom,$coursenum);	$env{'form.msg'} },$coursedom,$coursenum);
if ($env{'form.rsspost'}) {	if ($env{'form.rsspost'}) {
&Apache::lonrss::addentry($coursenum,$coursedom,'Course_Announcements',	my $feed;
	if ($crstype eq 'Community') {
	$feed = 'Community_Announcements';
	} else {
	$feed = 'Course_Announcements';
	}
	&Apache::lonrss::addentry($coursenum,$coursedom,$feed,
&mt('Event from [_1] to [_2]',	&mt('Event from [_1] to [_2]',
&Apache::lonlocal::locallocaltime($startdate),	&Apache::lonlocal::locallocaltime($startdate),
&Apache::lonlocal::locallocaltime($enddate)),	&Apache::lonlocal::locallocaltime($enddate)),
Line 547 SERVERANNOUNCE	Line 663 SERVERANNOUNCE
$tomorrowhash{'day'}++;	$tomorrowhash{'day'}++;
my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);	my $tomorrow=&Apache::loncommon::maketime(%tomorrowhash);

&editfield($r,$today,$tomorrow,'');	&editfield($r,$today,$tomorrow,'',$crstype);
}	}
# ----------------------------------------------------- Summarize all calendars	# ----------------------------------------------------- Summarize all calendars
my %allcal=&get_all_calendars();	my %allcal=&get_all_calendars();
Line 556 SERVERANNOUNCE	Line 672 SERVERANNOUNCE
if ($pm<1) { ($pm,$py)=(12,$year-1); }	if ($pm<1) { ($pm,$py)=(12,$year-1); }
if ($fm>12){ ($fm,$fy)=(1,$year+1); }	if ($fm>12){ ($fm,$fy)=(1,$year+1); }

$r->print('<h1>'.('',&mt('January'),&mt('February'),&mt('March'),	$r->print('<h2>'.&mt('Calendar').'</h2>'
	.'<h3>'.('',&mt('January'),&mt('February'),&mt('March'),
&mt('April'),&mt('May'),	&mt('April'),&mt('May'),
&mt('June'),&mt('July'),&mt('August'),	&mt('June'),&mt('July'),&mt('August'),
&mt('September'),&mt('October'),	&mt('September'),&mt('October'),
&mt('November'),&mt('December'))[$month].' '.	&mt('November'),&mt('December'))[$month].' '.
$year.'</h1>');	$year.' '.&show_timezone().'</h3>');
# Reached the end of times, give up	# Reached the end of times, give up
if (($year<1970) \|\| ($year>2037)) {	if (($year<1970) \|\| ($year>2037)) {
$r->print('<h3>No calendar available for this date.</h3>'.	$r->print('<p class="LC_warning">'
'<a href="/adm/announcements?month='.$todayhash{'month'}.	.&mt('No calendar available for this date.')
'&year='.$todayhash{'year'}.'">Current Month</a>'.	.'</p>'
&Apache::loncommon::end_page());	.'<a href="/adm/announcements?month='.$todayhash{'month'}
	.'&year='.$todayhash{'year'}.'">'.&mt('Current Month').'</a>'
	.&Apache::loncommon::end_page());
return OK;	return OK;
}	}

Line 575 SERVERANNOUNCE	Line 694 SERVERANNOUNCE
if ($env{'form.pickdate'} eq 'yes') {	if ($env{'form.pickdate'} eq 'yes') {
$class .= " LC_calendar_pickdate";	$class .= " LC_calendar_pickdate";
}	}
	# ------------------------------------------------ Determine first day of a week
	my $datelocale = &Apache::lonlocal::getdatelocale();
	my $days_in_week = 7;
	my $startweek = 0;
	if (ref($datelocale)) {
	$startweek = $datelocale->first_day_of_week();
	if ($startweek == $days_in_week) { $startweek = 0; }
	}
	my @days = ('Sun','Mon','Tue','Wed','Thu','Fri','Sat');
	my @localdays;
	if ($startweek == 0) {
	@localdays = @days;
	} else {
	my $endday = $days_in_week - $startweek;
	for (my $i=0; $i<$days_in_week; $i++) {
	if ($i < $endday) {
	$localdays[$i] = $days[$i+$startweek];
	} else {
	$localdays[$i] = $days[$i-$endday];
	}
	}
	}

	# ----------------------------------------------------------- Weekday in locale
	my $loc_weekday = $weekday - $startweek;
	if ($loc_weekday < 0) {
	$loc_weekday += $days_in_week;
	}

$r->print(	$r->print(
'<a href="/adm/announcements?month='.$pm.'&year='.$py.	'<a href="/adm/announcements?month='.$pm.'&year='.$py.
($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.	($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
'<a href="/adm/announcements?month='.$fm.'&year='.$fy.	'<a href="/adm/announcements?month='.$fm.'&year='.$fy.
($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.	($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
'   <a href="/adm/announcements?month='.$todayhash{'month'}.	'   <a href="/adm/announcements?month='.$todayhash{'month'}.
'&year='.$todayhash{'year'}.	'&year='.$todayhash{'year'}.
($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><p>'.	($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a><div>'.
'<table class="'.$class.'" cols="7" rows="5"><tr>	'<table class="'.$class.'"><tr>');
<th>'.&mt('Sun').'</th>	for (my $i=0; $i<@localdays; $i++) {
<th>'.&mt('Mon').'</th>	$r->print('<th>'.&mt($localdays[$i]).'</th>');
<th>'.&mt('Tue').'</th>	}
<th>'.&mt('Wed').'</th>	$r->print('</tr>');
<th>'.&mt('Thu').'</th>
<th>'.&mt('Fri').'</th>
<th>'.&mt('Sat').'</th></tr>');

my $tk=&Apache::loncommon::maketime(%firstday);
my $outp;	my $outp;
my $nm;	my $nm;

# ---------------------------------------------------------------- Actual table	# ---------------------------------------------------------------- Actual table
$r->print('<tr>');	$r->print('<tr>');
for (my $i=0;$i<$weekday;$i++) { $r->print(&emptycell); }	for (my $i=0;$i<$loc_weekday;$i++) { $r->print(&emptycell); }
for (my $i=$weekday;$i<=6;$i++) {	for (my $i=$loc_weekday;$i<=6;$i++) {
($tk,$nm,$outp)=&showday($tk,0,%allcal);	($tk,$nm,$outp)=&showday($tk,0,%allcal);
$r->print($outp);	$r->print($outp);
}	}
$r->print('</tr>');	$r->print('</tr>');

	my $lastrow = 0;
	my $lastday = 0;
for (my $k=0;$k<=4;$k++) {	for (my $k=0;$k<=4;$k++) {
$r->print('<tr>');	if (!$lastrow) {
for (my $i=0;$i<=6;$i++) {	$r->print('<tr>');
($tk,$nm,$outp)=&showday($tk,0,%allcal);	for (my $i=0;$i<=6;$i++) {
if ($month!=$nm) { $outp=&emptycell; }	if ($lastday) {
$r->print($outp);	$outp = &emptycell();
	} else {
	my $currtk = $tk;
	($tk,$nm,$outp)=&showday($tk,0,%allcal);
	if ($month!=$nm) { $lastday = 1; }
	}
	$r->print($outp);
	}
	if ($lastday) {
	$lastrow = 1;
	}
	$r->print('</tr>');
}	}
$r->print('</tr>');
}	}
# ------------------------------------------------------------------- End table	# ------------------------------------------------------------------- End table
$r->print('</table>');	$r->print('</table></div>');
# ----------------------------------------------------------------- Check marks	# ----------------------------------------------------------------- Check marks
undef(%showedcheck);	undef(%showedcheck);
# --------------------------------------------------------------- Remove button	# --------------------------------------------------------------- Remove button
if ($allowed) { $r->print('<input type="button" onClick="removesub()" value="Remove Checked Entries">'.	if ($allowed) { $r->print('<br /><input type="button" onclick="removesub()" value="'.&mt('Remove Checked Entries').'" />'.
&Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }	&Apache::loncommon::help_open_topic('Calendar_Remove_Announcement').'</form>'); }
$r->print('<p>'.	$r->print('<p>'.
'<a href="/adm/announcements?month='.$pm.'&year='.$py.	'<a href="/adm/announcements?month='.$pm.'&year='.$py.
($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.	($pickdatemode?$pickinfo:'').'">'.&mt('Previous Month').'</a> '.
'<a href="/adm/announcements?month='.$fm.'&year='.$fy.	'<a href="/adm/announcements?month='.$fm.'&year='.$fy.
($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.	($pickdatemode?$pickinfo:'').'">'.&mt('Next Month').'</a>'.
'   <a href="/adm/announcements?month='.$todayhash{'month'}.	'   <a href="/adm/announcements?month='.$todayhash{'month'}.
'&year='.$todayhash{'year'}.	'&year='.$todayhash{'year'}.
($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.	($pickdatemode?$pickinfo:'').'">'.&mt('Current Month').'</a></p>'.
($pickdatemode?'</font>':'').&Apache::loncommon::end_page());	($pickdatemode?'</font>':'').
$r->print('<a href="/adm/announcements.ics">'.&mt('Download your Calendar as iCalendar File').'</a>');	'<a href="/adm/announcements.ics">'.&mt('Download your Calendar as iCalendar File').'</a>'.
	&Apache::loncommon::end_page());
return OK;	return OK;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.62
changed lines
	Added in v.1.87