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

Diff for /loncom/interface/portfolio.pm between versions 1.31 and 1.56

version 1.31, 2004/08/24 21:30:00 version 1.56, 2004/11/10 05:57:53
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;
 }  }
   
 # 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_common {
     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">');
     $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 .= '<input name="uploaddoc" type="file" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
           '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
           '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
         '<input type="submit" name="storeupl" value="Upload" />'.          '<input type="submit" name="storeupl" value="Upload" />'.
         '</form>';          '</form>';
     $r->print($displayOut);      $r->print($displayOut);
Line 175  sub display_directory { Line 55  sub display_directory {
     $displayOut = '<form method="post">';      $displayOut = '<form method="post">';
     $displayOut .= '<input name="newdir" type="input" />'.      $displayOut .= '<input name="newdir" type="input" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
           '<input type="hidden" name="action" value="'.$ENV{"form.action"}.'" />'.
           '<input type="hidden" name="fieldname" value="'.$ENV{"form.fieldname"}.'" />'.
         '<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);
Line 194  sub display_directory { Line 76  sub display_directory {
       &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">'.  sub display_directory {
       my ($r,$current_path,$is_empty,$dir_list)=@_;
       my $iconpath= $r->dir_config('lonIconsURL') . "/";
       my $display_out;
       my %locked_files=&Apache::lonnet::dump('file_permissions',
                                     $ENV{'user.domain'},$ENV{'user.name'});
       my $locked_file;
       foreach my $key (keys %locked_files) {
           $locked_file .= $locked_files{$key}.':';
       }
       if ($is_empty && ($current_path ne '/')) {
           $display_out = '<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").'" />'.
         '<input type="hidden" name="selectfile" value="" />'.          '<input type="hidden" name="selectfile" value="" />'.
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.          '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
         '</form>';          '</form>';
                   
         $r->print($displayOut);          $r->print($display_out);
  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>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 217  sub display_directory { Line 110  sub display_directory {
     #$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); 
       if ($Apache::lonhomework::results{"resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename"}eq'true'){
          &Apache::lonnet::logthis("found submitted file");
          &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
       } else {
          &Apache::lonnet::logthis("$filename not found submitted file");
          &Apache::lonnet::logthis("resource.$ENV{'user.domain'}.$ENV{'user.name'}.$filename");
       }
     if (($filename ne '.') && ($filename ne '..')) {      if (($filename ne '.') && ($filename ne '..')) {
             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>');
Line 226  sub display_directory { Line 126  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 253  sub display_directory { Line 153  sub display_directory {
 #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));  #   $r->print(&display_actions($current_path, $currentFile, $isEmpty));
     $r->print('</table></form>');      $r->print('</table></form>');
 }  }
   sub display_file_select {
       my ($r,$current_path,$is_empty,$dir_list)=@_;
       my $iconpath= $r->dir_config('lonIconsURL') . "/";
       my $display_out;
       if ($is_empty && ($current_path ne '/')) {
           $display_out = '<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($display_out);
    return;
       }
       $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
               '<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";
       $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
       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
       #$dom 
       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 ($dirptr&$testdir) {
                   $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
                   $r->print('<td>Go to ...</td>');
                   $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/').'</td>'); 
                   $r->print('</tr>'); 
               } else {
                   $r->print('<tr bgcolor="#CCCCFF">');
                   $r->print('<td>
                           <input type="checkbox" name="selectedfile" value="'.$filename.'" >
                       </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>'); 
               }
           }
       }
       $r->print('</table>
               <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
               <input type="hidden" name="currentpath" value="'.$current_path.'" />
       </form>');
   }
   
 sub open_form {  sub open_form {
     my ($r)=@_;      my ($r)=@_;
Line 288  sub display_file { Line 242  sub display_file {
   
 sub done {  sub done {
     return ('<h3><a href="/adm/portfolio?currentpath='.      return ('<h3><a href="/adm/portfolio?currentpath='.
     $ENV{'form.currentpath'}.'">'.&mt('Done').'</a></h3>');      $ENV{'form.currentpath'}.
       '&fieldname='.$ENV{'form.fieldname'}.
       '">'.&mt('Done').'</a></h3>');
 }  }
   
 sub delete {  sub delete {
     my ($r)=@_;      my ($r)=@_;
     &open_form($r);      my @check;
     $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');      my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
     &close_form($r);      if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'} ) eq 'true') {
           $r->print ("The file is locked and cannot be deleted.<br />");
           $r->print(&done());
       } else {
           &open_form($r);
           $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
           &close_form($r);
       }
 }   } 
   
 sub delete_confirmed {  sub delete_confirmed {
Line 321  sub delete_dir { Line 284  sub delete_dir {
 sub delete_dir_confirmed {  sub delete_dir_confirmed {
     my ($r)=@_;      my ($r)=@_;
     my $directory_name = $ENV{'form.currentpath'};      my $directory_name = $ENV{'form.currentpath'};
     $r->print('<br />'.$directory_name.'<br />');  
     $directory_name =~ m/\/$/;      $directory_name =~ m/\/$/;
     $directory_name = $`;      $directory_name = $`;
     my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},      my $result=&Apache::lonnet::removeuserfile($ENV{'user.name'},
        $ENV{'user.domain'},'portfolio'.         $ENV{'user.domain'},'portfolio'.
        $directory_name);         $directory_name);
          
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An error occured (dir) ('.$result.   $r->print('<font color="red"> An error occured (dir) ('.$result.
 #  ') while trying to delete '.&display_file().'</font><br />');  
   ') while trying to delete '.$directory_name.'</font><br />');    ') while trying to delete '.$directory_name.'</font><br />');
       } 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;
           
   #        $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());      $r->print(&done());
 }  }
   
 sub rename {  sub rename {
     my ($r)=@_;      my ($r)=@_;
     &open_form($r);      my $file_name = $ENV{'form.currentpath'}.$ENV{'form.selectfile'};
     $r->print('<p>'.&mt('Rename').' '.&display_file().' to       if (&Apache::lonnet::is_locked($file_name,$ENV{'user.domain'},$ENV{'user.name'}) eq 'true') {
                <input name="filenewname" type="input" size="50" />?</p>');          $r->print ("The file is locked and cannot be renamed.<br />");
     &close_form($r);          $r->print(&done());
       } else {
           &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 {  sub rename_confirmed {
Line 364  sub rename_confirmed { Line 344  sub rename_confirmed {
     }      }
     $r->print(&done());      $r->print(&done());
 }  }
   sub select_files {
       my ($r)=@_;
       my $java_script =(<<ENDSMP);
           <script language='javascript'>
           function finishSelect() {
               fileList = "";
               for (i=0;i<document.forms.checkselect.length;i++) { 
                   if (document.forms.checkselect[i].checked){
                       fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
                   }
               }
               opener.document.forms.lonhomework.
   ENDSMP
       $java_script .= $ENV{'form.fieldname'};
       $java_script .= (<<ENDSMP);
           .value=fileList;
               self.close();
           }
           </script>
   ENDSMP
       $r->print($java_script);
       $r->print("<h1>Select portfolio files</h1>
                   Check as many as you wish in response to the essay problem.<br />");
   }
 sub upload {  sub upload {
     my ($r)=@_;      my ($r)=@_;
     #FIXME if the file already exists we need to do a confirmation pass       my $fname=$ENV{'form.uploaddoc.filename'};
     #before overwriting      my $filesize = (length($ENV{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $result=&Apache::lonnet::userfileupload('uploaddoc','',      my $disk_quota = 20000; # expressed in k
  'portfolio'.$ENV{'form.currentpath'});      $fname=&Apache::lonnet::clean_filename($fname);
     if ($result !~ m|^/uploaded/|) {      my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
  $r->print('<font color="red"> An errror occured ('.$result.   $ENV{'user.name'}).
   ') while trying to upload '.&display_file().'</font><br />');   '/userfiles/portfolio';
       # Fixme --- Move the checking for existing file to LOND error return
       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) {
           my ($filename)=split(/\&/,$line,2);
           if ($filename eq $fname){
               $found_file = 1;
           }
       }
       my $current_disk_usage = &Apache::lonnet::diskusage($ENV{'user.domain'}, $ENV{'user.name'},$portfolio_root);
       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>'.
                     '<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());      $r->print(&done());
 }  }
   
 sub createdir {  sub createdir {
     my ($r)=@_;      my ($r)=@_;
     #FIXME 1) file exists in place of dir (errormessage needs improvement)  
     my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});      my $newdir=&Apache::lonnet::clean_filename($ENV{'form.newdir'});
     if ($newdir eq '') {      if ($newdir eq '') {
  $r->print('<font color="red">'.      $r->print('<font color="red">'.
   &mt("Error: no valid directory name was provided.").        &mt("Error: no directory name was provided.").
   '</font><br />');        '</font><br />');
  $r->print(&done());      $r->print(&done());
  return;      return;
     }       } 
     my $result=&Apache::lonnet::mkdiruserfile($ENV{'user.name'},      my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},
      $ENV{'user.domain'},'portfolio'.$ENV{'form.currentpath'}.$newdir);   $ENV{'user.name'}).
     if ($result ne 'ok') {   '/userfiles/portfolio';
  $r->print('<font color="red"> An errror occured ('.$result.      my @dir_list=&Apache::lonnet::dirlist($ENV{'form.currentpath'},
   ') while trying to create a new directory '.&display_file().'</font><br />');    $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);
       my $found_file = 0;
       foreach my $line (@dir_list) {
           my ($filename)=split(/\&/,$line,2);
           if ($filename eq $newdir){
               $found_file = 1;
           }
       }
       if ($found_file){
          $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.
                  ' </strong>a file or directory by that name already exists.</font><br />');
       } else {
           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());      $r->print(&done());
 }  }
Line 401  sub createdir { Line 447  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'},
    $ENV{'user.name'}).
    '/userfiles/portfolio';
     &Apache::loncommon::no_cache($r);      &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;      $r->send_http_header;
Line 412  sub handler { Line 461  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','fieldname','mode']);
    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 435  sub handler { Line 488  sub handler {
  if ($ENV{'form.currentpath'}) {   if ($ENV{'form.currentpath'}) {
     $current_path = $ENV{'form.currentpath'};      $current_path = $ENV{'form.currentpath'};
  }   }
   
  my $portfolio_root = &Apache::loncommon::propath($ENV{'user.domain'},  
  $ENV{'user.name'}).  
  '/userfiles/portfolio';  
  my @dir_list=&Apache::lonnet::dirlist($current_path,   my @dir_list=&Apache::lonnet::dirlist($current_path,
     $ENV{'user.domain'},      $ENV{'user.domain'},
     $ENV{'user.name'},$portfolio_root);      $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   # 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_common($r,$current_path,$is_empty,\@dir_list);
    if ($ENV{"form.mode"} eq 'selectfile'){
       &select_files($r);
               &display_file_select($r,$current_path,$is_empty,\@dir_list);
    } else {
       &display_directory($r,$current_path,$is_empty,\@dir_list);
    }
  $r->print("</body>\n</html>\n");   $r->print("</body>\n</html>\n");
  return OK;   return OK;
     }      }
Removed from v.1.31  
changed lines
  Added in v.1.56

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>
500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.