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

Diff for /loncom/interface/portfolio.pm between versions 1.133 and 1.137

version 1.133, 2006/07/08 01:51:07 version 1.137, 2006/07/19 14:57:18
Line 40  use Apache::lonhtmlcommon; Line 40  use Apache::lonhtmlcommon;
 use HTML::Entities;  use HTML::Entities;
 use LONCAPA;  use LONCAPA;
   
   sub group_args {
       my $output;
       if (defined($env{'form.group'})) {
           $ouput .= '&group='.$env{'form.group'};
    if (defined($env{'form.ref'})) {
       $output .= '&ref='.$env{'form.ref'};
    }
       }
       return $output;
   }
   
   sub group_form_data {
       my $output;
       if (defined($env{'form.group'})) {
    $ouput = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
    if (exists($env{'form.ref'})) {
       $output .= '<input type="hidden" name="ref" value="'.
    $env{'form.ref'}.'" />';
    }
       }
   } 
   
 # 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 ($url, $filename, $current_path, $current_mode, $field_name,      my ($url, $filename, $current_path, $current_mode, $field_name,
         $continue_select,$group) = @_;          $continue_select) = @_;
     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)) {      $anchor .= &group_args()
         $anchor .= '&amp;group='.$group;  
     }  
     $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,$can_upload)=@_;
     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 = &group_form_data();
         if (defined($group)) {  
             $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';  
         }   
         my $iconpath= $r->dir_config('lonIconsURL') . "/";          my $iconpath= $r->dir_config('lonIconsURL') . "/";
         my %text=&Apache::lonlocal::texthash(          my %text=&Apache::lonlocal::texthash(
  'upload' => 'Upload',   'upload' => 'Upload',
Line 109  sub display_common { Line 127  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"}).'/');
     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"}).'/');
         }          }
     }      }
     $r->print('</span>');      $r->print('</span>');
     &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);      &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
     $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"}.&group_args());
     if (defined($group)) {  
         $r->print('&amp;group='.$group);  
     }  
     $r->print('">'.      $r->print('">'.
       &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',        &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
     'this.form.submit();'));      'this.form.submit();'));
     $r->print("</form>");      $r->print("</form>");
 }  }
   
   sub display_directory_line {
       my ($r,$select_mode,$fullpath, $filename, $mtime, $size, $css_class,
    $line, $access_controls, $curr_access, $now, $version_flag,
    $href_location, $url, $current_path, $access_admin_text)=@_;
       # 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($line);
       $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
       $r->print('<td>'.$$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
         $filename.'</a></td>'); 
       $r->print('<td>'.$size.'</td>');
       $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
       if ($select_mode ne 'true') {
    $r->print('<td><span style="white-space: nowrap">'.
     &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
    $r->print('<a href="'.$url.'?access='.$filename.
     '&amp;currentpath='.$current_path.&group_args().
     '">'.$access_admin_text.'</a></span></td>');
       }
       $r->print('</tr>'.$/);
   }
   
 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,$can_upload,
         $can_modify,$can_delete,$can_setacl)=@_;          $can_modify,$can_delete,$can_setacl)=@_;
     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;
