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

Diff for /loncom/interface/portfolio.pm between versions 1.38 and 1.47

version 1.38, 2004/09/08 17:53:37 version 1.47, 2004/10/11 22:52:20
Line 37  sub make_anchor { Line 37  sub make_anchor {
     my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'">'.$filename.'</a>';      my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'">'.$filename.'</a>';
     return $anchor;      return $anchor;
 }  }
   my $dirptr=16384;
 # returns html with <br /> separated contents of the directory  sub display_directory {
 # returns a <strong>currentFile</strong> (bolds the selected file/dir)      my ($r,$current_path,$is_empty,$dir_list)=@_;
 sub display_directory_old {      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my ($currentPath, $currentFile, @dirList,) = @_;      $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     my $displayOut='';        $r->print('<td bgcolor="#ccddaa" align="center">');
     my $filename;      my $displayOut = '<form method="post" enctype="multipart/form-data">';
     my $upPath;      $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
     if ($currentPath ne '/') {          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         $displayOut = 'Listing of '.$currentPath.'<br /><hr />';          '<input type="submit" name="storeupl" value="Upload" />'.
         # provides the "up one directory level" function          '</form>';
         # it means shortening the currentpath to the parent directory      $r->print($displayOut);
         $currentPath =~ m:(^/.*)(/.*/$):;      $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
         if ($1 ne '/') {      $displayOut = '<form method="post">';
             $upPath = $1.'/';      $displayOut .= '<input name="newdir" type="input" />'.
         } else {          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
             $upPath = $1;          '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
           '</form>';
       $r->print($displayOut);
       $r->print('</td></tr></table>');
       my @tree = split (/\//,$current_path);
       $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
       if (@tree > 1){
           my $newCurrentPath = '';
           for (my $i = 1; $i< @tree; $i++){
               $newCurrentPath .= $tree[$i].'/';
               $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath).'/');
         }          }
       }
       $r->print('</font>');
       &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">'.
         &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
       'this.form.submit();'));
       $r->print("</form>");
       if ($is_empty && ($current_path ne '/')) {
           $displayOut = '<form method="post" action="/adm/portfolio">'.
           '<input type="hidden" name="action" value="deletedir" />'.
           '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
           '<input type="hidden" name="selectfile" value="" />'.
           '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
           '</form>';
                   
         # $displayOut = $displayOut.'<a href="/adm/portfolio?selectfile='.$upPath.'&currentpath='.$upPath.'">..</a><br />';          $r->print($displayOut);
     } else {   return;
         # $displayOut = $displayOut.'at root '.$currentPath.'<br />';  
     }      }
     foreach my $line (@dirList) {      $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>');
       my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio$current_path";
       foreach my $line (sort 
         { 
     my ($afile)=split('&',$a,2);
     my ($bfile)=split('&',$b,2);
     return (lc($afile) cmp lc($bfile));
         } (@$dir_list)) {
     #$strip holds directory/file name      #$strip holds directory/file name
     #$dom       #$dom 
     my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,undef,undef,undef,undef,undef,undef,$obs,undef)=split(/\&/,$line,16);       my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
         if (($filename ne '.') && ($filename ne '..')) {      if (($filename ne '.') && ($filename ne '..')) {
             if ($testdir =~ m:^1:) {              if ($dirptr&$testdir) {
                 # handle directories different from files                  $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
                 if ($filename eq $currentFile) {                  $r->print('<td>Go to ...</td>');
     #checks to bold the selected file                  $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>'); 
                     $displayOut.= '<strong>'.(&make_anchor($filename.'/', $filename.'/').'</strong><br />'."\n");                  $r->print('</tr>'); 
                 } else {  
                     $displayOut.= (&make_anchor($filename.'/', $filename.'/').'<br />'."\n");  
                 }  
             } else {              } else {
                 if ($filename eq $currentFile) {                  $r->print('<tr bgcolor="#CCCCFF">');
     #checks to bold the selected file                  $r->print('<td>
                     $displayOut.='<strong>'.(&make_anchor($filename, $currentPath).'</strong><br />'."\n");                      <form method="post" action="/adm/portfolio">
                 } else {                      <select name="action">
                     $displayOut.=(&make_anchor($filename, $currentPath).'<br />'."\n");                          <option value=""></option>
                 }                          <option value="delete">'.&mt("Delete").'</option>
                           <option value="rename">'.&mt("Rename").'</option>
                       </select>
                       <input type="submit" name="doit" value="Go" />
                       <input type="hidden" name="selectfile" value="'.$filename.'" />
                       <input type="hidden" name="currentpath" value="'.$current_path.'" />
                       </form>
                       </td>');
                   $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
                   $r->print('<td><a href="'.$href_location.$filename.'">'.
       $filename.'</a></td>'); 
                   $r->print('<td>'.$size.'</td>');
                   $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
                   $r->print('</tr>'); 
             }              }
               
         }          }
      
     }      }
     return $displayOut;  #   <tr bgcolor="#FFAA99"> pink bg 
 }  #   <tr bgcolor="#CCCCFF"> blue bg            
   #   $r->print(&display_directory($current_path, $currentFile, @dir_list));
 sub displayActions {  #    $r->print('</td>><td>');
     # returns html to offer user appropriate actions depending on selected file/directory  #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
     my $displayOut;      $r->print('</table></form>');
     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;  
 }  }
   sub display_file_select {
 my $dirptr=16384;  
 sub display_directory {  
     my ($r,$current_path,$is_empty,$dir_list)=@_;      my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');      $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
Line 190  sub display_directory { Line 162  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();'));
     $r->print("</form>");      $r->print("</form>");
     if ($is_empty) {      if ($is_empty && ($current_path ne '/')) {
         $displayOut = '<form method="post" action="/adm/portfolio">'.          $displayOut = '<form method="post" action="/adm/portfolio">'.
         '<input type="hidden" name="action" value="deletedir" />'.          '<input type="hidden" name="action" value="deletedir" />'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.          '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
Line 206  sub display_directory { Line 179  sub display_directory {
  return;   return;
     }      }
     $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>Select</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";
       $r->print('<form method="post" action="/adm/portfolio">');
     foreach my $line (sort       foreach my $line (sort 
       {         { 
   my ($afile)=split('&',$a,2);    my ($afile)=split('&',$a,2);
Line 226  sub display_directory { Line 200  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">                          <input type="checkbox" name="selectedfile" value="'.$filename.'" >
 <select name="action">                      </td>');
   <option value=""></option>  
   <option value="delete">'.&mt("Delete").'</option>  
   <option value="rename">'.&mt("Rename").'</option>  
 </select>  
 <input type="submit" name="doit" value="Go" />  
 <input type="hidden" name="selectfile" value="'.$filename.'" />  
 <input type="hidden" name="currentpath" value="'.$current_path.'" />  
 </form>  
 </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>'); 
             }              }
         }          }
     }      }
       $r->print('<input type="submit" name="doit" value="Go" />
                   
                   <input type="hidden" name="currentpath" value="'.$current_path.'" />');
   
 #   <tr bgcolor="#FFAA99"> pink bg   #   <tr bgcolor="#FFAA99"> pink bg 
 #   <tr bgcolor="#CCCCFF"> blue bg              #   <tr bgcolor="#CCCCFF"> blue bg            
 #   $r->print(&display_directory($current_path, $currentFile, @dir_list));  #   $r->print(&display_directory($current_path, $currentFile, @dir_list));
Line 331  sub delete_dir_confirmed { Line 300  sub delete_dir_confirmed {
  $r->print('<font color="red"> An error occured (dir) ('.$result.   $r->print('<font color="red"> An error occured (dir) ('.$result.
   ') while trying to delete '.$directory_name.'</font><br />');    ') while trying to delete '.$directory_name.'</font><br />');
     } else {      } else {
           # now remove from recent
   #        $r->print('<br /> removing '.$directory_name.'<br /');
           &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
         my @dirs = split m!/!, $directory_name;          my @dirs = split m!/!, $directory_name;
                   
 #        $directory_name =~ m/^(\/*\/)(\/*.)$/;  #        $directory_name =~ m/^(\/*\/)(\/*.)$/;
Line 372  sub rename_confirmed { Line 344  sub rename_confirmed {
     }      }
     $r->print(&done());      $r->print(&done());
 }  }
   sub select_files {
       my ($r)=@_;
       $r->print("<h1>Select portfolio files</h1>
                   Check as many as you wish in response to the essay problem.<br />");
       my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
    $ENV{'user.name'}).
    '/userfiles/portfolio';
       my $current_path='/';
       if ($ENV{'form.currentpath'}) {
    $current_path = $ENV{'form.currentpath'};
       }
       my @dir_list=&Apache::lonnet::dirlist($current_path,
       $ENV{'user.domain'},
       $ENV{'user.name'},$portfolio_root);
       if ($dir_list[0] eq 'no_such_dir'){
    # two main reasons for this:
           #    1) never been here, so directory structure not created
    #    2) back-button navigation after deleting a directory
           if ($current_path eq '/'){
           &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
          $ENV{'user.domain'},'portfolio');
    } else {
                   # some directory that snuck in get rid of the directory
                   # from the recent pulldown, just in case
    &Apache::lonhtmlcommon::remove_recent('portfolio',
         [$current_path]);
    $current_path = '/'; # force it back to the root        
    }
       # now grab the directory list again, for the first time
       @dir_list=&Apache::lonnet::dirlist($current_path,
       $ENV{'user.domain'},
       $ENV{'user.name'},$portfolio_root);
       }
       # need to know if directory is empty so it can be removed if desired
       my $is_empty=(@dir_list == 2);
       &display_file_select($r,$current_path,$is_empty,\@dir_list);
       $r->print("</body>\n</html>\n");
       return OK;
   }
 sub upload {  sub upload {
     my ($r)=@_;      my ($r)=@_;
     my $fname=$ENV{'form.uploaddoc.filename'};      my $fname=$ENV{'form.uploaddoc.filename'};
Line 452  sub createdir { Line 462  sub createdir {
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
  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';
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
Line 466  sub handler { Line 476  sub handler {
     $r->rflush();      $r->rflush();
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath',                                              ['selectfile','currentpath',
      'currentfile']);       'currentfile','action']);
  # make sure there is a portfolio directory off /userfiles   if (($ENV{'form.storeupl'} eq 'Upload') & (!$ENV{'form.uploaddoc.filename'})){
  # Fixme -- Do this in a better way -- offload it to the LOND routine         $r->print('<font color="red"> No file was selected to upload.'.
  my @dir_list=&Apache::lonnet::dirlist('/',                 'To upload a file, click <strong>Browse...</strong>'.
     $ENV{'user.domain'},                 ', select a file, then click <strong>Upload</strong>,</font>');
     $ENV{'user.name'},$portfolio_root);  
  if ($dir_list[0] eq 'no_such_dir'){  
      &Apache::lonnet::mkdiruserfile($ENV{'user.name'},  
      $ENV{'user.domain'},'portfolio');  
  }   }
     if ($ENV{'form.uploaddoc.filename'}) {      if ($ENV{'form.uploaddoc.filename'}) {
  &upload($r);   &upload($r);
       } elsif ($ENV{'form.action'} eq 'selectfile') {
           &select_files($r);
     } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {      } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
  &delete_confirmed($r);   &delete_confirmed($r);
     } elsif ($ENV{'form.action'} eq 'delete') {      } elsif ($ENV{'form.action'} eq 'delete') {
Line 497  sub handler { Line 505  sub handler {
  if ($ENV{'form.currentpath'}) {   if ($ENV{'form.currentpath'}) {
     $current_path = $ENV{'form.currentpath'};      $current_path = $ENV{'form.currentpath'};
  }   }
  @dir_list=&Apache::lonnet::dirlist($current_path,   my @dir_list=&Apache::lonnet::dirlist($current_path,
       $ENV{'user.domain'},
       $ENV{'user.name'},$portfolio_root);
    if ($dir_list[0] eq 'no_such_dir'){
       # two main reasons for this:
               #    1) never been here, so directory structure not created
       #    2) back-button navigation after deleting a directory
       if ($current_path eq '/'){
           &Apache::lonnet::mkdiruserfile($ENV{'user.name'},
          $ENV{'user.domain'},'portfolio');
       } else {
                   # some directory that snuck in get rid of the directory
                   # from the recent pulldown, just in case
    &Apache::lonhtmlcommon::remove_recent('portfolio',
         [$current_path]);
    $current_path = '/'; # force it back to the root        
       }
       # now grab the directory list again, for the first time
       @dir_list=&Apache::lonnet::dirlist($current_path,
     $ENV{'user.domain'},      $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);      $ENV{'user.name'},$portfolio_root);
               }
  # need to know if directory is empty so it can be removed if desired   # need to know if directory is empty so it can be removed if desired
  my $is_empty=(@dir_list == 2);   my $is_empty=(@dir_list == 2);
  &display_directory($r,$current_path,$is_empty,\@dir_list);   &display_directory($r,$current_path,$is_empty,\@dir_list);
Removed from v.1.38  
changed lines
  Added in v.1.47

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