--- loncom/homework/lonhomework.pm	2003/09/19 14:11:11	1.149
+++ loncom/homework/lonhomework.pm	2003/10/15 17:41:10	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Homework handler
 #
-# $Id: lonhomework.pm,v 1.149 2003/09/19 14:11:11 www Exp $
+# $Id: lonhomework.pm,v 1.155 2003/10/15 17:41:10 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,8 +90,8 @@ sub get_target {
 		return ('web');
 	    }
 	} else {
-	    if ( $ENV{'form.problemmode'} eq 'View' ||
-		 $ENV{'form.problemmode'} eq 'Discard Edits and View') {
+	    if ( $ENV{'form.problemmode'} eq &mt('View') ||
+		 $ENV{'form.problemmode'} eq &mt('Discard Edits and View')) {
 		if ( defined($ENV{'form.submitted'}) &&
 		     (!defined($ENV{'form.resetdata'})) &&
 		     (!defined($ENV{'form.newrandomization'}))) {
@@ -99,9 +99,9 @@ sub get_target {
 		} else {
 		    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.submit'} eq 'Submit Changes and View' ) {
+		    if ( $ENV{'form.submit'} eq &mt('Submit Changes and View') ) {
 			return ('modified','web','answer');
 		    } else {
 			return ('modified','edit');
@@ -147,6 +147,51 @@ 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 {
@@ -168,6 +213,14 @@ 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");
@@ -307,11 +360,10 @@ sub setuppermissions {
 sub setupheader {
     my $request=$_[0];
     if ($ENV{'browser.mathml'}) {
-	$request->content_type('text/xml');
+	&Apache::loncommon::content_type($request,'text/xml');
     } 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')) {
 	&Apache::loncommon::no_cache($request);
     }
@@ -327,7 +379,7 @@ sub handle_save_or_undo {
     my $filetmp =$file.".tmp";
     my $error=0;
 
-    if ($ENV{'form.Undo'} eq 'undo') {
+    if ($ENV{'form.Undo'} eq &mt('undo')) {
 	my $error=0;
 	if (!copy($file,$filetmp)) { $error=1; }
 	if ((!$error) && (!copy($filebak,$file))) { $error=1; }
@@ -468,7 +520,7 @@ sub editxmlmode {
 	if (!$error) { $problem=&Apache::lonnet::getfile($file); }
     }
     &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');
 	$ENV{'form.problemmode'}='View';
 	&renderpage($request,$file);
@@ -684,9 +736,9 @@ sub handler {
     my ($symb) = &Apache::lonxml::whichuser();
     &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.newrandomization'} eq 'New Randomization') {
+	if ($ENV{'form.resetdata'} eq &mt('Reset Submissions') ||
+	    $ENV{'form.resetdata'} eq &mt('New Problem Variation') ||
+	    $ENV{'form.newrandomization'} eq &mt('New Randomization')) {
 	    my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
 	    &Apache::lonnet::tmpreset($symb,'',$domain,$name);
 	    &Apache::lonxml::debug("Attempt reset");
@@ -701,9 +753,9 @@ sub handler {
 		#&view_or_edit_menu($request);
 		$ENV{'form.problemmode'}='View';
 		&renderpage($request,$file);
-	    } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
+	    } elsif ($ENV{'form.problemmode'} eq &mt('EditXML')) {
 		&editxmlmode($request,$file);
-	    } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {
+	    } elsif ($ENV{'form.problemmode'} eq &mt('Calculate answers')) {
 		&analyze($request,$file);
 	    } else {
 		&renderpage($request,$file);