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

Diff for /loncom/interface/portfolio.pm between versions 1.87 and 1.100

version 1.87, 2005/08/26 21:47:25 version 1.100, 2006/05/18 20:29:00
Line 30  use Apache::lontexconvert; Line 30  use Apache::lontexconvert;
 use Apache::lonfeedback;  use Apache::lonfeedback;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::longroup;
   
 # receives a file name and path stub from username/userfiles/portfolio/  # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath  # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {  sub make_anchor {
     my ($filename, $current_path, $current_mode, $field_name, $continue_select) = @_;      my ($url, $filename, $current_path, $current_mode, $field_name,
           $continue_select,$group) = @_;
     if ($continue_select ne 'true') {$continue_select = 'false'};      if ($continue_select ne 'true') {$continue_select = 'false'};
     my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name.'">'.$filename.'</a>';      my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name;
       if (defined($group)) {
           $anchor .= '&group='.$group;
       }
       $anchor .= '">'.$filename.'</a>';
     return $anchor;      return $anchor;
 }  }
 my $dirptr=16384;  my $dirptr=16384;
 sub display_common {  sub display_common {
     my ($r,$current_path,$is_empty,$dir_list)=@_;      my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
       my $groupitem;
       my $namespace = &get_namespace($group);
       my $port_path = &get_port_path($group);
       if (defined($group)) {
           $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
       } 
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');      my %text=&Apache::lonlocal::texthash('upload' => 'Upload',
     $r->print('<td bgcolor="#ccddaa" align="center">');   'upload_label' =>  
     my $displayOut = '<form method="post" enctype="multipart/form-data">';   'Upload file to current directory:',
     $displayOut .= '<input name="uploaddoc" type="file" />'.   'createdir' => 'Create Subdirectory',
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.   'createdir_label' => 
         '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'.   'Create subdirectory in current directory:');
         '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'.      $r->print(<<"TABLE"); 
         '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'.   <table border="0" cellspacing="2" cellpadding="2">
         '<input type="submit" name="storeupl" value="Upload" />'.    <form method="post" enctype="multipart/form-data">
         '</form>';      <tr valign="middle">
     $r->print($displayOut);        <td bgcolor="#ccddaa" align="right">
     $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');          $text{'upload_label'}
     $displayOut = '<form method="post">';        </td>
     $displayOut .= '<input name="newdir" type="input" />'.        <td bgcolor="#ccddaa" align="left">$groupitem
         '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.          <input name="uploaddoc" type="file" />
         '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'.   <input type="hidden" name="currentpath" value="$current_path" />
         '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'.   <input type="hidden" name="action" value="$env{"form.action"}" />
         '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'.    <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
         '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.   <input type="hidden" name="mode" value="$env{"form.mode"}" />
         '</form>';   <input type="submit" name="storeupl" value="$text{'upload'}" />
     $r->print($displayOut);        </td>
     $r->print('</td></tr></table>');      </tr>
     </form>
     <form method="post">
       <tr>
         <td bgcolor="#ccddaa" align="right">
           $text{'createdir_label'}
         </td>
         <td bgcolor="#ccddaa" align="left">
           <input name="newdir" type="input" />$groupitem
           <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="hidden" name="mode" value="$env{"form.mode"}" />
           <input type="submit" name="createdir" value="$text{'createdir'}" />
         </td>
       </tr>
     </form>
   </table>
   TABLE
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
     $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');      $r->print('<font size="+2">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
     if (@tree > 1){      if (@tree > 1){
         my $newCurrentPath = '';          my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){          for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';              $newCurrentPath .= $tree[$i].'/';
             $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');              $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
         }          }
     }      }
     $r->print('</font>');      $r->print('</font>');
     &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);      &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
     $r->print('<br /><form method=post action="/adm/portfolio?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"}.'">'.      $r->print('<br /><form method=post action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"});
       &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',      if (defined($group)) {
           $r->print('&group='.$group);
       }
       $r->print('">'.
         &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
     'this.form.submit();'));      'this.form.submit();'));
     $r->print("</form>");      $r->print("</form>");
 }  }
 sub display_directory {  sub display_directory {
     my ($r,$current_path,$is_empty,$dir_list)=@_;      my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
       my ($groupitem,$groupecho);
     my $display_out;      my $display_out;
     my $select_mode;      my $select_mode;
     my $checked_files;      my $checked_files;
     my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($env{'user.domain'},$env{'user.name'});      my $port_path = &get_port_path($group);
       my ($uname,$udom) = &get_name_dom($group);
       my $namespace = &get_namespace($group); 
       if (defined($group)) {
          $groupitem = '<input type="hidden" name="group" value="'.$group.'" />'; 
          $groupecho = '&amp;group='.$group;
       }
       my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($namespace,$udom,$uname);
     if ($env{"form.mode"} eq 'selectfile'){      if ($env{"form.mode"} eq 'selectfile'){
  &select_files($r);   &select_files($r);
  $checked_files =&Apache::lonnet::files_in_path($env{'user.name'},$env{'form.currentpath'});   $checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
  $select_mode = 'true';   $select_mode = 'true';
     }       } 
     if ($is_empty && ($current_path ne '/')) {      if ($is_empty && ($current_path ne '/')) {
         $display_out = '<form method="post" action="/adm/portfolio">'.          $display_out = '<form method="post" action="'.$url.'">'.$groupitem.
         '<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="" />'.
Line 107  sub display_directory { Line 149  sub display_directory {
     if ($select_mode eq 'true') {      if ($select_mode eq 'true') {
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.          $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>');              '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
         $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');          $r->print('<form method="post" name="checkselect" action="'.$url.'">');
     } else {      } else {
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.          $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');              '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
         $r->print('<form method="post" action="/adm/portfolio">');          $r->print('<form method="post" action="'.$url.'">');
       }
       if (defined($group)) {
           $r->print("\n".$groupitem."\n");
     }      }
     my $href_location="/uploaded/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";      my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
     my $href_edit_location="/editupload/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";      my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     foreach my $line (sort       foreach my $line (sort 
       {         { 
   my ($afile)=split('&',$a,2);    my ($afile)=split('&',$a,2);
Line 125  sub display_directory { Line 170  sub display_directory {
     #$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); 
     $filename =~ s/\s+$//;      $filename =~ s/\s+$//;
     if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(.*)\.(.*)/)) {      if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
             if ($dirptr&$testdir) {              if ($dirptr&$testdir) {
                 if ($select_mode eq 'true'){                  if ($select_mode eq 'true'){
                     $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 133  sub display_directory { Line 178  sub display_directory {
                     $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');                      $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><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.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>');                   $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
                 $r->print('<tr bgcolor="#CCCCFF">');                  $r->print('<tr bgcolor="#CCCCFF">');
Line 145  sub display_directory { Line 190  sub display_directory {
                     $r->print('></td>');                      $r->print('></td>');
                 } else {                  } else {
                     if (exists $locked_files{$current_path.$filename}){                      if (exists $locked_files{$current_path.$filename}){
                         $r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>');                          $r->print('<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>');
                     } else {                      } else {
    my $cat='<img alt="'.&mt('Catalog Information').
       '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                         $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />                          $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
                             <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a></td>                              <a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a></td>
                             <td><a href="'.$href_edit_location.$filename.'.meta">Meta</a>                              <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
                             </td>');                              </td>');
                     }                      }
                 }                  }
                 $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');                  $r->print('<td><img src="'.&Apache::loncommon::icon($filename).'"></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>');
Line 181  sub display_directory { Line 228  sub display_directory {
 }  }
   
 sub open_form {  sub open_form {
     my ($r)=@_;      my ($r,$url)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     $r->print('<form method="post" action="/adm/portfolio">');      $r->print('<form method="post" action="'.$url.'">');
     $r->print('<input type="hidden" name="action" value="'.      $r->print('<input type="hidden" name="action" value="'.
       $env{'form.action'}.'" />');        $env{'form.action'}.'" />');
     $r->print('<input type="hidden" name="confirmed" value="1" />');      $r->print('<input type="hidden" name="confirmed" value="1" />');
Line 196  sub open_form { Line 243  sub open_form {
 }  }
   
 sub close_form {  sub close_form {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     $r->print('<p><input type="submit" value="'.&mt('Continue').      $r->print('<p><input type="submit" value="'.&mt('Continue').'" />');
       '" /></p></form>');      if (defined($group)) {
     $r->print('<form action="/adm/portfolio" method="POST">         $r->print("\n".'<input type="hidden" name="group" value="'.
                 $group.'" />');
       }
       $r->print('</p></form>');
       $r->print('<form action="'.$url.'" method="POST">
                <p>                 <p>
               <input type="hidden" name="currentpath" value="'.                <input type="hidden" name="currentpath" value="'.
       $env{'form.currentpath'}.'" />        $env{'form.currentpath'}.'" />');
                  <input type="submit" value="'.&mt('Cancel').'" />      if (defined($group)) {
                </p></form>');         $r->print("\n".'<input type="hidden" name="group" value="'.
                 $group.'" />');
       }
       $r->print("\n".'   <input type="submit" value="'.&mt('Cancel').'" />
                  </p></form>'); 
 }  }
   
 sub display_file {  sub display_file {
Line 226  sub display_file { Line 280  sub display_file {
 }  }
   
 sub done {  sub done {
     my ($message)=@_;      my ($message,$url,$group)=@_;
     unless (defined $message) {      unless (defined $message) {
         $message='Done';          $message='Done';
     }      }
     return ('<h3><a href="/adm/portfolio?currentpath='.      my $result = '<h3><a href="'.$url.'?currentpath='.
     $env{'form.currentpath'}.           $env{'form.currentpath'}.
     '&fieldname='.$env{'form.fieldname'}.           '&fieldname='.$env{'form.fieldname'}.
     '&mode='.$env{'form.mode'}.           '&mode='.$env{'form.mode'};
     '">'.&mt($message).'</a></h3>');      if (defined($group)) {
           $result .= '&group='.$group;
       }
       $result .= '">'.&mt($message).'</a></h3>';
       return $result;
 }  }
   
 sub delete {  sub delete {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     my @check;      my @check;
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};      my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
       my ($uname,$udom) = &get_name_dom($group);
     if (&Apache::lonnet::is_locked($file_name,$env{'user.domain'},$env{'user.name'} ) eq 'true') {      if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be deleted.<br />");          $r->print ("The file is locked and cannot be deleted.<br />");
         $r->print(&done('Back'));          $r->print(&done('Back',$url,$group));
     } else {      } else {
         if (scalar(@files)) {          if (scalar(@files)) {
             &open_form($r);              &open_form($r,$url);
             $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');              $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
             &close_form($r);              &close_form($r,$url,$group);
         } else {          } else {
             $r->print("No file was checked to delete.<br />");              $r->print("No file was checked to delete.<br />");
             $r->print(&done());              $r->print(&done(undef,$url,$group));
         }          }
     }      }
 }   } 
   
 sub delete_confirmed {  sub delete_confirmed {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');      my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;      my $result;
       my ($uname,$udom) = &get_name_dom($group);
       my $port_path = &get_port_path($group);
     foreach my $delete_file (@files) {      foreach my $delete_file (@files) {
         $result=&Apache::lonnet::removeuserfile($env{'user.name'},          $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
        $env{'user.domain'},'portfolio'.  
        $env{'form.currentpath'}.         $env{'form.currentpath'}.
        $delete_file);         $delete_file);
         if ($result ne 'ok') {          if ($result ne 'ok') {
Line 272  sub delete_confirmed { Line 331  sub delete_confirmed {
   ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');    ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');
         }          }
     }      }
     $r->print(&done());      $r->print(&done(undef,$url,$group));
 }  }
   
 sub delete_dir {  sub delete_dir {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     &open_form($r);      &open_form($r,$url);
     $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');      $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
     &close_form($r);      &close_form($r,$url,$group);
 }   } 
   
 sub delete_dir_confirmed {  sub delete_dir_confirmed {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     my $directory_name = $env{'form.currentpath'};      my $directory_name = $env{'form.currentpath'};
     $directory_name =~ s|/$||; # remove any trailing slash      $directory_name =~ s|/$||; # remove any trailing slash
     my $result=&Apache::lonnet::removeuserfile($env{'user.name'},      my ($uname,$udom) = &get_name_dom($group);
        $env{'user.domain'},'portfolio'.      my $namespace = &get_namespace($group);
       my $port_path = &get_port_path($group);
       my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
        $directory_name);         $directory_name);
                 
     if ($result ne 'ok') {      if ($result ne 'ok') {
Line 296  sub delete_dir_confirmed { Line 357  sub delete_dir_confirmed {
     } else {      } else {
         # now remove from recent          # now remove from recent
 #        $r->print('<br /> removing '.$directory_name.'<br /');  #        $r->print('<br /> removing '.$directory_name.'<br /');
         &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);          &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
         my @dirs = split m!/!, $directory_name;          my @dirs = split m!/!, $directory_name;
                   
 #        $directory_name =~ m/^(\/*\/)(\/*.)$/;  #        $directory_name =~ m/^(\/*\/)(\/*.)$/;
Line 306  sub delete_dir_confirmed { Line 367  sub delete_dir_confirmed {
         }          }
         $env{'form.currentpath'} = $directory_name;          $env{'form.currentpath'} = $directory_name;
     }      }
     $r->print(&done());      $r->print(&done(undef,$url,$group));
 }  }
   
 sub rename {  sub rename {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     my $file_name = $env{'form.currentpath'}.$env{'form.rename'};      my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
     if (&Apache::lonnet::is_locked($file_name,$env{'user.domain'},$env{'user.name'}) eq 'true') {      my ($uname,$udom) = &get_name_dom($group);
       if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be renamed.<br />");          $r->print ("The file is locked and cannot be renamed.<br />");
         $r->print(&done());          $r->print(&done(undef,$url,$group));
     } else {      } else {
         &open_form($r);          &open_form($r,$url);
         $r->print('<p>'.&mt('Rename').' '.&display_file().' to           $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
                    <input name="filenewname" type="input" size="50" />?</p>');                     <input name="filenewname" type="input" size="50" />?</p>');
         &close_form($r);          &close_form($r,$url,$group);
     }      }
 }  }
   
 sub rename_confirmed {  sub rename_confirmed {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});      my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
       my ($uname,$udom) = &get_name_dom($group);
       my $port_path = &get_port_path($group);
     if ($filenewname eq '') {      if ($filenewname eq '') {
  $r->print('<font color="red">'.   $r->print('<font color="red">'.
   &mt("Error: no valid filename was provided to rename to.").    &mt("Error: no valid filename was provided to rename to.").
   '</font><br />');    '</font><br />');
  $r->print(&done());   $r->print(&done(undef,$url,$group));
  return;   return;
     }       } 
     my $result=      my $result=
  &Apache::lonnet::renameuserfile($env{'user.name'},$env{'user.domain'},   &Apache::lonnet::renameuserfile($uname,$udom,
             'portfolio'.$env{'form.currentpath'}.$env{'form.selectfile'},              $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
             'portfolio'.$env{'form.currentpath'}.$filenewname);              $port_path.$env{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<font color="red"> An errror occured ('.$result.   $r->print('<font color="red"> An errror occured ('.$result.
   ') while trying to rename '.&display_file().' to '.    ') while trying to rename '.&display_file().' to '.
Line 345  sub rename_confirmed { Line 409  sub rename_confirmed {
     if ($filenewname ne $env{'form.filenewname'}) {      if ($filenewname ne $env{'form.filenewname'}) {
         $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");          $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
     }      }
     $r->print(&done());      $r->print(&done(undef,$url,$group));
 }  }
 sub select_files {  sub select_files {
     my ($r)=@_;      my ($r,$group)=@_;
     if ($env{'form.continue'} eq 'true') {      if ($env{'form.continue'} eq 'true') {
         # here we update the selections for the currentpath          # here we update the selections for the currentpath
         # eventually, have to handle removing those not checked, but . . .           # eventually, have to handle removing those not checked, but . . . 
Line 387  ENDSMP Line 451  ENDSMP
 ENDSMP  ENDSMP
     $r->print($javascript);      $r->print($javascript);
     $r->print("<h1>Select portfolio files</h1>      $r->print("<h1>Select portfolio files</h1>
                 Check as many as you wish in response to the essay problem.<br />");                  Check as many as you wish in response to the problem.<br />");
     $r->print("<strong>Files selected from other directories:</strong><br />");      my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
     foreach (&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'})) {      if (@otherfiles) {
         $r->print($_."<br />");   $r->print("<strong>Files selected from other directories:</strong><br />");
    foreach my $file (@otherfiles) {
       $r->print($file."<br />");
    }
     }      }
 }  }
 sub upload {  sub upload {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     my $fname=$env{'form.uploaddoc.filename'};      my $fname=$env{'form.uploaddoc.filename'};
     my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)      my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $disk_quota = 20000; # expressed in k      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'},  
  $env{'user.name'}).      my $portfolio_root=&get_portfolio_root($group);
  '/userfiles/portfolio';      my ($uname,$udom) = &get_name_dom($group);
       my $port_path = &get_port_path($group);
     # Fixme --- Move the checking for existing file to LOND error return      # Fixme --- Move the checking for existing file to LOND error return
     my @dir_list=&Apache::lonnet::dirlist($env{'form.currentpath'},      my @dir_list=&get_dir_list($portfolio_root,$group);
   $env{'user.domain'},  
   $env{'user.name'},$portfolio_root);  
     my $found_file = 0;      my $found_file = 0;
     my $locked_file = 0;      my $locked_file = 0;
     foreach my $line (@dir_list) {      foreach my $line (@dir_list) {
         my ($file_name)=split(/\&/,$line,2);          my ($file_name)=split(/\&/,$line,2);
         if ($file_name eq $fname){          if ($file_name eq $fname){
             $found_file = 1;              $found_file = 1;
             if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$env{'user.domain'},$env{'user.name'} ) eq 'true') {              if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$udom,$uname) eq 'true') {
                 $locked_file = 1;                  $locked_file = 1;
             }               } 
         }          }
     }      }
     my $current_disk_usage = &Apache::lonnet::diskusage($env{'user.domain'}, $env{'user.name'},$portfolio_root);      my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
     if (($current_disk_usage + $filesize) > $disk_quota){      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.'.          $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.');                    '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
         $r->print(&done('Back'));          $r->print(&done('Back',$url,$group));
     }       } 
     elsif ($found_file){      elsif ($found_file){
         if ($locked_file){          if ($locked_file){
             $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>portfolio'.$env{'form.currentpath'}.'</strong></font>'.              $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.
                   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');                    '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
             $r->print(&done('Back'));                    $r->print(&done('Back',$url,$group));      
         } else {             } else {   
             $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>portfolio'.$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>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.
                   '<br />To upload, rename or delete existing '.$fname.' in portfolio'.$env{'form.currentpath'});                    '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
             $r->print(&done('Back'));              $r->print(&done('Back',$url,$group));
         }          }
     } else {      } else {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',          my $result=&Apache::lonnet::userfileupload('uploaddoc','',
          'portfolio'.$env{'form.currentpath'});           $port_path.$env{'form.currentpath'});
         if ($result !~ m|^/uploaded/|) {          if ($result !~ m|^/uploaded/|) {
             $r->print('<font color="red"> An errror occured ('.$result.              $r->print('<font color="red"> An errror occured ('.$result.
               ') while trying to upload '.&display_file().'</font><br />');                ') while trying to upload '.&display_file().'</font><br />');
     $r->print(&done('Back'));      $r->print(&done('Back',$url,$group));
         } else {          } else {
             $r->print(&done());              $r->print(&done(undef,$url,$group));
         }          }
     }      }
 }  }
 sub lock_info {  sub lock_info {
     my ($r) = @_;      my ($r,$url,$group) = @_;
     my %current_permissions = &Apache::lonnet::dump('file_permissions',$env{'user.domain'},$env{'user.name'});      my ($uname,$udom) = &get_name_dom($group);
       my %current_permissions = &Apache::lonnet::dump('file_permissions',$udom,$uname);
     my $file_name = $env{'form.lockinfo'};      my $file_name = $env{'form.lockinfo'};
     foreach my $key(keys(%current_permissions)) {      foreach my $key(keys(%current_permissions)) {
         if ($file_name eq $key) {          if ($file_name eq $key) {
Line 463  sub lock_info { Line 530  sub lock_info {
             }              }
         }              }    
     }      }
     $r->print(&done('Back'));      $r->print(&done('Back',$url,$group));
     return 'ok';      return 'ok';
 }  }
 sub createdir {  sub createdir {
     my ($r)=@_;      my ($r,$url,$group)=@_;
     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 directory name was provided.").        &mt("Error: no directory name was provided.").
       '</font><br />');        '</font><br />');
     $r->print(&done());      $r->print(&done(undef,$url,$group));
     return;      return;
     }       }
     my $portfolio_root = &Apache::loncommon::propath($env{'user.domain'},      my $portfolio_root = &get_portfolio_root($group); 
  $env{'user.name'}).      my @dir_list=&get_dir_list($portfolio_root,$group);
  '/userfiles/portfolio';  
     my @dir_list=&Apache::lonnet::dirlist($env{'form.currentpath'},  
   $env{'user.domain'},  
   $env{'user.name'},$portfolio_root);  
     my $found_file = 0;      my $found_file = 0;
     foreach my $line (@dir_list) {      foreach my $line (@dir_list) {
         my ($filename)=split(/\&/,$line,2);          my ($filename)=split(/\&/,$line,2);
Line 493  sub createdir { Line 556  sub createdir {
        $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.         $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 />');                 ' </strong>a file or directory by that name already exists.</font><br />');
     } else {      } else {
         my $result=&Apache::lonnet::mkdiruserfile($env{'user.name'},          my ($uname,$udom) = &get_name_dom($group);
          $env{'user.domain'},'portfolio'.$env{'form.currentpath'}.$newdir);          my $port_path = &get_port_path($group);
           my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
            $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {          if ($result ne 'ok') {
        $r->print('<font color="red"> An errror occured ('.$result.         $r->print('<font color="red"> An errror occured ('.$result.
           ') while trying to create a new directory '.&display_file().'</font><br />');            ') while trying to create a new directory '.&display_file().'</font><br />');
Line 503  sub createdir { Line 568  sub createdir {
     if ($newdir ne $env{'form.newdir'}) {      if ($newdir ne $env{'form.newdir'}) {
         $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");            $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");  
     }      }
     $r->print(&done());      $r->print(&done(undef,$url,$group));
   }
   
   sub get_portfolio_root {
       my ($group) = @_;
       my ($portfolio_root,$udom,$uname,$path);
       ($uname,$udom) = &get_name_dom($group);
       if (defined($group)) {
           $path = '/userfiles/groups/'.$group.'/portfolio';
       } else {
           $path = '/userfiles/portfolio';
       }
       return (&Apache::loncommon::propath($udom,$uname).$path);
   }
   
   sub get_dir_list {
       my ($portfolio_root,$group) = @_;
       my ($uname,$udom) = &get_name_dom($group);
       return &Apache::lonnet::dirlist($env{'form.currentpath'},
                                             $udom,$uname,$portfolio_root);
   }
   
   sub get_name_dom {
       my ($group) = @_;
       my ($uname,$udom);
       if (defined($group)) {
           $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
           $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
       } else {
           $udom = $env{'user.domain'};
           $uname = $env{'user.name'};
       }
       return ($uname,$udom);
   }
   
   sub get_namespace {
       my ($group) = @_;
       my $namespace = 'portfolio';
       if (defined($group)) {
           my ($uname,$udom) = &get_name_dom($group);
           $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
       }
       return $namespace;
   }
   
   sub get_port_path {
       my ($group) = @_;
       my $port_path;
       if (defined($group)) {
          $port_path = "groups/$group/portfolio";
       } else {
          $port_path = 'portfolio';
       }
       return $port_path;
 }  }
   
 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::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['selectfile','currentpath','meta','lockinfo',           ['selectfile','currentpath','meta','lockinfo','currentfile',
      'currentfile','action','fieldname','mode','rename','continue']);      'action','fieldname','mode','rename','continue','group']);
       my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
       if ($r->uri =~ m|^(/adm/)([^/]+)|) {
           $url = $1.$2;
           $caller = $2;
       }
       if ($caller eq 'coursegrp_portfolio') {
       #  Needs to be in a course
           if (! ($env{'request.course.fn'})) {
           # Not in a course
               $env{'user.error.msg'}=
        "/adm/coursegrp_portfolio:rgf:0:0:Cannot view group portfolio";
               return HTTP_NOT_ACCEPTABLE;
           }
           my $earlyout = 0;
           my $view_permission = &Apache::lonnet::allowed('vcg',
                                                   $env{'request.course.id'});
           $group = $env{'form.group'};
           $group =~ s/\W//g;
           if ($group) {
               ($uname,$udom) = &get_name_dom($group);
               my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
          $group); 
               if (%curr_groups) {
                   if (($view_permission) || (&Apache::lonnet::allowed('rgf',
                                         $env{'request.course.id'}.'/'.$group))) {
                       $portfolio_root = &get_portfolio_root($group);
                   } else {
                       $r->print('You do not have the privileges required to access the shared files space for this group');
                       $earlyout = 1;
                   }
               } else {
                   $r->print('Not a valid group for this course');
                   $earlyout = 1;
               }
               $title = &mt('Group files').' for '.$group; 
           } else {
               $r->print('Invalid group');
               $earlyout = 1;
           }
           if ($earlyout) { return OK; }
       } else {
           ($uname,$udom) = &get_name_dom();
           $portfolio_root = &get_portfolio_root();
           $title = &mt('Portfolio Manager');
       }
   
     &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;
     # Give the LON-CAPA page header      # Give the LON-CAPA page header
     my $html=&Apache::lonxml::xmlbegin();  
     $r->print($html.'<head><title>'.  
               &mt('Portfolio Manager').  
               "</title></head>\n");  
     if ($env{"form.mode"} eq 'selectfile'){      if ($env{"form.mode"} eq 'selectfile'){
         $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));          $r->print(&Apache::loncommon::start_page($title,undef,
    {'only_body' => 1}));
     } else {      } else {
         $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));          $r->print(&Apache::loncommon::start_page($title));
     }      }
     $r->rflush();      $r->rflush();
  if (($env{'form.storeupl'} eq 'Upload') & (!$env{'form.uploaddoc.filename'})){   if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
        $r->print('<font color="red"> No file was selected to upload.'.         $r->print('<font color="red"> No file was selected to upload.'.
                'To upload a file, click <strong>Browse...</strong>'.                 'To upload a file, click <strong>Browse...</strong>'.
                ', select a file, then click <strong>Upload</strong>,</font>');                 ', select a file, then click <strong>Upload</strong>,</font>');
  }   }
     if ($env{'form.meta'}) {      if ($env{'form.meta'}) {
         &open_form($r);          &open_form($r,$url);
 #        $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));  #        $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
         $r->print('Edit the meta data<br />');          $r->print('Edit the meta data<br />');
         &close_form($r);          &close_form($r,$url,$group);
     }      }
     if ($env{'form.store'}) {      if ($env{'form.store'}) {
     }      }
   
     if ($env{'form.uploaddoc.filename'}) {      if ($env{'form.uploaddoc.filename'}) {
  &upload($r);   &upload($r,$url,$group);
     } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
  &delete_confirmed($r);   &delete_confirmed($r,$url,$group);
     } elsif ($env{'form.action'} eq 'delete') {      } elsif ($env{'form.action'} eq 'delete') {
  &delete($r);   &delete($r,$url,$group);
     } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
  &delete_dir_confirmed($r);   &delete_dir_confirmed($r,$url,$group);
     } elsif ($env{'form.action'} eq 'deletedir'){      } elsif ($env{'form.action'} eq 'deletedir'){
  &delete_dir($r);   &delete_dir($r,$url,$group);
     } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
  &rename_confirmed($r);   &rename_confirmed($r,$url,$group);
     } elsif ($env{'form.rename'}) {      } elsif ($env{'form.rename'}) {
         $env{'form.selectfile'} = $env{'form.rename'};          $env{'form.selectfile'} = $env{'form.rename'};
         $env{'form.action'} = 'rename';          $env{'form.action'} = 'rename';
  &rename($r);   &rename($r,$url,$group);
     } elsif ($env{'form.createdir'}) {      } elsif ($env{'form.createdir'}) {
  &createdir($r);   &createdir($r,$url,$group);
     } elsif ($env{'form.lockinfo'}) {      } elsif ($env{'form.lockinfo'}) {
         &lock_info($r);          &lock_info($r,$url,$group);
     } else {      } else {
  my $current_path='/';   my $current_path='/';
  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,          my @dir_list=&get_dir_list($portfolio_root,$group);
     $env{'user.domain'},  
     $env{'user.name'},$portfolio_root);  
  if ($dir_list[0] eq 'no_such_dir'){   if ($dir_list[0] eq 'no_such_dir'){
     # two main reasons for this:      # two main reasons for this:
             #    1) never been here, so directory structure not created              #    1) never been here, so directory structure not created
     #    2) back-button navigation after deleting a directory      #    2) back-button navigation after deleting a directory
     if ($current_path eq '/'){      if ($current_path eq '/'){
         &Apache::lonnet::mkdiruserfile($env{'user.name'},          &Apache::lonnet::mkdiruserfile($uname,$udom,
        $env{'user.domain'},'portfolio');         &get_port_path($group));
     } else {      } else {
                 # some directory that snuck in get rid of the directory                  # some directory that snuck in get rid of the directory
                 # from the recent pulldown, just in case                  # from the recent pulldown, just in case
Line 587  sub handler { Line 743  sub handler {
     }      }
     # now grab the directory list again, for the first time      # now grab the directory list again, for the first time
     @dir_list=&Apache::lonnet::dirlist($current_path,      @dir_list=&Apache::lonnet::dirlist($current_path,
     $env{'user.domain'},      $udom,$uname,$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_common($r,$current_path,$is_empty,\@dir_list);   &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group);
         &display_directory($r,$current_path,$is_empty,\@dir_list);          &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group);
  $r->print("</body>\n</html>\n");   $r->print(&Apache::loncommon::end_page());
  return OK;  
     }      }
       return OK;
 }  }
 1;  1;
 __END__  __END__
Removed from v.1.87  
changed lines
  Added in v.1.100

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