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

Diff for /loncom/homework/lonhomework.pm between versions 1.153 and 1.157

version 1.153, 2003/10/14 15:47:50 version 1.157, 2003/11/08 10:44:58
Line 149  $Apache::lonxml::browse=''; Line 149  $Apache::lonxml::browse='';
   
 sub check_ip_acc {  sub check_ip_acc {
     my ($acc)=@_;      my ($acc)=@_;
     if (!defined($acc)) { return 1; }      if (!defined($acc) || $acc =~ /^\s*$/) { return 1; }
     my $allowed=0;      my $allowed=0;
     my $ip=$ENV{'REMOTE_ADDR'};      my $ip=$ENV{'REMOTE_ADDR'};
     my $name;      my $name;
Line 217  sub check_access { Line 217  sub check_access {
     my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));      my $allowed=&check_ip_acc(&Apache::lonnet::EXT("resource.$id.acc"));
     if (!$allowed) {      if (!$allowed) {
  $status='INVALID_ACCESS';   $status='INVALID_ACCESS';
  $date=&mt("may be open from a different computer.");   $date=&mt("can not be accessed from your location.");
  return($status,$date);   return($status,$date);
     }      }
   
Line 379  sub handle_save_or_undo { Line 379  sub handle_save_or_undo {
     my $filetmp =$file.".tmp";      my $filetmp =$file.".tmp";
     my $error=0;      my $error=0;
   
       &Apache::lonnet::correct_line_ends($result);
   
     if ($ENV{'form.Undo'} eq &mt('undo')) {      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; }
Line 642  sub newproblem { Line 644  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'}) {
Line 661  sub newproblem { Line 665  sub newproblem {
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 <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>
Removed from v.1.153  
changed lines
  Added in v.1.157

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