[BACK]Return to lonannounce.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonannounce.pm between versions 1.33 and 1.34

version 1.33, 2005/02/17 08:29:42 version 1.34, 2005/04/07 06:56:22
Line 33  use Apache::Constants qw(:common); Line 33  use Apache::Constants qw(:common);
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::lonlocal;  use Apache::lonlocal;
   use Apache::lonnet;
 use HTML::Entities();  use HTML::Entities();
   
 my %todayhash;  my %todayhash;
Line 61  ENDFORM Line 62  ENDFORM
   
 sub readcalendar {  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'};
     my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);      my %thiscal=&Apache::lonnet::dump('calendar',$coursedom,$coursenum);
     my %returnhash=();      my %returnhash=();
     foreach (keys %thiscal) {      foreach (keys %thiscal) {
Line 70  sub readcalendar { Line 71  sub readcalendar {
    $returnhash{$courseid.'@'.$_}=$thiscal{$_};     $returnhash{$courseid.'@'.$_}=$thiscal{$_};
         }          }
     }      }
     if ($courseid eq $ENV{'request.course.id'}) {      if ($courseid eq $env{'request.course.id'}) {
  my %resourcedata=   my %resourcedata=
     &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);      &Apache::lonnet::dump('resourcedata',$coursedom,$coursenum);
  foreach my $thiskey (sort keys %resourcedata) {   foreach my $thiskey (sort keys %resourcedata) {
Line 81  sub readcalendar { Line 82  sub readcalendar {
  if ($middle=~/^\[(.*)\]\./) {   if ($middle=~/^\[(.*)\]\./) {
     my $sec=$1;      my $sec=$1;
     # if we have a section don't show ones that aren't ours      # if we have a section don't show ones that aren't ours
     if ($ENV{'request.course.sec'} &&      if ($env{'request.course.sec'} &&
  $ENV{'request.course.sec'} ne $sec) { next; }   $env{'request.course.sec'} ne $sec) { next; }
     # if a student without a section don't show any section ones      # if a student without a section don't show any section ones
     if (!$ENV{'request.role.adv'} &&      if (!$env{'request.role.adv'} &&
  !$ENV{'request.course.sec'}) { next; }   !$env{'request.course.sec'}) { next; }
     $section=&mt('Group/Section').': '.$1;      $section=&mt('Group/Section').': '.$1;
     $middle=~s/^\[(.*)\]\.//;      $middle=~s/^\[(.*)\]\.//;
  }   }
Line 142  sub normalcell { Line 143  sub normalcell {
  $msg=~s/INTERNAL\://gs;   $msg=~s/INTERNAL\://gs;
  $internalflag=1;   $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);   '\n'.&Apache::lonlocal::locallocaltime($start);
     if ($start!=$end) {      if ($start!=$end) {
  $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);   $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);
     }      }
     $fullmsg.=':\n'.$msg;      $fullmsg.=':\n'.$msg;
             if ($courseid eq $ENV{'request.course.id'}) {              if ($courseid eq $env{'request.course.id'}) {
               if ((&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))                if ((&Apache::lonnet::allowed('srm',$env{'request.course.id'}))
                && (!$showedcheck{$start.'_'.$end})                 && (!$showedcheck{$start.'_'.$end})
        && ($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.'">';
Line 179  sub plaincell { Line 180  sub plaincell {
         if ($_) {          if ($_) {
     my ($courseid,$start,$end,@msg)=split(/\@/,$_);      my ($courseid,$start,$end,@msg)=split(/\@/,$_);
             my $msg=join('@',@msg);              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);   '\n'.&Apache::lonlocal::locallocaltime($start);
     if ($start!=$end) {      if ($start!=$end) {
  $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);   $fullmsg.=' - '.&Apache::lonlocal::locallocaltime($end);
Line 256  sub showday { Line 257  sub showday {
   
 sub tfont {  sub tfont {
     my $text=shift;      my $text=shift;
     if ($ENV{'form.pickdate'} eq 'yes') {      if ($env{'form.pickdate'} eq 'yes') {
  return '<font size="1">'.$text.'</font>';   return '<font size="1">'.$text.'</font>';
     } else {      } else {
  return $text;   return $text;
Line 265  sub tfont { Line 266  sub tfont {
   
 sub picklink {  sub picklink {
     my ($text,$day,$month,$year)=@_;      my ($text,$day,$month,$year)=@_;
     if ($ENV{'form.pickdate'} eq 'yes') {      if ($env{'form.pickdate'} eq 'yes') {
  return '<a href="javascript:dialin('.$day.','.$month.','.$year.')">'.   return '<a href="javascript:dialin('.$day.','.$month.','.$year.')">'.
     $text.'</a>';      $text.'</a>';
     } else {      } else {
Line 277  sub dialscript { Line 278  sub dialscript {
     return (<<ENDDIA);      return (<<ENDDIA);
 <script language="Javascript">  <script language="Javascript">
 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;
     var i;      var i;
     for (i=0;i<slct.length;i++) {      for (i=0;i<slct.length;i++) {
         if (slct.options[i].value==month) { slct.selectedIndex=i; }          if (slct.options[i].value==month) { slct.selectedIndex=i; }
     }      }
     opener.document.$ENV{'form.formname'}.$ENV{'form.element'}\_day.value=day;      opener.document.$env{'form.formname'}.$env{'form.element'}\_day.value=day;
     opener.$ENV{'form.element'}\_checkday();      opener.$env{'form.element'}\_checkday();
     self.close();      self.close();
 }  }
 </script>  </script>
Line 308  sub handler { Line 309  sub handler {
                              ['month','year','pickdate','formname','element']);                               ['month','year','pickdate','formname','element']);
 # --------------------------------------------------- Decide what month to show  # --------------------------------------------------- Decide what month to show
     my $year=$todayhash{'year'};      my $year=$todayhash{'year'};
     if ($ENV{'form.year'}) { $year=$ENV{'form.year'}; }      if ($env{'form.year'}) { $year=$env{'form.year'}; }
     my $month=$todayhash{'month'};      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  # ---------------------------------------------- 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 %firstday=&Apache::loncommon::timehash(
Line 354  ENDDOCUMENT Line 355  ENDDOCUMENT
     }      }
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
     my $allowed=0;      my $allowed=0;
     if ($ENV{'request.course.id'}) {      if ($env{'request.course.id'}) {
        $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});         $allowed=&Apache::lonnet::allowed('srm',$env{'request.course.id'});
     }      }
 # does this user have privileges to post to servers?  # does this user have privileges to post to servers?
     my $serverpost=0;      my $serverpost=0;
     if ($ENV{'request.role.domain'}) {      if ($env{'request.role.domain'}) {
  $serverpost=&Apache::lonnet::allowed('psa',   $serverpost=&Apache::lonnet::allowed('psa',
      $ENV{'request.role.domain'});       $env{'request.role.domain'});
     } else {      } else {
  $serverpost=&Apache::lonnet::allowed('psa','/');   $serverpost=&Apache::lonnet::allowed('psa','/');
     }      }
Line 372  ENDDOCUMENT Line 373  ENDDOCUMENT
     }      }
 # ------------------------------------------------------------ Process commands  # ------------------------------------------------------------ Process commands
     if ($serverpost) {      if ($serverpost) {
  if ($ENV{'form.serveraction'}) {   if ($env{'form.serveraction'}) {
     foreach (keys %ENV) {      foreach (keys %env) {
  if ($_=~/^form\.postto\_(\w+)/) {   if ($_=~/^form\.postto\_(\w+)/) {
     $r->print(       $r->print( 
  '<br />Posting '.$1.': '.&Apache::lonnet::postannounce   '<br />Posting '.$1.': '.&Apache::lonnet::postannounce
  ($1,$ENV{'form.serverannnounce'}));   ($1,$env{'form.serverannnounce'}));
  }   }
     }      }
  }   }
Line 402  SERVERANNOUNCE Line 403  SERVERANNOUNCE
   '<br /><input type="submit" name="serveraction" value="Post"></form><hr />');    '<br /><input type="submit" name="serveraction" value="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'};
 # ----------------------------------------------------- Store new submitted one  # ----------------------------------------------------- Store new submitted one
         if ($ENV{'form.action'} eq 'new') {          if ($env{'form.action'} eq 'new') {
     my $startdate =       my $startdate = 
  &Apache::lonhtmlcommon::get_date_from_form('startdate');   &Apache::lonhtmlcommon::get_date_from_form('startdate');
     my $enddate   =       my $enddate   = 
Line 419  SERVERANNOUNCE Line 420  SERVERANNOUNCE
             }              }
     &Apache::lonnet::put('calendar',{       &Apache::lonnet::put('calendar',{ 
  $startdate.'_'.$enddate =>    $startdate.'_'.$enddate => 
     $ENV{'form.msg'} },$coursedom,$coursenum);      $env{'form.msg'} },$coursedom,$coursenum);
         }          }
 # ---------------------------------------------------------------- Remove items  # ---------------------------------------------------------------- Remove items
         if ($ENV{'form.action'} eq 'del') {          if ($env{'form.action'} eq 'del') {
     my @delwhich=();      my @delwhich=();
             foreach (keys %ENV) {              foreach (keys %env) {
  if ($_=~/^form\.remove\_(.+)$/) {   if ($_=~/^form\.remove\_(.+)$/) {
     push(@delwhich,$1);      push(@delwhich,$1);
                 }                  }
Removed from v.1.33  
changed lines
  Added in v.1.34

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