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

Diff for /loncom/interface/portfolio.pm between versions 1.134 and 1.136

version 1.134, 2006/07/18 01:25:43 version 1.136, 2006/07/19 11:43:47
Line 44  use LONCAPA; Line 44  use LONCAPA;
 # 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 ($url, $filename, $current_path, $current_mode, $field_name,      my ($url, $filename, $current_path, $current_mode, $field_name,
         $continue_select,$group) = @_;          $continue_select,$group,$refarg) = @_;
     if ($continue_select ne 'true') {$continue_select = 'false'};      if ($continue_select ne 'true') {$continue_select = 'false'};
     my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&amp;currentpath='.$current_path.'&amp;mode='.$current_mode.'&amp;continue='.$continue_select.'&amp;fieldname='.$field_name;      my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&amp;currentpath='.$current_path.'&amp;mode='.$current_mode.'&amp;continue='.$continue_select.'&amp;fieldname='.$field_name;
     if (defined($group)) {      if (defined($group)) {
         $anchor .= '&amp;group='.$group;          $anchor .= '&amp;group='.$group;
           if ($refarg ne '') {
               $anchor .= '&amp;'.$refarg;
           }
     }      }
     $anchor .= '">'.$filename.'</a>';      $anchor .= '">'.$filename.'</a>';
     return $anchor;      return $anchor;
 }  }
 my $dirptr=16384;  my $dirptr=16384;
 sub display_common {  sub display_common {
     my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload)=@_;      my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,$refarg)=@_;
     my $namespace = &get_namespace($group);      my $namespace = &get_namespace($group);
     my $port_path = &get_port_path($group);      my $port_path = &get_port_path($group);
     if ($can_upload) {      if ($can_upload) {
         my $groupitem;          my $groupitem;
         if (defined($group)) {          if (defined($group)) {
             $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';              $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
               if (exists($env{'form.ref'})) {
                   $groupitem .= '<input type="hidden" name="ref" value="'.
                                 $env{'form.ref'}.'" />';
               }
         }           } 
         my $iconpath= $r->dir_config('lonIconsURL') . "/";          my $iconpath= $r->dir_config('lonIconsURL') . "/";
         my %text=&Apache::lonlocal::texthash(          my %text=&Apache::lonlocal::texthash(
Line 109  sub display_common { Line 116  sub display_common {
 TABLE  TABLE
     }      }
     my @tree = split (/\//,$current_path);      my @tree = split (/\//,$current_path);
     $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');      $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group,$refarg).'/');
     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($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');              $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group,$refarg).'/');
         }          }
     }      }
     $r->print('</span>');      $r->print('</span>');
Line 122  TABLE Line 129  TABLE
     $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"});      $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"});
     if (defined($group)) {      if (defined($group)) {
         $r->print('&amp;group='.$group);          $r->print('&amp;group='.$group);
           if ($refarg ne '') {
               $r->print('&amp;'.$refarg);
           }
     }      }
     $r->print('">'.      $r->print('">'.
       &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',        &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
Line 129  TABLE Line 139  TABLE
     $r->print("</form>");      $r->print("</form>");
 }  }
 sub display_directory_line {  sub display_directory_line {
     my ($r,$select_mode,$fullpath, $css_class, $line, $access_controls,       my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, $access_controls, $curr_access,
             $now, $version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text)=@_;              $now, $version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text)=@_;
     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); 
  $r->print('<tr class="'.$css_class.'">');   $r->print('<tr class="'.$css_class.'">');
  $r->print($line);   $r->print($line);
  my $curr_access;  
  if ($select_mode ne 'true') {  
     my $pub_access = 0;  
     my $guest_access = 0;  
     my $cond_access = 0;  
     foreach my $key (sort(keys(%{$$access_controls{$fullpath}}))) {  
  my ($num,$scope,$end,$start) = &unpack_acc_key($key);  
  if (($now > $start) && (!$end || $end > $now)) {  
     if ($scope eq 'public')  {  
  $pub_access = 1;  
     } elsif ($scope eq 'guest') {  
  $guest_access = 1;  
     } else {  
  $cond_access = 1;  
     }  
  }  
     }  
     if (!$pub_access && !$guest_access && !$cond_access) {  
  $curr_access = &mt('Private');  
     } else {  
  my @allaccesses;   
  if ($pub_access) {  
     push(@allaccesses,&mt('Public'));  
  }  
  if ($guest_access) {  
     push(@allaccesses,&mt('Passphrase-protected'));  
  }  
  if ($cond_access) {  
     push(@allaccesses,&mt('Conditional'));  
  }  
  $curr_access = join('+ ',@allaccesses);  
     }  
  }  
  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');   $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
  $r->print('<td>'.$$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.   $r->print('<td>'.$$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
   $filename.'</a></td>');     $filename.'</a></td>'); 
