--- loncom/interface/lonannounce.pm 2004/09/02 13:15:07 1.32
+++ loncom/interface/lonannounce.pm 2005/11/17 19:54:49 1.35
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Announce
#
-# $Id: lonannounce.pm,v 1.32 2004/09/02 13:15:07 www Exp $
+# $Id: lonannounce.pm,v 1.35 2005/11/17 19:54:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,6 +33,7 @@ use Apache::Constants qw(:common);
use Apache::loncommon;
use Apache::lonhtmlcommon();
use Apache::lonlocal;
+use Apache::lonnet;
use HTML::Entities();
my %todayhash;
@@ -61,8 +62,8 @@ ENDFORM
sub readcalendar {
my $courseid=shift;
- my $coursenum=$ENV{'course.'.$courseid.'.num'};
- my $coursedom=$ENV{'course.'.$courseid.'.domain'};
+ my $coursenum=$env{'course.'.$courseid.'.num'};
+ my $coursedom=$env{'course.'.$courseid.'.domain'};
my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);
my %returnhash=();
foreach (keys %thiscal) {
@@ -70,7 +71,7 @@ sub readcalendar {
$returnhash{$courseid.'@'.$_}=$thiscal{$_};
}
}
- if ($courseid eq $ENV{'request.course.id'}) {
+ if ($courseid eq $env{'request.course.id'}) {
my %resourcedata=
&Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
foreach my $thiskey (sort keys %resourcedata) {
@@ -81,11 +82,11 @@ sub readcalendar {
if ($middle=~/^\[(.*)\]\./) {
my $sec=$1;
# if we have a section don't show ones that aren't ours
- if ($ENV{'request.course.sec'} &&
- $ENV{'request.course.sec'} ne $sec) { next; }
+ if ($env{'request.course.sec'} &&
+ $env{'request.course.sec'} ne $sec) { next; }
# if a student without a section don't show any section ones
- if (!$ENV{'request.role.adv'} &&
- !$ENV{'request.course.sec'}) { next; }
+ if (!$env{'request.role.adv'} &&
+ !$env{'request.course.sec'}) { next; }
$section=&mt('Group/Section').': '.$1;
$middle=~s/^\[(.*)\]\.//;
}
@@ -142,16 +143,16 @@ sub normalcell {
$msg=~s/INTERNAL\://gs;
$internalflag=1;
}
- my $fullmsg=&mt('Calendar Announcement for ').$ENV{'course.'.$courseid.'.description'}.
+ my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}.
'\n'.&Apache::lonlocal::locallocaltime($start);
if ($start!=$end) {
$fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);
}
$fullmsg.=':\n'.$msg;
- if ($courseid eq $ENV{'request.course.id'}) {
- if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))
+ if ($courseid eq $env{'request.course.id'}) {
+ if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'}))
&& (!$showedcheck{$start.'_'.$end})
- && ($ENV{'form.pickdate'} ne 'yes')
+ && ($env{'form.pickdate'} ne 'yes')
&& (!$internalflag)) {
$output.='';
@@ -179,7 +180,7 @@ sub plaincell {
if ($_) {
my ($courseid,$start,$end,@msg)=split(/\@/,$_);
my $msg=join('@',@msg);
- my $fullmsg=&mt('Calendar Announcement for ').$ENV{'course.'.$courseid.'.description'}.
+ my $fullmsg=&mt('Calendar Announcement for ').$env{'course.'.$courseid.'.description'}.
'\n'.&Apache::lonlocal::locallocaltime($start);
if ($start!=$end) {
$fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);
@@ -190,7 +191,7 @@ sub plaincell {
$fullmsg=&HTML::Entities::encode($fullmsg,'<>&"\'');
$fullmsg=~s/&/\\&/g;
$output.=''.
- substr($msg,0,40).'... ';
+ substr($msg,0,80).'... ';
}
}
return $output;
@@ -256,7 +257,7 @@ sub showday {
sub tfont {
my $text=shift;
- if ($ENV{'form.pickdate'} eq 'yes') {
+ if ($env{'form.pickdate'} eq 'yes') {
return ''.$text.'';
} else {
return $text;
@@ -265,7 +266,7 @@ sub tfont {
sub picklink {
my ($text,$day,$month,$year)=@_;
- if ($ENV{'form.pickdate'} eq 'yes') {
+ if ($env{'form.pickdate'} eq 'yes') {
return ''.
$text.'';
} else {
@@ -277,14 +278,14 @@ sub dialscript {
return (<
function dialin(day,month,year) {
- opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_year.value=year;
- var slct=opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_month;
+ opener.document.$env{'form.formname'}.$env{'form.element'}\_year.value=year;
+ var slct=opener.document.$env{'form.formname'}.$env{'form.element'}\_month;
var i;
for (i=0;i
@@ -308,14 +309,14 @@ sub handler {
['month','year','pickdate','formname','element']);
# --------------------------------------------------- Decide what month to show
my $year=$todayhash{'year'};
- if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }
+ if ($env{'form.year'}) { $year=$env{'form.year'}; }
my $month=$todayhash{'month'};
- if ($ENV{'form.month'}) { $month=$ENV{'form.month'}; }
+ if ($env{'form.month'}) { $month=$env{'form.month'}; }
# ---------------------------------------------- See if we are in pickdate mode
- my $pickdatemode=($ENV{'form.pickdate'} eq 'yes');
- my $pickinfo='&pickdate=yes&formname='.$ENV{'form.formname'}.
- '&element='.$ENV{'form.element'};
+ my $pickdatemode=($env{'form.pickdate'} eq 'yes');
+ my $pickinfo='&pickdate=yes&formname='.$env{'form.formname'}.
+ '&element='.$env{'form.element'};
# --------------------------------------------- Find out first day of the month
my %firstday=&Apache::loncommon::timehash(
@@ -325,9 +326,9 @@ sub handler {
'dlsav' => -1 ));
my $weekday=$firstday{'weekday'};
# ------------------------------------------------------------ Print the screen
-
+ my $html=&Apache::lonxml::xmlbegin();
$r->print(<
+$html
The LearningOnline Network with CAPA