Diff for /loncom/lond between versions 1.489.2.17 and 1.489.2.19

version 1.489.2.17, 2015/03/12 00:37:30 version 1.489.2.19, 2016/08/06 20:05:01
Line 2445  sub remove_user_file_handler { Line 2445  sub remove_user_file_handler {
     if (-e $file) {      if (-e $file) {
  #   #
  #   If the file is a regular file unlink is fine...   #   If the file is a regular file unlink is fine...
  #   However it's possible the client wants a dir.   #   However it's possible the client wants a dir
  #   removed, in which case rmdir is more approprate:   #   removed, in which case rmdir is more appropriate
           #   Note: rmdir will only remove an empty directory.
  #   #
         if (-f $file){          if (-f $file){
     unlink($file);      unlink($file);
                       # for html files remove the associated .bak file
                       # which may have been created by the editor.
                       if ($ufile =~ m{^((docs|supplemental)/(?:\d+|default)/\d+(?:|/.+)/)[^/]+\.x?html?$}i) {
                           my $path = $1;
                           if (-e $file.'.bak') {
                               unlink($file.'.bak');
                           }
                       }
  } elsif(-d $file) {   } elsif(-d $file) {
     rmdir($file);      rmdir($file);
  }   }
Line 5394  sub crsreq_update_handler { Line 5403  sub crsreq_update_handler {
                                                 $title,$code,$accessstart,$accessend,                                                  $title,$code,$accessstart,$accessend,
                                                 $incoming,\%rtnhash);                                                  $incoming,\%rtnhash);
         if ($outcome eq 'ok') {          if ($outcome eq 'ok') {
             my @posskeys = qw(createdweb createdmsg queuedweb queuedmsg formitems reviewweb);              my @posskeys = qw(createdweb createdmsg createdcustomized createdactions queuedweb queuedmsg formitems reviewweb validationjs onload javascript);
             foreach my $key (keys(%rtnhash)) {              foreach my $key (keys(%rtnhash)) {
                 if (grep(/^\Q$key\E/,@posskeys)) {                  if (grep(/^\Q$key\E/,@posskeys)) {
                     $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';                      $result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';

Removed from v.1.489.2.17  
changed lines
  Added in v.1.489.2.19


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