Line 183  sub display_directory_line { Line 160  sub display_directory_line {
 }  }
 sub display_directory {  sub display_directory {
     my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,      my ($r,$url,$current_path,$is_empty,$dir_list,$group,$can_upload,
         $can_modify,$can_delete,$can_setacl)=@_;          $can_modify,$can_delete,$can_setacl,$refarg)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";      my $iconpath= $r->dir_config('lonIconsURL') . "/";
     my ($groupitem,$groupecho);      my ($groupitem,$groupecho);
     my $display_out;      my $display_out;
Line 196  sub display_directory { Line 173  sub display_directory {
         $access_admin_text = &mt('View/Change Status');          $access_admin_text = &mt('View/Change Status');
     }      }
     if ((defined($group)) && (defined($env{'request.course.id'}))) {      if ((defined($group)) && (defined($env{'request.course.id'}))) {
        $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';          $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
        $groupecho = '&amp;group='.$group;         $groupecho = '&amp;group='.$group;
          if ($refarg ne '') {
              $groupecho .= '&amp;'.$refarg;
          }
          if (exists($env{'form.ref'})) {
              $groupitem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />';
          } 
     }      }
   
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,      my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
Line 282  sub display_directory { Line 265  sub display_directory {
                 }                  }
  $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');   $r->print('<tr class="LC_browser_folder"><td '.$colspan.'><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_closed.gif" /></td>');
                 $r->print('<td>Go to ...</td>');                  $r->print('<td>Go to ...</td>');
                 $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>');                   $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group,$refarg).'/</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
  my $css_class = 'LC_browser_file';   my $css_class = 'LC_browser_file';
Line 317  sub display_directory { Line 300  sub display_directory {
                         $line .= '</td>';                          $line .= '</td>';
                     }                      }
                 }                  }
 #                &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls,   
 #                        $now, \%version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text);  
  $r->print('<tr class="'.$css_class.'">');  
  $r->print($line);  
  my $curr_access;   my $curr_access;
  if ($select_mode ne 'true') {   if ($select_mode ne 'true') {
     my $pub_access = 0;      my $pub_access = 0;
Line 354  sub display_directory { Line 333  sub display_directory {
  $curr_access = join('+ ',@allaccesses);   $curr_access = join('+ ',@allaccesses);
     }      }
  }   }
  $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');                  &display_directory_line($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class, $line, \%access_controls, $curr_access,
  $r->print('<td>'.$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.                          $now, \%version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text);
   $filename.'</a></td>');   # $r->print('<tr class="'.$css_class.'">');
  $r->print('<td>'.$size.'</td>');  # $r->print($line);
  $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');  # $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
  if ($select_mode ne 'true') {  # $r->print('<td>'.$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
     $r->print('<td><span style="white-space: nowrap">'.  #  $filename.'</a></td>'); 
       &mt($curr_access).'&nbsp;&nbsp;&nbsp;');  # $r->print('<td>'.$size.'</td>');
     $r->print('<a href="'.$url.'?access='.$filename.  # $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
       '&amp;currentpath='.$current_path.$groupecho.  # if ($select_mode ne 'true') {
       '">'.$access_admin_text.'</a></span></td>');  #    $r->print('<td><span style="white-space: nowrap">'.
  }  #      &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
  $r->print('</tr>'.$/);  #    $r->print('<a href="'.$url.'?access='.$filename.
   #      '&amp;currentpath='.$current_path.$groupecho.
   #      '">'.$access_admin_text.'</a></span></td>');
   # }
   # $r->print('</tr>'.$/);
  if ($show_versions) {   if ($show_versions) {
           &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, 
                           $now, \%version_flag, $href_location, $url, $current_path, $groupecho, $access_admin_text);
   
  }   }
             }              }
         }          }