Line 142  sub display_directory { Line 179  sub display_directory {
     if ($can_setacl) {      if ($can_setacl) {
         $access_admin_text = &mt('View/Change Status');          $access_admin_text = &mt('View/Change Status');
     }      }
     if ((defined($group)) && (defined($env{'request.course.id'}))) {  
        $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';   
        $groupecho = '&amp;group='.$group;  
     }  
   
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,      my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);                                                                          $uname);
Line 159  sub display_directory { Line 192  sub display_directory {
  $select_mode = 'true';   $select_mode = 'true';
     }       } 
     if ($is_empty && ($current_path ne '/') && $can_delete) {      if ($is_empty && ($current_path ne '/') && $can_delete) {
         $display_out = '<form method="post" action="'.$url.'">'.$groupitem.          $display_out = '<form method="post" action="'.$url.'">'.
       &group_form_data().
         '<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 178  sub display_directory { Line 212  sub display_directory {
         $r->print('<table id="LC_browser">'.          $r->print('<table id="LC_browser">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');              '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }      }
     if (defined($group)) {      $r->print("\n".&group_form_data()."\n");
         $r->print("\n".$groupitem."\n");  
     }  
     my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;      my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;      my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;      my @dir_lines;
Line 214  sub display_directory { Line 247  sub display_directory {
            $show_versions = 'true';             $show_versions = 'true';
        }         }
        if (exists($versioned{$filename})) {         if (exists($versioned{$filename})) {
            $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';             if ($show_versions) {
                       $version_flag{$filename} = '<a href="portfolio"><img alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
              } else {
                       $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
                   }
        } else {         } else {
            $version_flag{$filename} = '';             $version_flag{$filename} = '';
        }         }
Line 225  sub display_directory { Line 262  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'}).'/</td>'); 
                 $r->print('</tr>');                   $r->print('</tr>'); 
             } else {              } else {
  my $css_class = 'LC_browser_file';   my $css_class = 'LC_browser_file';
Line 240  sub display_directory { Line 277  sub display_directory {
     $line.=' /></td>';      $line.=' /></td>';
                 } else {                  } else {
                     if (exists $locked_files{$fullpath}) {                      if (exists $locked_files{$fullpath}) {
                         $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>';                          $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.&group_args().'">Locked</a></td>';
  $css_class= 'LC_browser_file_locked';   $css_class= 'LC_browser_file_locked';
                     } else {                      } else {
                         if (!$can_modify) {                          if (!$can_modify) {
Line 254  sub display_directory { Line 291  sub display_directory {
                         if ($can_modify) {                          if ($can_modify) {
                             my $cat='<img alt="'.&mt('Catalog Information').                              my $cat='<img alt="'.&mt('Catalog Information').
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';                              '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                             $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a>';                              $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.&group_args().'">Rename</a>';
                             $line .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';                              $line .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }                          }
                         $line .= '</td>';                          $line .= '</td>';
                     }                      }
                 }                  }
  $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 295  sub display_directory { Line 330  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, $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('<a href="'.$url.'?access='.$filename.
   #      '&amp;currentpath='.$current_path.&group_args().
   #      '">'.$access_admin_text.'</a></span></td>');
   # }
   # $r->print('</tr>'.$/);
    if ($show_versions) {
       &display_directory_line($r,$select_mode,$fullpath, $css_class, $line, \%access_controls, 
                           $now, \%version_flag, $href_location, $url, $current_path, $access_admin_text);
   
  }   }
  $r->print('</tr>'.$/);  
             }              }
         }          }
     }      }
Line 349  sub open_form { Line 393  sub open_form {
 }  }
   
 sub close_form {  sub close_form {
     my ($r,$url,$group,$button_text)=@_;      my ($r,$url,$button_text)=@_;
     if (!defined($button_text)) {      if (!defined($button_text)) {
         $button_text = {          $button_text = {
                          'continue' => &mt('Continue'),                           'continue' => &mt('Continue'),
                          'cancel'   => &mt('Cancel'),                           'cancel'   => &mt('Cancel'),
                        };                         };
     }      }
     $r->print('<p><input type="submit" value="'.$button_text->{'continue'}.'" />');      $r->print('<p><input type="submit" value="'.$button_text->{'continue'}.'" />')
     if (defined($group)) {      $r->print(&group_form_data().'</p></form>');
        $r->print("\n".'<input type="hidden" name="group" value="'.  
               $group.'" />');  
     }  
     $r->print('</p></form>');  
     $r->print('<form action="'.$url.'" method="post">      $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'}.'" />'.
     if (defined($group)) {        &group_form_data());
        $r->print("\n".'<input type="hidden" name="group" value="'.  
               $group.'" />');  
     }  
     $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 396  sub display_file { Line 433  sub display_file {
 }  }
   
 sub done {  sub done {
     my ($message,$url,$group)=@_;      my ($message,$url)=@_;
     unless (defined $message) {      unless (defined $message) {
         $message='Done';          $message='Done';
     }      }
     my $result = '<h3><a href="'.$url.'?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'}.
     if (defined($group)) {   &group_args();
         $result .= '&group='.$group;  
     }  
     $result .= '">'.&mt($message).'</a></h3>';      $result .= '">'.&mt($message).'</a></h3>';
     return $result;      return $result;
 }  }
Line 420  sub delete { Line 455  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));
     } else {      } else {
         if (scalar(@files)) {          if (scalar(@files)) {
             &open_form($r,$url);              &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,$url,$group);              &close_form($r,$url);
         } 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));
         }          }
     }      }
 }   } 
Line 448  sub delete_confirmed { Line 483  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));
 }  }
   
 sub delete_dir {  sub delete_dir {
     my ($r,$url,$group)=@_;      my ($r,$url)=@_;
     &open_form($r,$url);      &open_form($r,$url);
     $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');      $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
     &close_form($r,$url,$group);      &close_form($r,$url);
 }   } 
   
 sub delete_dir_confirmed {  sub delete_dir_confirmed {
Line 484  sub delete_dir_confirmed { Line 519  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));
 }  }
   
 sub rename {  sub rename {
Line 494  sub rename { Line 529  sub rename {
     $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));
     } 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 
                    <input name="filenewname" type="input" size="50" />?</p>');                     <input name="filenewname" type="input" size="50" />?</p>');
         &close_form($r,$url,$group);          &close_form($r,$url);
     }      }
 }  }
   
Line 512  sub rename_confirmed { Line 547  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));
  return;   return;
     }       } 
     my $result=      my $result=
