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

Diff for /loncom/homework/lonhomework.pm between versions 1.149 and 1.161

version 1.149, 2003/09/19 14:11:11 version 1.161, 2004/01/28 15:45:44
Line 24 Line 24
 # /home/httpd/html/adm/gpl.txt  # /home/httpd/html/adm/gpl.txt
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  
 # Guy Albertelli  
 # 11/30 Gerd Kortemeyer  
 # 6/1,8/17,8/18 Gerd Kortemeyer  
 # 7/18 Jeremy Bowers  
   
 package Apache::lonhomework;  package Apache::lonhomework;
 use strict;  use strict;
Line 90  sub get_target { Line 86  sub get_target {
  return ('web');   return ('web');
     }      }
  } else {   } else {
     if ( $ENV{'form.problemmode'} eq 'View' ||      if ( $ENV{'form.problemmode'} eq &mt('View') ||
  $ENV{'form.problemmode'} eq 'Discard Edits and View') {   $ENV{'form.problemmode'} eq &mt('Discard Edits and View')) {
  if ( defined($ENV{'form.submitted'}) &&   if ( defined($ENV{'form.submitted'}) &&
      (!defined($ENV{'form.resetdata'})) &&       (!defined($ENV{'form.resetdata'})) &&
      (!defined($ENV{'form.newrandomization'}))) {       (!defined($ENV{'form.newrandomization'}))) {
Line 99  sub get_target { Line 95  sub get_target {
  } else {   } else {
     return ('web','answer');      return ('web','answer');
  }   }
     } elsif ( $ENV{'form.problemmode'} eq 'Edit' ) {      } elsif ( $ENV{'form.problemmode'} eq &mt('Edit') ) {
  if ( $ENV{'form.submitted'} eq 'edit' ) {   if ( $ENV{'form.submitted'} eq 'edit' ) {
     if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {      if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
  return ('modified','web','answer');   return ('modified','web','answer');
     } else {      } else {
  return ('modified','edit');   return ('modified','edit');
Line 147  sub send_footer { Line 143  sub send_footer {
   
 $Apache::lonxml::browse='';  $Apache::lonxml::browse='';
   
   sub check_ip_acc {
       my ($acc)=@_;
       if (!defined($acc) || $acc =~ /^\s*$/) { return 1; }
       my $allowed=0;
       my $ip=$ENV{'REMOTE_ADDR'};
       my $name;
       foreach my $pattern (split(',',$acc)) {
    if ($pattern =~ /\*$/) {
       #35.8.*
       $pattern=~s/\*//;
       if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
    } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {    
       #35.8.3.[34-56]
       my $low=$2;
       my $high=$3;
       $pattern=$1;
       if ($ip =~ /^\Q$pattern\E/) { 
    my $last=(split(/\./,$ip))[3];
    if ($last <=$high && $last >=$low) { $allowed=1; }
       }
    } elsif ($pattern =~ /^\*/) {
       #*.msu.edu
       $pattern=~s/\*//;
       if (!defined($name)) {
    use Socket;
    my $netaddr=inet_aton($ip);
    ($name)=gethostbyaddr($netaddr,AF_INET);
       }
       if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
    } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
       #127.0.0.1
       if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
    } else {
       #some.name.com
       if (!defined($name)) {
    use Socket;
    my $netaddr=inet_aton($ip);
    ($name)=gethostbyaddr($netaddr,AF_INET);
       }
       if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
    }
    if ($allowed) { last; }
       }
       return $allowed;
   }
 # JB, 9/24/2002: Any changes in this function may require a change  # JB, 9/24/2002: Any changes in this function may require a change
 # in lonnavmaps::resource::getDateStatus.  # in lonnavmaps::resource::getDateStatus.
 sub check_access {  sub check_access {
Line 168  sub check_access { Line 209  sub check_access {
   
     &Apache::lonxml::debug("checking for part :$id:");      &Apache::lonxml::debug("checking for part :$id:");
     &Apache::lonxml::debug("time:".time);      &Apache::lonxml::debug("time:".time);
       
       my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
       if (!$allowed && ($Apache::lonhomework::browse ne 'F')) {
    $status='INVALID_ACCESS';
    $date=&mt("can not be accessed from your location.");
    return($status,$date);
       }
   
     foreach $temp ("opendate","duedate","answerdate") {      foreach $temp ("opendate","duedate","answerdate") {
  $lastdate = $date;   $lastdate = $date;
  $date = &Apache::lonnet::EXT("resource.$id.$temp");   $date = &Apache::lonnet::EXT("resource.$id.$temp");
Line 307  sub setuppermissions { Line 356  sub setuppermissions {
 sub setupheader {  sub setupheader {
     my $request=$_[0];      my $request=$_[0];
     if ($ENV{'browser.mathml'}) {      if ($ENV{'browser.mathml'}) {
  $request->content_type('text/xml');   &Apache::loncommon::content_type($request,'text/xml');
     } else {      } else {
  $request->content_type('text/html');   &Apache::loncommon::content_type($request,'text/html');
     }      }
     $request->content_encoding('UTF-8');  
     if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {      if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
  &Apache::loncommon::no_cache($request);   &Apache::loncommon::no_cache($request);
     }      }
Line 327  sub handle_save_or_undo { Line 375  sub handle_save_or_undo {
     my $filetmp =$file.".tmp";      my $filetmp =$file.".tmp";
     my $error=0;      my $error=0;
   
     if ($ENV{'form.Undo'} eq 'undo') {      &Apache::lonnet::correct_line_ends($result);
   
       if ($ENV{'form.Undo'} eq &mt('undo')) {
  my $error=0;   my $error=0;
  if (!copy($file,$filetmp)) { $error=1; }   if (!copy($file,$filetmp)) { $error=1; }
  if ((!$error) && (!copy($filebak,$file))) { $error=1; }   if ((!$error) && (!copy($filebak,$file))) { $error=1; }
Line 468  sub editxmlmode { Line 518  sub editxmlmode {
  if (!$error) { $problem=&Apache::lonnet::getfile($file); }   if (!$error) { $problem=&Apache::lonnet::getfile($file); }
     }      }
     &Apache::lonhomework::showhashsubset(\%ENV,'^form');      &Apache::lonhomework::showhashsubset(\%ENV,'^form');
     if ( $ENV{'form.submit'} eq 'Submit Changes and View' ) {      if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
  &Apache::lonhomework::showhashsubset(\%ENV,'^form');   &Apache::lonhomework::showhashsubset(\%ENV,'^form');
  $ENV{'form.problemmode'}='View';   $ENV{'form.problemmode'}='View';
  &renderpage($request,$file);   &renderpage($request,$file);
     } else {      } else {
  my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);   my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
  my $xml_help = Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",   my $xml_help = '<table><tr><td>'.
       "Problem Editing Help");      &Apache::loncommon::helpLatexCheatsheet("Problem_Editor_XML_Index",
       "Problem Editing Help").
       '</td><td>'.
          &Apache::loncommon::help_open_faq(5).
          &Apache::loncommon::help_open_bug('Authoring').'</td></tr></table>';
  if ($cols > 80) { $cols = 80; }   if ($cols > 80) { $cols = 80; }
  if ($cols < 70) { $cols = 70; }   if ($cols < 70) { $cols = 70; }
  if ($rows < 20) { $rows = 20; }   if ($rows < 20) { $rows = 20; }
Line 503  sub renderpage { Line 557  sub renderpage {
     my ($request,$file) = @_;      my ($request,$file) = @_;
   
     my (@targets) = &get_target();      my (@targets) = &get_target();
       &Apache::lonhomework::showhashsubset(\%ENV,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));      &Apache::lonxml::debug("Running targets ".join(':',@targets));
     foreach my $target (@targets) {      foreach my $target (@targets) {
  #my $t0 = [&gettimeofday()];   #my $t0 = [&gettimeofday()];
Line 590  sub newproblem { Line 645  sub newproblem {
  &renderpage($request,$dest);   &renderpage($request,$dest);
     } else {      } else {
  my $url=$request->uri;   my $url=$request->uri;
    my $shownurl=$url;
    $shownurl=~s-^/~-/priv/-;
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  my $errormsg;   my $errormsg;
  if ($ENV{'form.newfile'}) {   if ($ENV{'form.newfile'}) {
     $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";      $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";
  }   }
  my $instructions;   my $instructions;
    my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
  if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}   if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'<br />'.&mt("Then");}
  my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',   my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new',
   'resource' => 'resource',    'resource' => 'resource',
Line 606  sub newproblem { Line 664  sub newproblem {
   'Create' => 'Create',    'Create' => 'Create',
   'button' => 'button');    'button' => 'button');
  $request->print(<<ENDNEWPROBLEM);   $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  $bodytag
 <h1>$lt{'create'} $extension $lt{'resource'}</h1>  <h1>$lt{'create'} $extension $lt{'resource'}</h1>
 $errormsg  $errormsg
 $lt{'requested'} <tt>$url</tt> $lt{'not exist'}.  $lt{'requested'} <tt>$shownurl</tt> $lt{'not exist'}.
 <p>  <p>
 <b>$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.</b>  <b>$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}.</b>
 </p>  </p>
Line 648  sub handler { Line 706  sub handler {
     my $request=$_[0];      my $request=$_[0];
           
     $Apache::lonxml::debug=$ENV{'user.debug'};      $Apache::lonxml::debug=$ENV{'user.debug'};
   
     if (&setupheader($request)) { return OK; }      if (&setupheader($request)) { return OK; }
     $ENV{'request.uri'}=$request->uri;      $ENV{'request.uri'}=$request->uri;
   
Line 684  sub handler { Line 741  sub handler {
     my ($symb) = &Apache::lonxml::whichuser();      my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);      &Apache::lonxml::debug('symb is '.$symb);
     if ($ENV{'request.state'} eq "construct" || $symb eq '') {      if ($ENV{'request.state'} eq "construct" || $symb eq '') {
  if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||   if ($ENV{'form.resetdata'} eq &mt('Reset Submissions') ||
     $ENV{'form.resetdata'} eq 'New Problem Variation' ||      $ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
     $ENV{'form.newrandomization'} eq 'New Randomization') {      $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     &Apache::lonnet::tmpreset($symb,'',$domain,$name);      &Apache::lonnet::tmpreset($symb,'',$domain,$name);
     &Apache::lonxml::debug("Attempt reset");      &Apache::lonxml::debug("Attempt reset");
Line 701  sub handler { Line 758  sub handler {
  #&view_or_edit_menu($request);   #&view_or_edit_menu($request);
  $ENV{'form.problemmode'}='View';   $ENV{'form.problemmode'}='View';
  &renderpage($request,$file);   &renderpage($request,$file);
     } elsif ($ENV{'form.problemmode'} eq 'EditXML') {      } elsif ($ENV{'form.problemmode'} eq &mt('EditXML')) {
  &editxmlmode($request,$file);   &editxmlmode($request,$file);
     } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {      } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) {
  &analyze($request,$file);   &analyze($request,$file);
     } else {      } else {
  &renderpage($request,$file);   &renderpage($request,$file);
Removed from v.1.149  
changed lines
  Added in v.1.161

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