Line 422  sub close_form { Line 407  sub close_form {
     if (defined($group)) {      if (defined($group)) {
        $r->print("\n".'<input type="hidden" name="group" value="'.         $r->print("\n".'<input type="hidden" name="group" value="'.
               $group.'" />');                $group.'" />');
          if (exists($env{'form.ref'})) {
              $r->print("\n".'<input type="hidden" name="ref" value="'.
                        $env{'form.ref'}.'" />');
          }
     }      }
     $r->print('</p></form>');      $r->print('</p></form>');
     $r->print('<form action="'.$url.'" method="post">      $r->print('<form action="'.$url.'" method="post">
Line 430  sub close_form { Line 419  sub close_form {
       $env{'form.currentpath'}.'" />');        $env{'form.currentpath'}.'" />');
     if (defined($group)) {      if (defined($group)) {
        $r->print("\n".'<input type="hidden" name="group" value="'.         $r->print("\n".'<input type="hidden" name="group" value="'.
               $group.'" />');                   $group.'" />');
          if (exists($env{'form.ref'})) {
              $r->print("\n".'<input type="hidden" name="ref" value="'.
                        $env{'form.ref'}.'" />');
          }
     }      }
     $r->print("\n".'   <input type="submit" value="'.$button_text->{'cancel'}.'" />      $r->print("\n".'   <input type="submit" value="'.$button_text->{'cancel'}.'" />
                </p></form>');                  </p></form>'); 
Line 458  sub display_file { Line 451  sub display_file {
 }  }
   
 sub done {  sub done {
     my ($message,$url,$group)=@_;      my ($message,$url,$group,$refarg)=@_;
     unless (defined $message) {      unless (defined $message) {
         $message='Done';          $message='Done';
     }      }
Line 467  sub done { Line 460  sub done {
          '&fieldname='.$env{'form.fieldname'}.           '&fieldname='.$env{'form.fieldname'}.
          '&mode='.$env{'form.mode'};           '&mode='.$env{'form.mode'};
     if (defined($group)) {      if (defined($group)) {
         $result .= '&group='.$group;          $result .= '&amp;group='.$group;
           if ($refarg ne '') {
               $result .= '&amp;'.$refarg;
           }
     }      }
     $result .= '">'.&mt($message).'</a></h3>';      $result .= '">'.&mt($message).'</a></h3>';
     return $result;      return $result;
 }  }
   
 sub delete {  sub delete {
     my ($r,$url,$group)=@_;      my ($r,$url,$group,$refarg)=@_;
     my @check;      my @check;
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};      my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $file_name = &prepend_group($file_name,$group);      $file_name = &prepend_group($file_name,$group);
Line 482  sub delete { Line 478  sub delete {
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) 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',$url,$group));          $r->print(&done('Back',$url,$group,$refarg));
     } else {      } else {
         if (scalar(@files)) {          if (scalar(@files)) {
             &open_form($r,$url);              &open_form($r,$url);
Line 490  sub delete { Line 486  sub delete {
             &close_form($r,$url,$group);              &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(undef,$url,$group));              $r->print(&done(undef,$url,$group,$refarg));
         }          }
     }      }
 }   } 
   
 sub delete_confirmed {  sub delete_confirmed {
     my ($r,$url,$group)=@_;      my ($r,$url,$group,$refarg)=@_;
     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 ($uname,$udom) = &get_name_dom($group);
Line 510  sub delete_confirmed { Line 506  sub delete_confirmed {
   ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');    ') while trying to delete '.&display_file(undef, $delete_file).'</span><br />');
         }          }
     }      }
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group,$refarg));
 }  }
   
 sub delete_dir {  sub delete_dir {
Line 521  sub delete_dir { Line 517  sub delete_dir {
 }   } 
   
 sub delete_dir_confirmed {  sub delete_dir_confirmed {
     my ($r,$url,$group)=@_;      my ($r,$url,$group,$refarg)=@_;
     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 ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
Line 546  sub delete_dir_confirmed { Line 542  sub delete_dir_confirmed {
         }          }
         $env{'form.currentpath'} = $directory_name;          $env{'form.currentpath'} = $directory_name;
     }      }
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group,$refarg));
 }  }
   
 sub rename {  sub rename {
     my ($r,$url,$group)=@_;      my ($r,$url,$group,$refarg)=@_;
     my $file_name = $env{'form.currentpath'}.$env{'form.rename'};      my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     $file_name = &prepend_group($file_name,$group);      $file_name = &prepend_group($file_name,$group);
     if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {      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(undef,$url,$group));          $r->print(&done(undef,$url,$group,$refarg));
     } else {      } else {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print('<p>'.&mt('Rename').' '.&display_file().' to           $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
Line 566  sub rename { Line 562  sub rename {
 }  }
   
 sub rename_confirmed {  sub rename_confirmed {
     my ($r,$url,$group)=@_;      my ($r,$url,$group,$refarg)=@_;
     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 ($uname,$udom) = &get_name_dom($group);
     my $port_path = &get_port_path($group);      my $port_path = &get_port_path($group);
Line 574  sub rename_confirmed { Line 570  sub rename_confirmed {
  $r->print('<span class="LC_error">'.   $r->print('<span class="LC_error">'.
   &mt("Error: no valid filename was provided to rename to.").    &mt("Error: no valid filename was provided to rename to.").
   '</span><br />');    '</span><br />');
  $r->print(&done(undef,$url,$group));   $r->print(&done(undef,$url,$group,$refarg));
  return;   return;
     }       } 
     my $result=      my $result=
Line 592  sub rename_confirmed { Line 588  sub rename_confirmed {
       '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',        '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',
       '<strong>'.&display_file('',$filenewname).'</strong>'));        '<strong>'.&display_file('',$filenewname).'</strong>'));
     }      }
     $r->print(&done(undef,$url,$group));      $r->print(&done(undef,$url,$group,$refarg));
 }  }
   
 sub display_access {  sub display_access {
     my ($r,$url,$group,$can_setacl,$port_path) = @_;      my ($r,$url,$group,$can_setacl,$port_path,$refarg) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};      my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name,$group);      $file_name = &prepend_group($file_name,$group);