Line 530  sub rename_confirmed { Line 565  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));
 }  }
   
 sub display_access {  sub display_access {
Line 552  sub display_access { Line 587  sub display_access {
                         'continue' => &mt('Proceed'),                          'continue' => &mt('Proceed'),
                         'cancel' => &mt('Back to directory listing'),                          'cancel' => &mt('Back to directory listing'),
                       };                        };
         &close_form($r,$url,$group,$button_text);          &close_form($r,$url,$button_text);
     } else {      } else {
         $r->print($header);          $r->print($header);
         if ($aclcount) {            if ($aclcount) {  
             $r->print($info);              $r->print($info);
         }          }
         &view_access_settings($r,$url,$group,$access_controls{$file_name},          &view_access_settings($r,$url,$access_controls{$file_name},$aclcount);
                               $aclcount);  
     }      }
 }  }
   
 sub view_access_settings {  sub view_access_settings {
     my ($r,$url,$group,$access_controls,$aclcount) = @_;      my ($r,$url,$access_controls,$aclcount) = @_;
     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 585  sub view_access_settings { Line 619  sub view_access_settings {
     } else {      } else {
         $r->print(&mt('No access control settings currently exist for this file.<br />' ));          $r->print(&mt('No access control settings currently exist for this file.<br />' ));
     }      }
     my $group_arg;  
     if ($group) {  
         $group_arg = '&amp;group='.$group;  
     }  
     $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_args().'">'.&mt('Return to directory listing').'</a>');
     return;      return;
 }  }
   
Line 812  sub update_access { Line 842  sub update_access {
                                     $access_controls{$file_name},$now,$then);                                      $access_controls{$file_name},$now,$then);
             }              }
         }          }
         &close_form($r,$url,$group);          &close_form($r,$url);
     } else {      } else {
         my $group_arg;  
         if ($group) {  
             $group_arg = '&amp;group='.$group;  
         }  
         $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.'">'.
                    &mt('Display all access settings for this file').'</a>'.                     &mt('Display all access settings for this file').'</a>'.
                   '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.                    '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.
                   '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.                    '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
                   $group_arg.'">'.&mt('Return to directory listing').'</a>');                    &group_args().'">'.&mt('Return to directory listing').'</a>');
     }      }
     return;      return;
 }  }
Line 1475  sub upload { Line 1501  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));
     }       } 
     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));      
         } 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));
         }          }
     } else {      } else {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',          my $result=&Apache::lonnet::userfileupload('uploaddoc','',
Line 1493  sub upload { Line 1519  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));
         } else {          } else {
             $r->print(&done(undef,$url,$group));              $r->print(&done(undef,$url));
         }          }
     }      }
 }  }
Line 1529  sub lock_info { Line 1555  sub lock_info {
             }              }
         }          }
     }      }
     $r->print(&done('Back',$url,$group));      $r->print(&done('Back',$url));
     return 'ok';      return 'ok';
 }  }
 sub createdir {  sub createdir {
Line 1567  sub createdir { Line 1593  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));
 }  }
   
 sub get_portfolio_root {  sub get_portfolio_root {
     my ($group) = @_;      my ($group) = @_;
     my ($portfolio_root,$udom,$uname,$path);      my ($uname,$udom) = &get_name_dom($group);
     ($uname,$udom) = &get_name_dom($group);      my $path;
     if (defined($group)) {      if (defined($group)) {
         $path = '/userfiles/groups/'.$group.'/portfolio';          $path = '/userfiles/groups/'.$group.'/portfolio';
     } else {      } else {
Line 1669  sub missing_priv { Line 1695  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 .= &group_args()
     } else {      } else {
         $r->print(&mt('in this portfolio.'));          $r->print(&mt('in this portfolio.'));
     }      }
Line 1680  sub missing_priv { Line 1706  sub missing_priv {
 }  }
   
 sub coursegrp_portfolio_header {  sub coursegrp_portfolio_header {
     my ($cdom,$cnum,$group,$grp_desc)=@_;      my ($cdom,$cnum,$grp_desc)=@_;
     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 ($env{'form.ref'}) {
           &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?ref=$env{'form.ref'}",
           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_args(),
           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 1703  sub handler { Line 1735  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;
Line 1719  sub handler { Line 1751  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'};          $env{'form.group'} =~ s/\W//g;
         $group =~ s/\W//g;   my $group = $env{'form.group'};
         if ($group) {          if ($group) {
             ($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,
Line 1803  sub handler { Line 1835  sub handler {
         &open_form($r,$url);          &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,$url,$group);          &close_form($r,$url);
     }      }
     if ($env{'form.store'}) {      if ($env{'form.store'}) {
     }      }
Line 1812  sub handler { Line 1844  sub handler {
         if ($can_upload) {          if ($can_upload) {
     &upload($r,$url,$group);      &upload($r,$url,$group);
         } 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) {
Line 1822  sub handler { Line 1854  sub handler {
         }          }
     } 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);
         }          }
Line 1834  sub handler { Line 1866  sub handler {
         }          }
     } 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);
         } else {          } else {
             &missing_priv($r,$url,'delete',$group);              &missing_priv($r,$url,'delete',$group);
         }          }
Line 1883  sub handler { Line 1915  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,$grp_desc));
         }          }
         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 1906  sub handler { Line 1938  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,
                         $can_upload);   $can_upload);
         &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group,          &display_directory($r,$url,$current_path,$is_empty,\@dir_list,
                            $can_upload,$can_modify,$can_delete,$can_setacl);                             $can_upload,$can_modify,$can_delete,$can_setacl);
  $r->print(&Apache::loncommon::end_page());   $r->print(&Apache::loncommon::end_page());
     }      }
Removed from v.1.133  
changed lines
  Added in v.1.137

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