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

Diff for /loncom/interface/portfolio.pm between versions 1.37 and 1.40

version 1.37, 2004/09/06 23:59:05 version 1.40, 2004/09/09 17:53:59
Line 38  sub make_anchor { Line 38  sub make_anchor {
     return $anchor;      return $anchor;
 }  }
   
 # returns html with <br /> separated contents of the directory  
 # returns a <strong>currentFile</strong> (bolds the selected file/dir)  
 sub display_directory_old {  
     my ($currentPath, $currentFile, @dirList,) = @_;  
     my $displayOut='';    
     my $filename;  
     my $upPath;  
     if ($currentPath ne '/') {  
         $displayOut = 'Listing of '.$currentPath.'<br /><hr />';  
         # provides the "up one directory level" function  
         # it means shortening the currentpath to the parent directory  
         $currentPath =~ m:(^/.*)(/.*/$):;  
         if ($1 ne '/') {  
             $upPath = $1.'/';  
         } else {  
             $upPath = $1;  
         }  
           
         # $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile='.$upPath.'&currentpath='.$upPath.'">..</a><br />';  
     } else {  
         # $displayOut = $displayOut.'at root '.$currentPath.'<br />';  
     }  
     foreach my $line (@dirList) {  
     #$strip holds directory/file name  
     #$dom   
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);   
         if (($filename ne '.') && ($filename ne '..')) {  
             if ($testdir =~ m:^1:) {  
                 # handle directories different from files  
                 if ($filename eq $currentFile) {  
     #checks to bold the selected file  
                     $displayOut.= '<strong>'.(&make_anchor($filename.'/', $filename.'/').'</strong><br />'."\n");  
                 } else {  
                     $displayOut.= (&make_anchor($filename.'/', $filename.'/').'<br />'."\n");  
                 }  
             } else {  
                 if ($filename eq $currentFile) {  
     #checks to bold the selected file  
                     $displayOut.='<strong>'.(&make_anchor($filename, $currentPath).'</strong><br />'."\n");  
                 } else {  
                     $displayOut.=(&make_anchor($filename, $currentPath).'<br />'."\n");  
                 }  
             }  
               
         }  
      
     }  
     return $displayOut;  
 }  
   
 sub displayActions {  
     # returns html to offer user appropriate actions depending on selected file/directory  
     my $displayOut;  
     my ($currentPath, $currentFile, $isEmpty) = @_;  
 #   $displayOut = 'here are actions for '.$currentFile;  
     if ($currentFile =~ m:/$:) {  
         # if the selected file is a directory, these are the options  
         # offer the chance to delete the directory only if it is empty  
         if ($isEmpty && ($currentPath ne '/')) {  
             $displayOut =   $displayOut.'<form method="POST">  
             <input type="hidden" name="selectfile"   
             value="'.$currentFile.'" />  
             <input type="hidden" name="fileaction" value="delete" />   
             <input type="hidden" name="currentpath" value="'.$currentPath.'" />   
             <center>  
             <input type="submit"   
             value="Delete '.$currentFile.'" />  
             </center>  
             </form>';  
         }   
         if ($currentPath ne '/') {  
             $displayOut = $displayOut.'<hr />  
             <form method="POST">  
             <input type="hidden" name="selectfile"   
             value="'.$currentFile.'" />  
             <input type="hidden" name="fileaction" value="rename" />   
             <input type="hidden" name="currentpath" value="'.$currentPath.'" />   
             <input type="input" name="filenewname" value="Type new name here" />   
             <input type="submit"   
             value="Rename '.$currentFile.'" />  
             </form>';  
         }  
     } else {  #action options offered for files  
         $displayOut = $displayOut.'<form method="POST">';  
         $displayOut = $displayOut.'<input type="hidden" name="selectfile"';  
         $displayOut = $displayOut.'value="'.$currentFile;  
         $displayOut = $displayOut.'" /><input type="hidden" name="fileaction" value="delete" />   
         <input type="hidden" name="currentpath" value="'.$currentPath.'" />   
         <center>  
         <input type="submit"  
         value="Delete '.$currentFile.'" />  
         </center>  
         </form>';  
       
         $displayOut = $displayOut.'<hr />  
         <form method="POST">  
         <input type="hidden" name="selectfile"   
         value="'.$currentFile.'" />  
         <input type="hidden" name="fileaction" value="rename" />   
         <input type="hidden" name="currentpath" value="'.$currentPath.'" />   
         <input type="input" name="filenewname" value="Type new name here" />   
         <input type="submit"   
         value="Rename '.$currentFile.'" />  
         </form>  
         <hr />';  
     }  
     $displayOut = $displayOut.'<hr />Add a file to '.$currentPath;  
     # file upload form   
     $displayOut = $displayOut.'<form method="post" enctype="multipart/form-data">';  
     $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.  
         '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.  
         '<input type="submit" name="storeupl" value="Upload" />'.  
         '</form><hr />';  
     $displayOut = $displayOut.'<form method="POST">  
         <input name="subdir" type="text" />  
         <input type="submit" value="Create Subdirectory" />  
         </form>  
             ';  
     return $displayOut;  
 }  
   
 my $dirptr=16384;  my $dirptr=16384;
 sub display_directory {  sub display_directory {
     my ($r,$current_path,$is_empty,$dir_list)=@_;      my ($r,$current_path,$is_empty,$dir_list)=@_;
Line 190  sub display_directory { Line 69  sub display_directory {
     }      }
     $r->print('</font>');      $r->print('</font>');
     &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);      &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
       #Fixme -- remove from recent those paths that are deleted
     $r->print('<br /><form method=post action="/adm/portfolio">'.      $r->print('<br /><form method=post action="/adm/portfolio">'.
       &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',        &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
     'this.form.submit();'));      'this.form.submit();'));