Line 621  sub display_access { Line 617  sub display_access {
             $r->print($info);              $r->print($info);
         }          }
         &view_access_settings($r,$url,$group,$access_controls{$file_name},          &view_access_settings($r,$url,$group,$access_controls{$file_name},
                               $aclcount);                                $aclcount,$refarg);
     }      }
 }  }
   
 sub view_access_settings {  sub view_access_settings {
     my ($r,$url,$group,$access_controls,$aclcount) = @_;      my ($r,$url,$group,$access_controls,$aclcount,$refarg) = @_;
     my ($showstart,$showend);      my ($showstart,$showend);
     my %todisplay;      my %todisplay;
     foreach my $key (sort(keys(%{$access_controls}))) {      foreach my $key (sort(keys(%{$access_controls}))) {
Line 650  sub view_access_settings { Line 646  sub view_access_settings {
     my $group_arg;      my $group_arg;
     if ($group) {      if ($group) {
         $group_arg = '&amp;group='.$group;          $group_arg = '&amp;group='.$group;
           if ($refarg ne '') {
               $group_arg .= '&amp;'.$refarg;
           }
     }      }
     $r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.      $r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
               $group_arg.'">'.&mt('Return to directory listing').'</a>');                $group_arg.'">'.&mt('Return to directory listing').'</a>');
Line 760  sub build_access_summary { Line 759  sub build_access_summary {
   
   
 sub update_access {  sub update_access {
     my ($r,$url,$group,$port_path) = @_;      my ($r,$url,$group,$port_path,$refarg) = @_;
     my $totalprocessed = 0;      my $totalprocessed = 0;
     my %processing;      my %processing;
     my %title  = (      my %title  = (
Line 879  sub update_access { Line 878  sub update_access {
         my $group_arg;          my $group_arg;
         if ($group) {          if ($group) {
             $group_arg = '&amp;group='.$group;              $group_arg = '&amp;group='.$group;
               if ($refarg) {
                   $group_arg .= '&amp;'.$refarg;
               }
         }          }
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.          $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
                   '&amp;currentpath='.$env{'form.currentpath'}.$group_arg.'">'.                    '&amp;currentpath='.$env{'form.currentpath'}.$group_arg.'">'.
Line 1498  ENDSMP Line 1500  ENDSMP
     }      }
 }  }
 sub upload {  sub upload {
     my ($r,$url,$group)=@_;      my ($r,$url,$group,$refarg)=@_;
     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
Line 1537  sub upload { Line 1539  sub upload {
     if (($current_disk_usage + $filesize) > $disk_quota){      if (($current_disk_usage + $filesize) > $disk_quota){
         $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.          $r->print('<span class="LC_error">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.</span>'.
                   '<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',$url,$group));          $r->print(&done('Back',$url,$group,$refarg));
     }       } 
     elsif ($found_file){      elsif ($found_file){
         if ($locked_file){          if ($locked_file){
             $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.              $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<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',$url,$group));                    $r->print(&done('Back',$url,$group,$refarg));      
         } else {             } else {   
             $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.              $r->print('<span class="LC_error">'.'Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></span>'.
                   '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});                    '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
             $r->print(&done('Back',$url,$group));              $r->print(&done('Back',$url,$group,$refarg));
         }          }
     } else {      } else {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',          my $result=&Apache::lonnet::userfileupload('uploaddoc','',
Line 1555  sub upload { Line 1557  sub upload {
         if ($result !~ m|^/uploaded/|) {          if ($result !~ m|^/uploaded/|) {
             $r->print('<span class="LC_error">'.'An errror occured ('.$result.              $r->print('<span class="LC_error">'.'An errror occured ('.$result.
               ') while trying to upload '.&display_file().'</span><br />');                ') while trying to upload '.&display_file().'</span><br />');
     $r->print(&done('Back',$url,$group));      $r->print(&done('Back',$url,$group,$refarg));
         } else {          } else {
             $r->print(&done(undef,$url,$group));              $r->print(&done(undef,$url,$group,$refarg));
         }          }
     }      }
 }  }
   
 sub lock_info {  sub lock_info {
     my ($r,$url,$group) = @_;      my ($r,$url,$group,$refarg) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,      my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                        $uname);                                                                         $uname);
Line 1591  sub lock_info { Line 1593  sub lock_info {
             }              }
         }          }
     }      }
     $r->print(&done('Back',$url,$group));      $r->print(&done('Back',$url,$group,$refarg));
     return 'ok';      return 'ok';
 }  }
 sub createdir {  sub createdir {
     my ($r,$url,$group)=@_;      my ($r,$url,$group,$refarg)=@_;
     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('<span class="LC_error">'.      $r->print('<span class="LC_error">'.
Line 1629  sub createdir { Line 1631  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(undef,$url,$group));      $r->print(&done(undef,$url,$group,$refarg));
 }  }
   
 sub get_portfolio_root {  sub get_portfolio_root {
Line 1711  sub get_port_path { Line 1713  sub get_port_path {
 }  }
   
 sub missing_priv {  sub missing_priv {
     my ($r,$url,$priv,$group) = @_;      my ($r,$url,$priv,$group,$refarg) = @_;
     my $longtext = {      my $longtext = {
                       upload => 'upload files',                        upload => 'upload files',
                       delete => 'delete files',                        delete => 'delete files',
Line 1731  sub missing_priv { Line 1733  sub missing_priv {
                   $longtext->{$priv}));                    $longtext->{$priv}));
     if ($group) {      if ($group) {
         $r->print(&mt("in the group's file repository."));          $r->print(&mt("in the group's file repository."));
         $rtnlink .= '&group='.$group;          $rtnlink .= '&amp;group='.$group;
           if ($refarg ne '') {
               $rtnlink .= '&amp;'.$refarg;
           }
     } else {      } else {
         $r->print(&mt('in this portfolio.'));          $r->print(&mt('in this portfolio.'));
     }      }
Line 1742  sub missing_priv { Line 1747  sub missing_priv {
 }  }
   
 sub coursegrp_portfolio_header {  sub coursegrp_portfolio_header {
     my ($cdom,$cnum,$group,$grp_desc)=@_;      my ($cdom,$cnum,$group,$grp_desc,$refarg)=@_;
     my $gpterm  = &Apache::loncommon::group_term();      my $gpterm  = &Apache::loncommon::group_term();
     my $ucgpterm = $gpterm;      my $ucgpterm = $gpterm;
     $ucgpterm =~ s/^(\w)/uc($1)/e;      $ucgpterm =~ s/^(\w)/uc($1)/e;
       if ($refarg) {
           &Apache::lonhtmlcommon::add_breadcrumb
               ({href=>"/adm/coursegroups",
                 text=>"Groups",
                 title=>"Course Groups"});
       }
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/$cdom/$cnum/$group/smppg",          ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
           text=>"$ucgpterm: $grp_desc",            text=>"$ucgpterm: $grp_desc",
           title=>"Go to group's home page"},            title=>"Go to group's home page"},
          {href=>"//?group=$group",           {href=>"/adm/coursegrp_portfolio?group=$group&amp;$refarg",
           text=>"Group Portfolio",            text=>"Group Portfolio",
           title=>"Display group portfolio"},);            title=>"Display group portfolio"});
     my $output = &Apache::lonhtmlcommon::breadcrumbs(      my $output = &Apache::lonhtmlcommon::breadcrumbs(
                          &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));                           &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
     return $output;      return $output;
Line 1765  sub handler { Line 1776  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',           ['selectfile','currentpath','meta','lockinfo','currentfile','action',
   'fieldname','mode','rename','continue','group','access','setnum',    'fieldname','mode','rename','continue','group','access','setnum',
           'cnum','cdom','type','setroles','showversions']);            'cnum','cdom','type','setroles','showversions','ref']);
     my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);      my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {      if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;          $url = $1.$2;
         $caller = $2;          $caller = $2;
     }      }
     my ($can_modify,$can_delete,$can_upload,$can_setacl);      my ($can_modify,$can_delete,$can_upload,$can_setacl,$refarg);
     if ($caller eq 'coursegrp_portfolio') {      if ($caller eq 'coursegrp_portfolio') {
     #  Needs to be in a course      #  Needs to be in a course
         if (! ($env{'request.course.fn'})) {          if (! ($env{'request.course.fn'})) {
Line 1781  sub handler { Line 1792  sub handler {
             return HTTP_NOT_ACCEPTABLE;              return HTTP_NOT_ACCEPTABLE;
         }          }
         my $earlyout = 0;          my $earlyout = 0;
         my $view_permission = &Apache::lonnet::allowed('vcg',          my $view_permission = 
                                                 $env{'request.course.id'});             &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
         $group = $env{'form.group'};          $group = $env{'form.group'};
         $group =~ s/\W//g;          $group =~ s/\W//g;
         if ($group) {          if ($group) {
               if (exists($env{'form.ref'})) {
                   $refarg = 'ref='.$env{'form.ref'};
               }
             ($uname,$udom) = &get_name_dom($group);              ($uname,$udom) = &get_name_dom($group);
             my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,              my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
        $group);          $group); 
Line 1872  sub handler { Line 1886  sub handler {
   
     if ($env{'form.uploaddoc.filename'}) {      if ($env{'form.uploaddoc.filename'}) {
         if ($can_upload) {          if ($can_upload) {
     &upload($r,$url,$group);      &upload($r,$url,$group,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'upload',$group),              &missing_priv($r,$url,'upload',$group,$refarg),
         }          }
     } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
         if ($can_delete) {          if ($can_delete) {
     &delete_confirmed($r,$url,$group);      &delete_confirmed($r,$url,$group,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'delete',$group);              &missing_priv($r,$url,'delete',$group,$refarg);
         }          }
     } elsif ($env{'form.action'} eq 'delete') {      } elsif ($env{'form.action'} eq 'delete') {
         if ($can_delete) {          if ($can_delete) {
     &delete($r,$url,$group);      &delete($r,$url,$group,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'delete',$group);              &missing_priv($r,$url,'delete',$group,$refarg);
         }          }
     } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
         if ($can_delete) {          if ($can_delete) {
     &delete_dir_confirmed($r,$url,$group);      &delete_dir_confirmed($r,$url,$group,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'delete',$group);              &missing_priv($r,$url,'delete',$group,$refarg);
         }          }
     } elsif ($env{'form.action'} eq 'deletedir') {      } elsif ($env{'form.action'} eq 'deletedir') {
         if ($can_delete) {          if ($can_delete) {
     &delete_dir($r,$url,$group);      &delete_dir($r,$url,$group);
         } else {          } else {
             &missing_priv($r,$url,'delete',$group);              &missing_priv($r,$url,'delete',$group,$refarg);
         }          }
     } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {      } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
         if ($can_modify) {          if ($can_modify) {
     &rename_confirmed($r,$url,$group);      &rename_confirmed($r,$url,$group,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'rename',$group);              &missing_priv($r,$url,'rename',$group,$refarg);
         }          }
     } 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';
         if ($can_modify) {          if ($can_modify) {
     &rename($r,$url,$group);      &rename($r,$url,$group,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'rename',$group);              &missing_priv($r,$url,'rename',$group,$refarg);
         }          }
     } elsif ($env{'form.access'}) {      } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};          $env{'form.selectfile'} = $env{'form.access'};
         $env{'form.action'} = 'chgaccess';          $env{'form.action'} = 'chgaccess';
         &display_access($r,$url,$group,$can_setacl,$port_path);          &display_access($r,$url,$group,$can_setacl,$port_path,$refarg);
     } elsif ($env{'form.action'} eq 'chgaccess') {      } elsif ($env{'form.action'} eq 'chgaccess') {
         if ($can_setacl) {          if ($can_setacl) {
             &update_access($r,$url,$group,$port_path);              &update_access($r,$url,$group,$port_path,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'setacl',$group);              &missing_priv($r,$url,'setacl',$group,$refarg);
         }          }
     } elsif ($env{'form.action'} eq 'rolepicker') {      } elsif ($env{'form.action'} eq 'rolepicker') {
         if ($can_setacl) {           if ($can_setacl) { 
             &role_options_window($r);              &role_options_window($r);
         } else {          } else {
             &missing_priv($r,$url,'setacl',$group);              &missing_priv($r,$url,'setacl',$group,$refarg);
         }          }
     } elsif ($env{'form.createdir'}) {      } elsif ($env{'form.createdir'}) {
         if ($can_upload) {          if ($can_upload) {
     &createdir($r,$url,$group);      &createdir($r,$url,$group,$refarg);
         } else {          } else {
             &missing_priv($r,$url,'upload',$group);              &missing_priv($r,$url,'upload',$group,$refarg);
         }          }
     } elsif ($env{'form.lockinfo'}) {      } elsif ($env{'form.lockinfo'}) {
         &lock_info($r,$url,$group);          &lock_info($r,$url,$group,$refarg);
     } else {      } else {
  my $current_path='/';   my $current_path='/';
  if ($env{'form.currentpath'}) {   if ($env{'form.currentpath'}) {
Line 1945  sub handler { Line 1959  sub handler {
  }   }
         if ($caller eq 'coursegrp_portfolio') {          if ($caller eq 'coursegrp_portfolio') {
             &Apache::lonhtmlcommon::clear_breadcrumbs();              &Apache::lonhtmlcommon::clear_breadcrumbs();
             $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc));              $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc,
                                                     $refarg));
         }          }
         my @dir_list=&get_dir_list($portfolio_root,$group);          my @dir_list=&get_dir_list($portfolio_root,$group);
  if ($dir_list[0] eq 'no_such_dir'){   if ($dir_list[0] eq 'no_such_dir'){
Line 1969  sub handler { Line 1984  sub handler {
  # 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,$url,$current_path,$is_empty,\@dir_list,$group,   &display_common($r,$url,$current_path,$is_empty,\@dir_list,$group,
                         $can_upload);                          $can_upload,$refarg);
         &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,          &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,
                            $can_upload,$can_modify,$can_delete,$can_setacl);                             $can_upload,$can_modify,$can_delete,$can_setacl,
                              $refarg);
  $r->print(&Apache::loncommon::end_page());   $r->print(&Apache::loncommon::end_page());
     }      }
     return OK;      return OK;
Removed from v.1.134  
changed lines
  Added in v.1.136

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