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

Diff for /loncom/interface/portfolio.pm between versions 1.23 and 1.33

version 1.23, 2004/08/24 05:01:42 version 1.33, 2004/08/25 18:48:26
Line 40  sub make_anchor { Line 40  sub make_anchor {
   
 # returns html with <br /> separated contents of the directory  # returns html with <br /> separated contents of the directory
 # returns a <strong>currentFile</strong> (bolds the selected file/dir)  # returns a <strong>currentFile</strong> (bolds the selected file/dir)
 sub display_directory {  sub display_directory_old {
     my ($currentPath, $currentFile, @dirList,) = @_;      my ($currentPath, $currentFile, @dirList,) = @_;
     my $displayOut='';        my $displayOut='';  
     my $filename;      my $filename;
Line 159  sub displayActions { Line 159  sub displayActions {
     return $displayOut;      return $displayOut;
 }  }
   
 sub handler {  my $dirptr=16384;
     # this handles file management  sub display_directory {
     my $r = shift;      my ($r,$current_path,$is_empty,$dir_list)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my @dirList; # will hold directory listing as array  
     my $udir; # returned from home server  
     my $currentPath; # path assuming /userfiles/portfolio/ as root  
     my $currentFile; # directory or file contained in $pathToRoot.$currentPath  
     my $action; # delete, rename, makedirectory, removedirectory,  
     my $filenewname; # for rename action (guess what we do with it!)  
     my $isFile;  
     my $isEmpty;  
     my $dirptr=16384;  
     &Apache::loncommon::no_cache($r);  
     &Apache::loncommon::content_type($r,'text/html');  
     $r->send_http_header;  
     # Give the LON-CAPA page header  
     $r->print('<html><head><title>'.  
               &mt('Portfolio Manager').  
               "</title></head>\n".  
               &Apache::loncommon::bodytag('Portfolio Manager'));  
     $r->rflush();  
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},  
                                             ['selectfile','currentpath', 'currentfile']);  
     # currentPath and currentFile need to be set for the rest of things to happen  
     # sometimes, currentFile will be passed by a form field, selectedfile  
     # if there is no 'form.selectedfile' then the current directory is   
     # considered as selected   
     if ($ENV{'form.currentpath'}) {  
         $currentPath = $ENV{'form.currentpath'};  
     } else {  
         $currentPath = '/';  
     }  
     if ($ENV{'form.selectfile'}) {  
         # have to check if the selected file is a subdirectory  
         if ($ENV{'form.selectfile'} =~ /-\(Dir\)/) {  
             # $currentPath =~ /\-\(Dir\)/;  
             $currentPath = $`.'/';  
             $r->print('<br />'.$currentPath.'<br />');  
         }  
         $currentFile = $ENV{'form.selectfile'};  
     } else {  
         $currentFile = '';  
     }  
     # if we're uploading a file, we need to do it early so it will show in the directory list  
     if ($ENV{'form.uploaddoc.filename'}) {  
         $r->print($ENV{'form.storeupl'}.'<br />');  
         $r->print(&Apache::lonnet::userfileupload('uploaddoc','','portfolio'.$currentPath).'<br />');    
     }  
     # similarly, we need to delete or rename files before getting directory list  
     if ($ENV{'form.selectfile'}) {  
         if ($ENV{'form.fileaction'} eq 'delete') {  
             $r->print('<br />trying to delete '.$currentPath.$ENV{'form.selectfile'}.'<br />');  
             $r->print(&Apache::lonnet::removeuserfile($ENV{'user.name'}, $ENV{'user.domain'},'portfolio'.$currentPath.$ENV{'form.selectfile'}));  
             $currentFile = '';  
         } elsif ($ENV{'form.fileaction'} eq 'rename') {  
             &Apache::lonnet::portfoliomanage($currentPath.$ENV{'form.selectfile'}, 'rename', $currentPath.$ENV{'form.filenewname'} );  
         }  
     }  
     # we always need $dirList, plus this will return information about the current file  
     # as well as information about the home server directory structure, specifically  
     # the path to the users userfiles directory.      
     #   
     my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},  
      $ENV{'user.name'}).  
        '/userfiles/portfolio';  
     @dirList = &Apache::lonnet::dirlist($currentPath,  $ENV{'user.domain'}, $ENV{'user.name'}, $portfolio_root);  
       
     if (@dirList == 2) { # need to know if directory is empty so it can be removed if desired  
         $isEmpty = 1;  
     } else {  
         $isEmpty = 0;  
     }  
      
     if ($ENV{'form.selectfile'}) {  
         if ($ENV{'form.fileaction'} eq 'delete') {  
             &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'delete', undef );  
             $ENV{'portfolio.file'} = 'Selected File Deleted';  
         } elsif ($ENV{'form.fileaction'} eq 'rename') {  
             &Apache::lonnet::portfoliomanage($ENV{'form.selectfile'}, 'rename', $ENV{'form.filenewname'});  
         } else {  
     # Remember user's file selection for later  
     $ENV{'portfolio.file'} = $ENV{'form.selectfile'};  
     # offer things user can do with selected file  
         }  
     } else {  
         unless ($ENV{'portfolio.file'}){  
             $ENV{'portfolio.file'} = 'No File Selected';  
         }  
     }  
     ##############################  
     #  
     # Display begins here  
     #  
     ##############################  
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');      $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
     $r->print('<td bgcolor="#ccddaa" align="center">');      $r->print('<td bgcolor="#ccddaa" align="center">');
     my $displayOut = '<form method="post" enctype="multipart/form-data">';      my $displayOut = '<form method="post" enctype="multipart/form-data">';
     $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.      $displayOut = $displayOut.'<input name="uploaddoc" type="file" />'.
         '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         '<input type="submit" name="storeupl" value="Upload" />'.          '<input type="submit" name="storeupl" value="Upload" />'.
         '</form>';          '</form>';
     $r->print($displayOut);      $r->print($displayOut);
     $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');      $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
     my $displayOut = '<form method="post">';      $displayOut = '<form method="post">';
     $displayOut = $displayOut.'<input name="newdir" type="input" />'.      $displayOut .= '<input name="newdir" type="input" />'.
         '<input type="hidden" name="currentpath" value="'.$currentPath.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.          '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
         '</form>';          '</form>';
     $r->print($displayOut);      $r->print($displayOut);
     $r->print('</td></tr></table>');      $r->print('</td></tr></table>');
     my @tree = split (/\//,$currentPath);      my @tree = split (/\//,$current_path);
     $r->print('<font size="+2">'.&make_anchor('/','/'));      $r->print('<font size="+2">'.&make_anchor('portfolio','/').'/');
     if (@tree > 1){      if (@tree > 1){
         my $newCurrentPath = '';          my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){          for (my $i = 1; $i< @tree; $i++){
Line 280  sub handler { Line 189  sub handler {
         }          }
     }      }
     $r->print('</font>');      $r->print('</font>');
     &Apache::lonhtmlcommon::store_recent('portfolio',$currentPath,$currentPath);      &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
     $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) {
           $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>';
           
           $r->print($displayOut);
    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>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/$currentPath/";      my $href_location="/uploaded/$ENV{'user.domain'}/$ENV{'user.name'}/portfolio/$current_path/";
     foreach my $line (@dirList) {      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,$size,undef,$mtime,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); 
Line 296  sub handler { Line 221  sub handler {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
                 $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');                  $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
                 $r->print('<td>Go to ...</td>');                  $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.&make_anchor($filename.'/',$currentPath.$filename.'/').'</td>');                   $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
                 $r->print('<td>                  $r->print('<td>
   <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="currentpath" value="'.$current_path.'" />
   </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.'">'.
Line 319  sub handler { Line 248  sub handler {
     }      }
 #   <tr bgcolor="#FFAA99"> pink bg   #   <tr bgcolor="#FFAA99"> pink bg 
 #   <tr bgcolor="#CCCCFF"> blue bg              #   <tr bgcolor="#CCCCFF"> blue bg            
 #   $r->print(&display_directory($currentPath, $currentFile, @dirList));  #   $r->print(&display_directory($current_path, $currentFile, @dir_list));
 #    $r->print('</td>><td>');  #    $r->print('</td>><td>');
 #   $r->print(&display_actions($currentPath, $currentFile, $isEmpty));  #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
     $r->print('</table></form>');      $r->print('</table></form>');
     $r->print('</blockquote>');  
     $r->print("</body>\n</html>\n");  
     $r->rflush();  
     return OK;  
 }  }
   
   sub open_form {
       my ($r)=@_;
       $r->print('<form method="post" action="/adm/portfolio">');
       $r->print('<input type="hidden" name="action" value="'.
         $ENV{'form.action'}.'" />');
       $r->print('<input type="hidden" name="confirmed" value="1" />');
       $r->print('<input type="hidden" name="selectfile" value="'.
         $ENV{'form.selectfile'}.'" />');
       $r->print('<input type="hidden" name="currentpath" value="'.
         $ENV{'form.currentpath'}.'" />');
   }
   
   sub clean_filename {
       my ($fname)=@_;
   # Replace Windows backslashes by forward slashes
       $fname=~s/\\/\//g;
   # Get rid of everything but the actual filename
       $fname=~s/^.*\/([^\/]+)$/$1/;
   # Replace spaces by underscores
       $fname=~s/\s+/\_/g;
   # Replace all other weird characters by nothing
       $fname=~s/[^\w\.\-]//g;
       return $fname;
   }
   
   sub close_form {
       my ($r)=@_;
       $r->print('<p><input type="submit" value="'.&mt('Continue').
         '" /></p></form>');
       $r->print('<form action="/adm/portfolio" method="POST">
                  <p>
                 <input type="hidden" name="currentpath" value="'.
         $ENV{'form.currentpath'}.'" />
                    <input type="submit" value="'.&mt('Cancel').'" />
                  </p></form>');
   
   }
   
   sub display_file {
       my ($path,$filename)=@_;
       if (!defined($path)) { $path=$ENV{'form.currentpath'}; }
       if (!defined($filename)) { $filename=$ENV{'form.selectfile'}; }
       return '<tt>'.$path.$filename.'</tt>';
   }
   
   sub done {
       return ('<h3><a href="/adm/portfolio?currentpath='.
       $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');
   }
   
   sub delete {
       my ($r)=@_;
       &open_form($r);
       $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
       &close_form($r);
   } 
   
   sub delete_confirmed {
       my ($r)=@_;
       my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
          $ENV{'user.domain'},'portfolio'.
          $ENV{'form.currentpath'}.
          $ENV{'form.selectfile'});
       if ($result ne 'ok') {
    $r->print('<font color="red"> An error occured ('.$result.
     ') while trying to delete '.&display_file().'</font><br />');
       }
       $r->print(&done());
   }
   
   sub delete_dir {
       my ($r)=@_;
       &open_form($r);
       $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
       &close_form($r);
   } 
   
   sub delete_dir_confirmed {
       my ($r)=@_;
       my $directory_name = $ENV{'form.currentpath'};
       $directory_name =~ m/\/$/;
       $directory_name = $`;
       my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
          $ENV{'user.domain'},'portfolio'.
          $directory_name);
          
       if ($result ne 'ok') {
    $r->print('<font color="red"> An error occured (dir) ('.$result.
     ') while trying to delete '.$directory_name.'</font><br />');
       } else {
           my @dirs = split m!/!, $directory_name;
           
   #        $directory_name =~ m/^(\/*\/)(\/*.)$/;
           $directory_name='/';
           for (my $i=1; $i < (@dirs - 1); $i ++){
               $directory_name .= $dirs[$i].'/';
           }
           $ENV{'form.currentpath'} = $directory_name;
       }
       $r->print(&done());
   }
   
   sub rename {
       my ($r)=@_;
       &open_form($r);
       $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
                  <input name="filenewname" type="input" size="50" />?</p>');
       &close_form($r);
   }
   
   sub rename_confirmed {
       my ($r)=@_;
       my $filenewname=&Apache::lonnet::clean_filename($ENV{'form.filenewname'});
       if ($filenewname eq '') {
    $r->print('<font color="red">'.
     &mt("Error: no valid filename was provided to rename to.").
     '</font><br />');
    $r->print(&done());
    return;
       } 
       my $result=
    &Apache::lonnet::renameuserfile($ENV{'user.name'},$ENV{'user.domain'},
               'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.selectfile'},
               'portfolio'.$ENV{'form.currentpath'}.$ENV{'form.filenewname'});
       if ($result ne 'ok') {
    $r->print('<font color="red"> An errror occured ('.$result.
     ') while trying to rename '.&display_file().' to '.
     &display_file(undef,$filenewname).'</font><br />');
       }
       $r->print(&done());
   }
   
   sub upload {
       my ($r)=@_;
       #FIXME if the file already exists we need to do a confirmation pass 
       #before overwriting
       my $fname=$ENV{'form.uploaddoc.filename'};
       $fname=&clean_filename($fname);
       my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
    $ENV{'user.name'}).
    '/userfiles/portfolio';
    my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
       $ENV{'user.domain'},
       $ENV{'user.name'},$portfolio_root);
     my $found_file = 0;
       foreach my $line (@dir_list) {
       #$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 eq $fname){
               $found_file = 1;
           }
       }
       if ($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>'.
                     '<br />To upload, rename or delete existing '.$fname.' in '.$ENV{'form.currentpath'});
       } else {
           my $result=&Apache::lonnet::userfileupload('uploaddoc','',
            'portfolio'.$ENV{'form.currentpath'});
           if ($result !~ m|^/uploaded/|) {
           $r->print('<font color="red"> An errror occured ('.$result.
                 ') while trying to upload '.&display_file().'</font><br />');
           }
       }
       $r->print(&done());
   }
   
   sub createdir {
       my ($r)=@_;
       #FIXME 1) file exists in place of dir (errormessage needs improvement)
       my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
       if ($newdir eq '') {
    $r->print('<font color="red">'.
     &mt("Error: no valid directory name was provided.").
     '</font><br />');
    $r->print(&done());
    return;
       } 
       my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},
        $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir);
       if ($result ne 'ok') {
    $r->print('<font color="red"> An errror occured ('.$result.
     ') while trying to create a new directory '.&display_file().'</font><br />');
       }
       $r->print(&done());
   }
   
   sub handler {
       # this handles file management
       my $r = shift;
    my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
    $ENV{'user.name'}).
    '/userfiles/portfolio';
       &Apache::loncommon::no_cache($r);
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       # Give the LON-CAPA page header
       $r->print('<html><head><title>'.
                 &mt('Portfolio Manager').
                 "</title></head>\n".
                 &Apache::loncommon::bodytag('Portfolio Manager'));
       $r->rflush();
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                               ['selectfile','currentpath',
        'currentfile']);
   
       if ($ENV{'form.uploaddoc.filename'}) {
    &upload($r);
       } elsif ($ENV{'form.action'} eq 'delete' && $ENV{'form.confirmed'}) {
    &delete_confirmed($r);
       } elsif ($ENV{'form.action'} eq 'delete') {
    &delete($r);
       } elsif ($ENV{'form.action'} eq 'deletedir' && $ENV{'form.confirmed'}) {
    &delete_dir_confirmed($r);
       } elsif ($ENV{'form.action'} eq 'deletedir'){
    &delete_dir($r);
       } elsif ($ENV{'form.action'} eq 'rename' && $ENV{'form.confirmed'}) {
    &rename_confirmed($r);
       } elsif ($ENV{'form.action'} eq 'rename') {
    &rename($r);
       } elsif ($ENV{'form.createdir'}) {
    &createdir($r);
       } else {
    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);
       
    # need to know if directory is empty so it can be removed if desired
    my $is_empty=(@dir_list == 2);
    &display_directory($r,$current_path,$is_empty,\@dir_list);
    $r->print("</body>\n</html>\n");
    return OK;
       }
   }
 1;  1;
 __END__  __END__
Removed from v.1.23  
changed lines
  Added in v.1.33

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