loncom/homework/lonhomework.pm - diff

Return to lonhomework.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.137 and 1.138.2.1

-version 1.137, 2003/06/30 20:10:01
+version 1.138.2.1, 2003/10/15 22:18:26
  Line 72  sub get_target {
      }
      if ( defined($ENV{'form.submitted'}) &&
- 	 ( !defined($ENV{'form.resetdata'}))) {
+ 	 ( !defined($ENV{'form.resetdata'})) &&
+ 	 ( !defined($ENV{'form.newrandomization'}))) {
        return ('grade', 'web');
      } else {
        return ('web');
- Line 91  sub get_target {
+ Line 92  sub get_target {
        if ( $ENV{'form.problemmode'} eq 'View' ||
  	   $ENV{'form.problemmode'} eq 'Discard Edits and View') {
  	if ( defined($ENV{'form.submitted'}) &&
- 	     (!defined($ENV{'form.resetdata'})) ) {
+ 	     (!defined($ENV{'form.resetdata'})) &&
+ 	     (!defined($ENV{'form.newrandomization'}))) {
  	  return ('grade', 'web','answer');
  	} else {
  	  return ('web','answer');
- Line 144  sub send_footer {
+ Line 146  sub send_footer {
  $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
  # in lonnavmaps::resource::getDateStatus.
  sub check_access {
- Line 165  sub check_access {
+ Line 212  sub check_access {
    &Apache::lonxml::debug("checking for part :$id:");
    &Apache::lonxml::debug("time:".time);
+     my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
+     if (!$allowed) {
+ 	$status='INVALID_ACCESS';
+ 	$date=&mt("can not be accessed from your location.");
+ 	return($status,$date);
+     }
    foreach $temp ("opendate","duedate","answerdate") {
      $lastdate = $date;
      $date = &Apache::lonnet::EXT("resource.$id.$temp");
- Line 663  sub handler {
+ Line 718  sub handler {
    &Apache::lonxml::debug('symb is '.$symb);
    if ($ENV{'request.state'} eq "construct" || $symb eq '') {
        if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||
- 	  $ENV{'form.resetdata'} eq 'New Problem Variation' ) {
+ 	  $ENV{'form.resetdata'} eq 'New Problem Variation' ||
+           $ENV{'form.newrandomization'} eq 'New Randomization') {
  	  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
  	  &Apache::lonnet::tmpreset($symb,'',$domain,$name);
+ &Apache::lonxml::debug("Attempt reset");
        }
    }
    if ($ENV{'request.state'} eq "construct") {

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

Removed from v.1.137
changed lines
	Added in v.1.138.2.1