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

Diff for /loncom/publisher/loncfile.pm between versions 1.47 and 1.50

version 1.47, 2003/12/15 20:44:06 version 1.50, 2004/01/05 16:48:50
Line 173  sub display { Line 173  sub display {
     return '<tt>'.$fn.'</tt>';      return '<tt>'.$fn.'</tt>';
 }  }
   
   
   # see if the file is
   # a) published (return 0 if not)
   # b) if, so obsolete (return 0 if not)
   
   sub obsolete_unpub {
       my ($user,$domain,$construct)=@_;
       my $published=$construct;
       $published=~
    s/^\/home\/$user\/public\_html\//\/home\/httpd\/html\/res\/$domain\/$user\//;
       if (-e $published) {
    if (&Apache::lonnet::metadata($published,'obsolete')) {
       return 1;
    }
    return 0;
       } else {
    return 1;
       }
   }
   
   
   
 =pod  =pod
   
 =item exists($user, $domain, $file)  =item exists($user, $domain, $file)
Line 414  sub Rename1 { Line 436  sub Rename1 {
  $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');   $request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
  return;   return;
     }      }
       unless (&obsolete_unpub($user,$domain,$fn)) {
    $request->print('<h3>'.&mt('Cannot rename or move non-obsolete published file').'</h3>'.
    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
    return;
       }
     $request->print('<input type="hidden" name="newfilename" value="'.      $request->print('<input type="hidden" name="newfilename" value="'.
     $newfilename.      $newfilename.
     '" /><p>'.&mt('Rename').' '.&display($fn).      '" /><p>'.&mt('Rename').' '.&display($fn).
Line 459  sub Delete1 { Line 486  sub Delete1 {
   if( -e $fn) {    if( -e $fn) {
     $request->print('<input type="hidden" name="newfilename" value="'.      $request->print('<input type="hidden" name="newfilename" value="'.
     $fn.'"/>');      $fn.'"/>');
       unless (&obsolete_unpub($user,$domain,$fn)) {
    $request->print('<h3>'.&mt('Cannot delete non-obsolete published file').'</h3>'.
    '<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');
    return;
       }
     $request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');      $request->print('<p>'.&mt('Delete').' '.&display($fn).'?</p>');
     &CloseForm1($request, $fn);      &CloseForm1($request, $fn);
   } else {    } else {
Line 858  sub Delete2 { Line 890  sub Delete2 {
     if(@files) {       if(@files) { 
       $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>');         $request->print('<font color="red"> '.&mt('Error: Directory Non Empty').'</font>'); 
       return 0;        return 0;
     }      } else {   
     else {     
       if(-e $filename) {        if(-e $filename) {
         unless(rmdir($filename)) {          unless(rmdir($filename)) {
           $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');            $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
           return 0;            return 0;
         }          }
       }        } else {
       else {          $request->print('<p> '.&mt('No such file').'. </p></form>');
         $request->print('<p> '.&mt('No such file').'. </p></form');  
         return 0;          return 0;
       }        }
   
      }       }
      } else {
    }  
   else {  
     if(-e $filename) {      if(-e $filename) {
       unless(unlink($filename)) {        unless(unlink($filename)) {
         $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');          $request->print('<font color="red">'.&mt('Error').': '.$!.'</font>');
         return 0;          return 0;
       }        }
     }      } else {
     else {        $request->print('<p> '.&mt('No such file').'. </p></form>');
       $request->print('<p> '.&mt('No such file').'. </p></form');  
       return 0;        return 0;
   }    }
  }   }
Line 1029  sub phasetwo { Line 1055  sub phasetwo {
  $main=$2; # Filename.   $main=$2; # Filename.
  }   }
  if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions   if($main=~m:\.(\w+)$:){ # Fixes problems with filenames with no extensions
  $main=$`;   $main=$`; #This is what is before the match (.) so it's just the main filename, yea it's nasty
  $suffix=$1;   $suffix=$1; #This is the actually filename extension if it exists
  }   }
     my $dest;                   # On success this is where we'll go.      my $dest;                   # On success this is where we'll go.
           
Line 1160  sub handler { Line 1186  sub handler {
   }    }
   
   
   $r->content_type('text/html');    &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;    $r->send_http_header;
   
   $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');    $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
Removed from v.1.47  
changed lines
  Added in v.1.50

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