Line 207  sub display_directory { Line 87  sub display_directory {
     }      }
     $r->print('<table border="0" cellspacing="2" cellpadding="2">'.      $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
             '<tr><th>Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');              '<tr><th>Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/";      my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
     foreach my $line (sort       foreach my $line (sort 
       {         { 
   my ($afile)=split('&',$a,2);    my ($afile)=split('&',$a,2);
Line 226  sub display_directory { Line 106  sub display_directory {
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
                 $r->print('<td>                  $r->print('<td>
 <form method="post" action="/adm/portfolio">                      <form method="post" action="/adm/portfolio">
 <select name="action">                      <select name="action">
   <option value=""></option>                          <option value=""></option>
   <option value="delete">'.&mt("Delete").'</option>                          <option value="delete">'.&mt("Delete").'</option>
   <option value="rename">'.&mt("Rename").'</option>                          <option value="rename">'.&mt("Rename").'</option>
 </select>                      </select>
 <input type="submit" name="doit" value="Go" />                      <input type="submit" name="doit" value="Go" />
 <input type="hidden" name="selectfile" value="'.$filename.'" />                      <input type="hidden" name="selectfile" value="'.$filename.'" />
 <input type="hidden" name="currentpath" value="'.$current_path.'" />                      <input type="hidden" name="currentpath" value="'.$current_path.'" />
 </form>                      </form>
 </td>');                      </td>');
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');                  $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.                  $r->print('<td><a href="'.$href_location.$filename.'">'.
   $filename.'</a></td>');       $filename.'</a></td>'); 
                 $r->print('<td>'.$size.'</td>');                  $r->print('<td>'.$size.'</td>');
                 $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');                  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
                 $r->print('</tr>');                   $r->print('</tr>'); 
Line 376  sub rename_confirmed { Line 256  sub rename_confirmed {
 sub upload {  sub upload {
     my ($r)=@_;      my ($r)=@_;
     my $fname=$ENV{'form.uploaddoc.filename'};      my $fname=$ENV{'form.uploaddoc.filename'};
       my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?)
       my $disk_quota = 20000; # expressed in k
     $fname=&Apache::lonnet::clean_filename($fname);      $fname=&Apache::lonnet::clean_filename($fname);
     my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},      my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
  $ENV{'user.name'}).   $ENV{'user.name'}).
  '/userfiles/portfolio';   '/userfiles/portfolio';
       # Fixme --- Move the checking for existing file to LOND error return
     my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},      my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
   $ENV{'user.domain'},    $ENV{'user.domain'},
   $ENV{'user.name'},$portfolio_root);    $ENV{'user.name'},$portfolio_root);
Line 390  sub upload { Line 273  sub upload {
             $found_file = 1;              $found_file = 1;
         }          }
     }      }
     $r->print('<br />'.&Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root).'<br />');      my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
     if ($found_file){         if (($current_disk_usage + $filesize) > $disk_quota){
           $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
                     '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
       } 
       elsif ($found_file){   
         $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.          $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$ENV{'form.currentpath'}.'</strong></font>'.
                   '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});                    '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});
     } else {      } else {
Line 461  sub handler { Line 348  sub handler {
                                             ['selectfile','currentpath',                                              ['selectfile','currentpath',
      'currentfile']);       'currentfile']);
  # make sure there is a portfolio directory off /userfiles   # make sure there is a portfolio directory off /userfiles
    # Fixme -- Do this in a better way -- offload it to the LOND routine
  my @dir_list=&Apache::lonnet::dirlist('/',   my @dir_list=&Apache::lonnet::dirlist('/',
     $ENV{'user.domain'},      $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);      $ENV{'user.name'},$portfolio_root);
Line 468  sub handler { Line 356  sub handler {
      &Apache::lonnet::mkdiruserfile($ENV{'user.name'},       &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
      $ENV{'user.domain'},'portfolio');       $ENV{'user.domain'},'portfolio');
  }   }
    if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
          $r->print('<font color="red"> No file was selected to upload.'.
                  'To upload a file, click <strong>Browse...</strong>'.
                  ', select a file, then click <strong>Upload</strong>,</font>');
    }
     if ($ENV{'form.uploaddoc.filename'}) {      if ($ENV{'form.uploaddoc.filename'}) {
  &upload($r);   &upload($r);
     } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {      } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
Line 489  sub handler { Line 382  sub handler {
  if ($ENV{'form.currentpath'}) {   if ($ENV{'form.currentpath'}) {
     $current_path = $ENV{'form.currentpath'};      $current_path = $ENV{'form.currentpath'};
  }   }
  my @dir_list=&Apache::lonnet::dirlist($current_path,   @dir_list=&Apache::lonnet::dirlist($current_path,
     $ENV{'user.domain'},      $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);      $ENV{'user.name'},$portfolio_root);
           
Removed from v.1.37  
changed lines
  Added in v.1.40

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