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

Diff for /loncom/interface/portfolio.pm between versions 1.233 and 1.246

version 1.233, 2011/10/17 12:41:30 version 1.246, 2013/07/02 19:04:37
Line 63  sub group_form_data { Line 63  sub group_form_data {
     return $output;      return $output;
 }   } 
   
 # receives a file name and path stub from username/userfiles/portfolio/  # receives a filename 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, $anchor_fields, $inner_text) = @_;      my ($url, $anchor_fields, $inner_text) = @_;
Line 98  sub display_common { Line 98  sub display_common {
  my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');   my $help_fileupload = &Apache::loncommon::help_open_topic('Portfolio AddFiles');
  my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');   my $help_createdir = &Apache::loncommon::help_open_topic('Portfolio CreateDirectory');
         my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));          my $help_portfolio = &Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio'));
         $r->print(&display_usage($group));          $r->print(&display_portfolio_usage($group));
         my $parse_check;          my $parse_check;
         if (!&suppress_embed_prompt()) {          if (!&suppress_embed_prompt()) {
             $parse_check = <<"END";              $parse_check = <<"END";
Line 122  END Line 122  END
                  .'<input name="uploaddoc" type="file" />'                   .'<input name="uploaddoc" type="file" />'
                  .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'                   .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                  .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'                   .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
                    .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
                  .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'                   .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
                  .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'                   .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
                  .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'                   .'<input type="submit" name="storeupl" value="'.$lt{'upload'}.'" />'
Line 139  END Line 140  END
                  .'<input name="newdir" type="text" />'.$groupitem                   .'<input name="newdir" type="text" />'.$groupitem
                  .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'                   .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                  .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'                   .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
                    .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
                  .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'                   .'<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'
                  .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'                   .'<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'
                  .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'                   .'<input type="submit" name="createdir" value="'.$lt{'createdir'}.'" />'
Line 155  END Line 157  END
         'selectfile'    => $port_path,          'selectfile'    => $port_path,
         'currentpath'   => '/',          'currentpath'   => '/',
         'mode'          => $env{"form.mode"},          'mode'          => $env{"form.mode"},
           'symb'          => $env{"form.symb"},
         'fieldname'     => $env{"form.fieldname"},          'fieldname'     => $env{"form.fieldname"},
         'continue'      => $env{"form.continue"}          'continue'      => $env{"form.continue"}
     );      );
Line 168  END Line 171  END
                 'selectfile' => $tree[$i],                  'selectfile' => $tree[$i],
                 'currentpath' => $newCurrentPath,                  'currentpath' => $newCurrentPath,
                 'mode' => $env{"form.mode"},                  'mode' => $env{"form.mode"},
                   'symb' => $env{"form.symb"},
                 'fieldname' => $env{"form.fieldname"},                  'fieldname' => $env{"form.fieldname"},
                 'continue' => $env{"form.continue"}                  'continue' => $env{"form.continue"}
             );              );
Line 177  END Line 181  END
     $r->print('</span>');      $r->print('</span>');
     $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));      $r->print(&Apache::loncommon::help_open_topic('Portfolio ChangeDirectory'));
     &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"}.&group_args());      $r->print('<br /><form method="post" action="'.$url.'?mode='.$env{"form.mode"}.'&amp;fieldname='.$env{"form.fieldname"}.'&amp;symb='.$env{'form.symb'}.&group_args());
     $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_usage {  sub display_portfolio_usage {
     my ($group) = @_;      my ($group) = @_;
     my $disk_quota = &get_quota($group);      my $disk_quota = &get_quota($group);
     my $getpropath = 1;      my $getpropath = 1;
Line 192  sub display_usage { Line 196  sub display_usage {
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my $current_disk_usage =      my $current_disk_usage =
          &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);           &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
     my $usage = $current_disk_usage/1000;      return &Apache::loncommon::head_subbox(
     my $quota = $disk_quota/1000;                 &Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota));
     my $percent;  
     if ($disk_quota == 0) {  
         $percent = 100.0;  
     } else {  
         $percent = 100*($current_disk_usage/$disk_quota);  
     }  
     $usage = sprintf("%.2f",$usage);  
     $quota = sprintf("%.2f",$quota);  
     $percent = sprintf("%.0f",$percent);  
     my ($color,$cssclass);  
     if ($percent <= 60) {  
         $color = '#00A000';  
     } elsif ($percent > 60 && $percent < 90) {  
         $color = '#FFD300';  
         $cssclass = 'class="LC_warning"';  
     } elsif( $percent >= 90) {  
         $color = '#FF0000';  
         $cssclass = 'class="LC_error"';  
     }  
     my $prog_width = $percent;  
     if ($prog_width > 100) {  
         $prog_width = 100;  
     }  
     my $disk_meter = '  
   <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".  
 '   <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".  
 '    <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".  
 '   </div>'."\n".  
 '  </div>';  
     return &Apache::loncommon::head_subbox($disk_meter);  
 }  }
   
 sub display_directory_line {  sub display_directory_line {
Line 447  sub display_directory { Line 421  sub display_directory {
                     'selectfile'    => $filename.'/',                      'selectfile'    => $filename.'/',
                     'currentpath'   => $current_path.$filename.'/',                      'currentpath'   => $current_path.$filename.'/',
                     'mode'          => $env{"form.mode"},                      'mode'          => $env{"form.mode"},
                       'symb'          => $env{"form.symb"},
                     'fieldname'     => $env{"form.fieldname"},                      'fieldname'     => $env{"form.fieldname"},
                     'continue'      => $env{"form.continue"}                      'continue'      => $env{"form.continue"}
                 );                    );  
Line 554  sub display_directory { Line 529  sub display_directory {
         $r->print('          $r->print('
             <input type="hidden" name="continue" value="true" />              <input type="hidden" name="continue" value="true" />
             <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />              <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
               <input type="hidden" name="symb" value="'.$env{'form.symb'}.'" />
             <input type="hidden" name="mode" value="selectfile" />              <input type="hidden" name="mode" value="selectfile" />
             <p>              <p>
             <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />              <input type="submit" name="submit" value="'.&mt('Select checked files, and continue selecting').'" /><br />
Line 633  sub display_file { Line 609  sub display_file {
 }  }
   
 sub done {  sub done {
     my ($message,$url)=@_;      my ($linktext,$url)=@_;
     unless (defined $message) {      unless (defined($linktext)) {
         $message='Done';          $linktext='Return to directory';
     }      }
     my %anchor_fields = (      my %anchor_fields = (
         'showversions' => $env{'form.showversions'},          'showversions' => $env{'form.showversions'},
         'currentpath' => $env{'form.currentpath'},          'currentpath' => $env{'form.currentpath'},
         'fieldname' => $env{'form.fieldname'},          'fieldname' => $env{'form.fieldname'},
           'symb'      => $env{'form.symb'},
         'mode'      => $env{'form.mode'}          'mode'      => $env{'form.mode'}
     );      );
     my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';      my $result = &Apache::lonhtmlcommon::actionbox(
                        [&make_anchor($url,\%anchor_fields,&mt($linktext))]);
     return $result;      return $result;
 }  }
   
Line 655  sub delete { Line 633  sub delete {
     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);      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(&mt('The file is locked and cannot be deleted.').'<br />');          $r->print(
         $r->print(&done('Back',$url));              '<p class="LC_warning">'
              .&mt('The file is locked and cannot be deleted.')
              .'</p>'
              .&done(undef,$url)
           );
     } else {      } else {
         if (scalar(@files)) {          if (scalar(@files)) {
             &open_form($r,$url);              &open_form($r,$url);
             $r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');              $r->print('<p>'.&mt('Delete [_1]?',&display_file(undef,\@files)).'</p>');
             &close_form($r,$url);              &close_form($r,$url);
         } else {          } else {
             $r->print("No file was checked to delete.<br />");              $r->print('<p class="LC_warning">'.&mt('No file was checked to delete.').'</p>');
             $r->print(&done(undef,$url));              $r->print(&done(undef,$url));
         }          }
     }      }
Line 677  sub delete_confirmed { Line 659  sub delete_confirmed {
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,      my $current_permissions = &Apache::lonnet::get_portfile_permissions($udom,
                                                                         $uname);                                                                          $uname);
       my @msg;
     foreach my $delete_file (@files) {      foreach my $delete_file (@files) {
         $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.          $result =
        $env{'form.currentpath'}.              &Apache::lonnet::removeuserfile(
        $delete_file);                  $uname,$udom,$port_path.
                   $env{'form.currentpath'}.
                   $delete_file);
         if ($result ne 'ok') {          if ($result ne 'ok') {
     $r->print('<span class="LC_error">'              push(@msg, &Apache::lonhtmlcommon::confirm_success(
                       .&mt('An error occurred ([_1]) while trying to delete [_2].'                  &mt('An error occurred ([_1]) while trying to delete [_2].'
                          ,$result,&display_file(undef, $delete_file))                      ,$result,&display_file(undef, $delete_file)),1));
                       .'</span><br /><br />');  
         } else {          } else {
             $r->print(&mt('File: [_1] deleted.',              push(@msg, &Apache::lonhtmlcommon::confirm_success(
                           &display_file(undef,$delete_file)));                  &mt('File: [_1] deleted.'
                       ,&display_file(undef,$delete_file))));
             my $file_name = $env{'form.currentpath'}.$delete_file;              my $file_name = $env{'form.currentpath'}.$delete_file;
             $file_name = &prepend_group($file_name);              $file_name = &prepend_group($file_name);
             my %access_controls =               my %access_controls = 
Line 704  sub delete_confirmed { Line 689  sub delete_confirmed {
                     &Apache::lonnet::modify_access_controls($file_name,\%changes,                      &Apache::lonnet::modify_access_controls($file_name,\%changes,
                                                             $udom,$uname);                                                              $udom,$uname);
                     if ($outcome ne 'ok') {                      if ($outcome ne 'ok') {
                            $r->print('<br />'.&mt("An error occurred ([_1]) while ".                          push(@msg, &Apache::lonhtmlcommon::confirm_success(
                                "trying to delete access controls for the file.",$outcome).                              &mt('An error occurred ([_1]) while '.
                                '</span><br /><br />');                                  'trying to delete access controls for the file.',$outcome),1));
                     } else {                      } else {
                         if ($deloutcome eq 'ok') {                          if ($deloutcome eq 'ok') {
                             $r->print('<br />'.&mt('Access controls also deleted for the file.').'<br /><br />');                              push(@msg, &mt('Access controls also deleted for the file.')); # FIXME: Does the user really need this message?
                         } else {                          } else {
                             $r->print('<span class="LC_error">'.'<br />'.                              push(@msg, &Apache::lonhtmlcommon::confirm_success(
                                &mt("An error occurred ([_1]) while ".                                  &mt('An error occurred ([_1]) while '.
                                    "trying to delete access controls for the file.",$deloutcome).                                      'trying to delete access controls for the file.'
                                    '</span><br /><br />');                                      ,$deloutcome),1));
                         }                          }
                     }                      }
                 }                  }
             }              }
         }          }
     }      }
       $r->print(&Apache::loncommon::confirmwrapper(join('<br />',@msg)));
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
 }  }
   
Line 740  sub delete_dir_confirmed { Line 726  sub delete_dir_confirmed {
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.      my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
        $directory_name);         $directory_name);
                 
     if ($result ne 'ok') {      if ($result ne 'ok') {
  $r->print('<span class="LC_error">'          $r->print(
                   .&mt('An error occurred (dir) ([_1]) while trying to delete [_2].'              &Apache::loncommon::confirmwrapper(
                        ,$result,$directory_name)                  &Apache::lonhtmlcommon::confirm_success(
                   .'</span><br />');                      &mt('An error occurred (dir) ([_1]) while trying to delete [_2].'
                           ,$result,$directory_name),1)));
           $r->print(&done(undef,$url));
           return;
     } else {      } else {
         # now remove from recent          # now remove from recent
         &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);          &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
Line 756  sub delete_dir_confirmed { Line 745  sub delete_dir_confirmed {
         }          }
         $env{'form.currentpath'} = $directory_name;          $env{'form.currentpath'} = $directory_name;
     }      }
       $r->print(
           &Apache::loncommon::confirmwrapper(
               &Apache::lonhtmlcommon::confirm_success(
                   &mt('Directory successfully deleted'))));
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
 }  }
   
Line 765  sub rename { Line 758  sub rename {
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     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(
               '<p class="LC_error">'
              .&mt('The file is locked and cannot be renamed.')
              .'</p>'
           );
         $r->print(&done(undef,$url));          $r->print(&done(undef,$url));
     } else {      } else {
         &open_form($r,$url);          &open_form($r,$url);
Line 780  sub rename_confirmed { Line 777  sub rename_confirmed {
     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();      my $port_path = &get_port_path();
   
       # Display warning in case of filename cleaning has changed the filename
       if ($filenewname ne $env{'form.filenewname'}) {
           $r->print(
               '<p><span class="LC_warning">'
              .&mt('Invalid characters')
              .'</span><br />'
              .&mt('The new filename was changed from [_1] to [_2].'
                  ,'<span class="LC_filename">'.&display_file('',$env{'form.filenewname'}).'</span>'
                  ,'<span class="LC_filename">'.&display_file('',$filenewname).'</span>')
              .'</p>'
           );
                   
       }
   
       # Filename empty?
     if ($filenewname eq '') {      if ($filenewname eq '') {
  $r->print('<span class="LC_error">'.          $r->print(
   &mt("Error: no valid filename was provided to rename to.").              &Apache::loncommon::confirmwrapper(
   '</span><br />');                  &Apache::lonhtmlcommon::confirm_success(
  $r->print(&done(undef,$url));                      &mt('Error: no valid filename was provided to rename to.'),1)));
  return;          $r->print(&done(undef,$url));
           return;
     }       } 
   
      # Rename the file
     my $chg_access;      my $chg_access;
     my $result=      my $result=
  &Apache::lonnet::renameuserfile($uname,$udom,   &Apache::lonnet::renameuserfile($uname,$udom,
Line 795  sub rename_confirmed { Line 811  sub rename_confirmed {
     if ($result eq 'ok') {      if ($result eq 'ok') {
         $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);          $chg_access = &access_for_renamed($filenewname,$group,$udom,$uname);
     } else {            } else {      
  $r->print('<span class="LC_error">'.          $r->print(
   &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'              &Apache::loncommon::confirmwrapper(
                       ,$result,&display_file(),&display_file('',$filenewname))                  &Apache::lonhtmlcommon::confirm_success(
                   .'</span><br />');                      &mt('An error occurred ([_1]) while trying to rename [_2] to [_3].'
                           ,$result,&display_file(),&display_file('',$filenewname))
                       ,1)));
           $r->print(&done(undef,$url));
         return;          return;
     }      }
     if ($filenewname ne $env{'form.filenewname'}) {  
         $r->print(&mt("The new file name was changed from:<br />[_1] to [_2]",  
       '<strong>'.&display_file('',$env{'form.filenewname'}).'</strong>',  
       '<strong>'.&display_file('',$filenewname).'</strong>'));  
     }  
     $r->print($chg_access);      $r->print($chg_access);
       $r->print(
           &Apache::loncommon::confirmwrapper(
               &Apache::lonhtmlcommon::confirm_success(
                   &mt('File successfully renamed'))));
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
 }  }
   
Line 871  sub display_access { Line 889  sub display_access {
     my $aclcount = keys(%access_controls);      my $aclcount = keys(%access_controls);
     my ($header,$info);      my ($header,$info);
     if ($action eq 'chgaccess') {      if ($action eq 'chgaccess') {
         $header = '<h3>'.&mt('Allowing others to retrieve file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';          $header =
               '<h2>'
               .&mt('Allowing others to retrieve file: [_1]'
                    ,'<span class="LC_filename">'
                    .$port_path.$env{'form.currentpath'}.$env{'form.access'}
                    .'</span>')
               .'</h2>';
         $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');          $info .= &mt('Access to this file by others can be set to be one or more of the following types: public, passphrase-protected or conditional.');
         $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');          $info .= '<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.');
         $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');          $info .= '</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.');
Line 974  sub build_access_summary { Line 998  sub build_access_summary {
                 $showstart = &mt('Deleted');                  $showstart = &mt('Deleted');
                 $showend = $showstart;                  $showend = $showstart;
             } else {              } else {
                 $showstart = localtime($start);                  $showstart = &Apache::lonlocal::locallocaltime($start);
                 if ($end == 0) {                  if ($end == 0) {
                     $showend = &mt('No end date');                      $showend = &mt('No end date');
                 } else {                  } else {
                     $showend = localtime($end);                      $showend = &Apache::lonlocal::locallocaltime($end);
                 }                  }
             }              }
             $r->print('<td>'.&mt($scope_desc{$scope}));              $r->print('<td>'.&mt($scope_desc{$scope}));
Line 1076  sub update_access { Line 1100  sub update_access {
         }          }
     }      }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};      my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',      $r->print('<h2>'.&mt('Allowing others to retrieve file: [_1]',
               $port_path.$file_name).'</h3>'."\n");                '<span class="LC_filename">'.$port_path.$file_name.'</span>').'</h2>'."\n");
     $file_name = &prepend_group($file_name);      $file_name = &prepend_group($file_name);
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);      my ($errors,$outcome,$deloutcome,$new_values,$translation);
Line 1165  sub update_access { Line 1189  sub update_access {
                 $totalnew = $lastitem;                  $totalnew = $lastitem;
                 my @numbers;                     my @numbers;   
                 for (my $i=$firstitem; $i<$lastitem; $i++) {                  for (my $i=$firstitem; $i<$lastitem; $i++) {
                     push (@numbers,$i);                      push(@numbers,$i);
                 }                  }
                 &display_access_row($r,$status,$newitem,\@numbers,                  &display_access_row($r,$status,$newitem,\@numbers,
                                     $access_controls{$file_name},$now,$then);                                      $access_controls{$file_name},$now,$then);
Line 1177  sub update_access { Line 1201  sub update_access {
             'currentpath' => $env{'form.currentpath'},              'currentpath' => $env{'form.currentpath'},
             'access' => $env{'form.selectfile'}              'access' => $env{'form.selectfile'}
         );          );
         $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));          my @actions;
           push(@actions, &make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
         delete $anchor_fields{'access'};          delete $anchor_fields{'access'};
         $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory')));          push(@actions, &make_anchor($url,\%anchor_fields,&mt('Return to directory')));
           $r->print('<br />'.&Apache::lonhtmlcommon::actionbox(\@actions));
     }      }
     return;      return;
 }  }
Line 1942  sub upload { Line 1968  sub upload {
     my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'});      my $fname = &Apache::lonnet::clean_filename($env{'form.'.$formname.'.filename'});
     my ($state,$msg);      my ($state,$msg);
     if ($fname eq '') {      if ($fname eq '') {
         my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.          $r->print(
               &Apache::loncommon::confirmwrapper(
                   &Apache::lonhtmlcommon::confirm_success(
                       &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
                       'so after eliminating special characters there was nothing left.',                        'so after eliminating special characters there was nothing left.',
                       '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>');                         '<span class="LC_filename">'.$env{'form.uploaddoc.filename'}.'</span>'),1)));
         $r->print($msg.&done('Back',$url));  
           $r->print(&done(undef,$url));
         return;          return;
     }      }
     my $disk_quota = &get_quota($group);      my $disk_quota = &get_quota($group);
Line 1962  sub upload { Line 1992  sub upload {
     if ($state eq 'will_exceed_quota'      if ($state eq 'will_exceed_quota'
  || $state eq 'file_locked'   || $state eq 'file_locked'
         || $state eq 'zero_bytes') {          || $state eq 'zero_bytes') {
  $r->print($msg.&done('Back',$url));   $r->print($msg.&done(undef,$url));
  return;   return;
     }      }
   
Line 2041  function confirmOverwrite() { Line 2071  function confirmOverwrite() {
 }  }
 // ]]>  // ]]>
 </script>  </script>
   <p>
 $msg  $msg
 <br /><div class="LC_warning"><form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">  </p>
 <span class="LC_nobreak">$lt{'over'}  <form method="post" action="$url" name="existingfile" onsubmit="return confirmOverwrite();">
   <p class="LC_nobreak">$lt{'over'}
 <label><input type="radio" name="overwrite" value="1" />  <label><input type="radio" name="overwrite" value="1" />
 $lt{'yes'}</label>&nbsp;  $lt{'yes'}</label>&nbsp;
 <label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></span>  <label><input type="radio" name="overwrite" value="0" checked="checked" />$lt{'no'}</label></p>
   <p>
 <input type="hidden" name="action" value="cancel_overwrite" />  <input type="hidden" name="action" value="cancel_overwrite" />
 <input type="hidden" name="filename" value="$showfname" />  <input type="hidden" name="filename" value="$showfname" />
 <input type="hidden" name="timestamp" value="$timestamp" />  <input type="hidden" name="timestamp" value="$timestamp" />
 $hidden  $hidden
 $parserflag  $parserflag
 $group_elem  $group_elem
 <br /><br />  
 <input type="submit" name="process" value="$lt{'cont'}" />  <input type="submit" name="process" value="$lt{'cont'}" />
 </form></div>  </p>
   </form>
 END  END
         } else {          } else {
             $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'          $r->print(
                       ,$result,&display_file(undef,$fname)).'</span><br />');              &Apache::loncommon::confirmwrapper(
             $r->print(&done('Back',$url));                  &Apache::lonhtmlcommon::confirm_success(
                       &mt('An error occurred ([_1]) while trying to upload [_2].'
                           ,$result,&display_file(undef,$fname)),1)));
               $r->print(&done(undef,$url));
         }          }
     } elsif ($result !~ m|^/uploaded/|) {      } elsif ($result !~ m|^/uploaded/|) {
  $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to upload [_2].'          $r->print(
                   ,$result,&display_file(undef,$fname)).'</span><br />');              &Apache::loncommon::confirmwrapper(
  $r->print(&done('Back',$url));                  &Apache::lonhtmlcommon::confirm_success(
                       &mt('An error occurred ([_1]) while trying to upload [_2].'
                           ,$result,&display_file(undef,$fname)),1)));
    $r->print(&done(undef,$url));
     } else {      } else {
         if (!&suppress_embed_prompt()) {          if (!&suppress_embed_prompt()) {
             if ($mimetype eq 'text/html') {              if ($mimetype eq 'text/html') {
Line 2073  END Line 2112  END
                     &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);                      &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
                     return;                      return;
         } else {          } else {
                     $r->print('<p>'.&mt('Completed upload of the file.').'<br />'.                      $r->print('<p class="LC_warning">'.&mt('No embedded items identified.').'</p>');
                               &mt('No embedded items identified.').'</p>');  
                 }                  }
             }              }
         }          }
           $r->print(
               &Apache::loncommon::confirmwrapper(
                   &Apache::lonhtmlcommon::confirm_success(
                       &mt('File successfully uploaded'))));
  $r->print(&done(undef,$url));   $r->print(&done(undef,$url));
     }      }
     return;      return;
Line 2090  sub hidden_elems { Line 2132  sub hidden_elems {
     }      }
     return <<END;      return <<END;
 <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />  <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
   <input type="hidden" name="symb" value="$env{'form.symb'}" />
 <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />  <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
 <input type="hidden" name="mode" value="$env{'form.mode'}" />  <input type="hidden" name="mode" value="$env{'form.mode'}" />
 <input type="hidden" name="showversions" value="$env{'form.showversions'}" />  <input type="hidden" name="showversions" value="$env{'form.showversions'}" />
Line 2111  sub print_dependency_form { Line 2154  sub print_dependency_form {
             $r->print('<h3>'.&mt("Reference Information").'</h3>');              $r->print('<h3>'.&mt("Reference Information").'</h3>');
         }          }
         if ($num) {          if ($num) {
             $r->print('<p>'.&mt("Completed upload of the file. This file contained references to other files. You must upload the referenced files or else the uploaded file may not work properly.").'</p>'.              $r->print('<p>'.&mt('Completed upload of the file.').' '.
                         &mt('This file contained references to other files.').' '.
                         &mt('You must upload the referenced files or else the uploaded file may not work properly.').
                         '</p>'.
                       '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.                        '<p>'.&mt("Please select the locations from which the referenced files are to be uploaded.").'</p>'.
                        $embedded.                         $embedded.
                        '<p>'.&mt('or').'</p>'.&done('Return to directory',$url));                         '<p>'.&mt('or').'</p>'.&done('Return to directory',$url));
Line 2140  sub overwrite { Line 2186  sub overwrite {
         }          }
     }      }
     if ($fname eq '') {      if ($fname eq '') {
         my $msg = &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.          $r->print(
               &Apache::loncommon::confirmwrapper(
                   &Apache::lonhtmlcommon::confirm_success(
                       &mt('Invalid filename: [_1]; the name of the uploaded file did not contain any letters, '.
                       'so after eliminating special characters there was nothing left.',                        'so after eliminating special characters there was nothing left.',
                       '<span class="LC_filename">'.$env{'form.filename'}.'</span>');                        '<span class="LC_filename">'.$env{'form.filename'}.'</span>'),1)));
         $r->print($msg.&done('Back',$url));          $r->print(&done(undef,$url));
         return;          return;
     }      }
     $env{'form.'.$formname.'.filename'} = $fname;      $env{'form.'.$formname.'.filename'} = $fname;
Line 2154  sub overwrite { Line 2203  sub overwrite {
                                         \%allfiles,\%codebase,undef,undef,undef,                                          \%allfiles,\%codebase,undef,undef,undef,
                                         undef,undef,undef,\$mimetype);                                          undef,undef,undef,\$mimetype);
     if ($result !~ m|^/uploaded/|) {      if ($result !~ m|^/uploaded/|) {
         $r->print('<span class="LC_error">'.&mt('An error occurred ([_1]) while trying to overwrite [_2].'          $r->print(
                   ,$result,&display_file(undef,$fname)).'</span><br />');              &Apache::loncommon::confirmwrapper(
         $r->print(&after_overwrite(&mt('Back'),$url));                  &Apache::lonhtmlcommon::confirm_success(
                       &mt('An error occurred ([_1]) while trying to overwrite [_2].'
                          ,$result,&display_file(undef,$fname)),1)));
     } else {      } else {
         if ($mode eq 'parse') {          if ($mode eq 'parse') {
             if ($mimetype eq 'text/html') {              if ($mimetype eq 'text/html') {
Line 2164  sub overwrite { Line 2215  sub overwrite {
                     &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);                      &print_dependency_form($r,$url,\%allfiles,\%codebase,$result);
                     return;                      return;
                 } else {                  } else {
                     $r->print('<p>'.&mt('Overwriting completed.').'<br />'.                      $r->print(
                               &mt('No embedded items identified.').'</p>');                          &Apache::loncommon::confirmwrapper(
                               &Apache::lonhtmlcommon::confirm_success(
                                   &mt('Overwriting completed.'))
                              .'<br />'.&mt('No embedded items identified.')));
                 }                  }
             }              }
           } else {
               $r->print(
                   &Apache::loncommon::confirmwrapper(
                       &Apache::lonhtmlcommon::confirm_success(
                           &mt('Overwriting completed.'))));
         }          }
         $r->print(&after_overwrite(undef,$url));  
     }      }
     return;  
 }  
   
 sub after_overwrite {  
     my ($text,$url) = @_;  
     my $group_elem;      my $group_elem;
     if (defined($env{'form.group'})) {      if (defined($env{'form.group'})) {
         $group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';          $group_elem = '<input type="hidden" name="group" value="'.$env{'form.group'}.'" />';
Line 2183  sub after_overwrite { Line 2237  sub after_overwrite {
             $group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";              $group_elem .= '<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'."\n";
         }          }
     }      }
     if ($text eq '') {  
         $text = &mt('Done');  
     }  
     my $hidden = &hidden_elems();      my $hidden = &hidden_elems();
     return <<END;      $r->print(
           &Apache::lonhtmlcommon::actionbox(
 <h3><a href="javascript:document.overwritedone.submit();">$text</a></h3>              ['<a href="javascript:document.overwritedone.submit();">'
 <form name="overwritedone" method="post" action="$url" />              .&mt('Return to directory')
 $hidden              .'</a>'])
 $group_elem         .'<form name="overwritedone" method="post" action="'.$url.'">'
 </form>         .$hidden
 END         .$group_elem
          .'</form>'
       );
       return;
 }  }
   
 sub lock_info {  sub lock_info {
Line 2213  sub lock_info { Line 2267  sub lock_info {
  $filetext = '<strong>'.$env{'form.lockinfo'}.   $filetext = '<strong>'.$env{'form.lockinfo'}.
     '</strong> (group: '.$group.')';       '</strong> (group: '.$group.')'; 
     } else {      } else {
  $filetext = '<strong>'.$file_name.'</strong>';   $filetext = '<span class="LC_filename">'.$file_name.'</span>';
     }       } 
           
     my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).      my $title ='<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
Line 2236  sub lock_info { Line 2290  sub lock_info {
     }      }
         }          }
     }      }
     $r->print(&done(&mt('Back'),$url));      $r->print(&done(undef,$url));
     return 'ok';      return 'ok';
 }  }
   
 sub createdir {  sub createdir {
     my ($r,$url,$group)=@_;      my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});      my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
       # Display warning in case of directory name cleaning has changed the directory name
       if ($newdir ne $env{'form.newdir'}) {
           $r->print(
               '<p><span class="LC_warning">'
              .&mt('Invalid characters')
              .'</span><br />'
              .&mt('The new directory name was changed from [_1] to [_2].'
                         ,'<span class="LC_filename">'.$env{'form.newdir'}.'</span>'
                         ,'<span class="LC_filename">'.$newdir.'</span>')
              .'</p>'
           );
       }
   
       # Directory name empty?
     if ($newdir eq '') {      if ($newdir eq '') {
     $r->print('<span class="LC_error">'.          $r->print(
       &mt("Error: no directory name was provided.").              &Apache::loncommon::confirmwrapper(
       '</span><br />');                  &Apache::lonhtmlcommon::confirm_success(
     $r->print(&done(undef,$url));                      &mt('Error: no directory name was provided.'),1)));
     return;              $r->print(&done(undef,$url));
               return;
     }      }
   
     my $portfolio_root = &get_portfolio_root();       my $portfolio_root = &get_portfolio_root(); 
     my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);      my ($dirlistref,$listerror) = &get_dir_list($portfolio_root,undef,$group);
     my $found_file = 0;      my $found_file = 0;
Line 2261  sub createdir { Line 2331  sub createdir {
             }              }
         }          }
     }      }
     if ($found_file){      if ($found_file) {
        $r->print('<span class="LC_error">'          $r->print(
                       .&mt('Unable to create a directory named [_1].','<strong>'.$newdir.'</strong>')              &Apache::loncommon::confirmwrapper(
                       .' '.&mt('A file or directory by that name already exists.').'</span><br />');                  &Apache::lonhtmlcommon::confirm_success(
                       &mt('Unable to create a directory named [_1].'
                           ,'<span class="LC_filename">'.$newdir.'</span>'),1)
                  .'<br />'.&mt('A file or directory by that name already exists.')));
     } else {      } else {
         my ($uname,$udom) = &get_name_dom($group);          my ($uname,$udom) = &get_name_dom($group);
         my $port_path = &get_port_path();          my $port_path = &get_port_path();
         my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,          my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
          $port_path.$env{'form.currentpath'}.$newdir);           $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {          if ($result ne 'ok') {
        $r->print('<span class="LC_error">'          $r->print(
                       .&mt('An error occurred ([_1]) while trying to create a new directory [_2].'              &Apache::loncommon::confirmwrapper(
                            ,$result,&display_file())                  &Apache::lonhtmlcommon::confirm_success(
                       .'</span><br />');                      &mt('An error occurred ([_1]) while trying to create a new directory [_2].'
                           ,$result,&display_file()),1)));
   
           } else {
           $r->print(
               &Apache::loncommon::confirmwrapper(
                   &Apache::lonhtmlcommon::confirm_success(
                       &mt('Directory successfully created'))));
         }          }
     }      }
     if ($newdir ne $env{'form.newdir'}) {  
         $r->print(&mt('The new directory name was changed from [_1] to [_2].'  
                       ,'<strong>'.$env{'form.newdir'}.'</strong>','<strong>'.$newdir.'</strong>'));    
     }  
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
 }  }
   
Line 2368  sub get_port_path { Line 2444  sub get_port_path {
   
 sub missing_priv {  sub missing_priv {
     my ($r,$url,$priv) = @_;      my ($r,$url,$priv) = @_;
     my $longtext = {      my %longtext = 
           &Apache::lonlocal::texthash(
                       upload => 'upload files',                        upload => 'upload files',
                       delete => 'delete files',                        delete => 'delete files',
                       rename => 'rename files',                        rename => 'rename files',
                       setacl => 'set access controls for files',                        setacl => 'set access controls for files',
                    };      );
     my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');      my $escpath = &HTML::Entities::encode($env{'form.currentpath'},'&<>"');
     my $rtnlink = '<a href="'.$url;      my $rtnlink = '<a href="'.$url;
     if ($url =~ /\?/) {      if ($url =~ /\?/) {
Line 2383  sub missing_priv { Line 2460  sub missing_priv {
     }      }
     $rtnlink .= 'currentpath='.$escpath;      $rtnlink .= 'currentpath='.$escpath;
     $r->print('<h3>'.&mt('Action disallowed').'</h3>');      $r->print('<h3>'.&mt('Action disallowed').'</h3>');
     $r->print(&mt('You do not have sufficient privileges to [_1] ',      $r->print(&mt('You do not have sufficient privileges to [_1]',
                   $longtext->{$priv}));                    $longtext{$priv}));
     if (defined($env{'form.group'})) {      if (defined($env{'form.group'})) {
         $r->print(&mt("in the group's group portfolio."));          $r->print(' '.&mt("in the group's group portfolio."));
         $rtnlink .= &group_args()          $rtnlink .= &group_args()
     } else {      } else {
         $r->print(&mt('in this portfolio.'));          $r->print(' '.&mt('in this portfolio.'));
     }      }
     $rtnlink .= '">'.&mt('Return to directory').'</a>';      $rtnlink .= '">'.&mt('Return to directory').'</a>';
     $r->print('<br />'.$rtnlink);      $r->print('<br />'.$rtnlink);
Line 2451  sub embedded_form_elems { Line 2528  sub embedded_form_elems {
     my ($container) = @_;      my ($container) = @_;
     my $state = <<STATE;      my $state = <<STATE;
     <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />      <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
       <input type="hidden" name="symb" value="$env{'form.symb'}" />
     <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />      <input type="hidden" name="fieldname" value="$env{'form.fieldname'}" />
     <input type="hidden" name="mode" value="$env{'form.mode'}" />      <input type="hidden" name="mode" value="$env{'form.mode'}" />
     <input type="hidden" name="container" value="$container" />      <input type="hidden" name="container" value="$container" />
Line 2467  sub handler { Line 2545  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','ref']);            'cnum','cdom','type','setroles','showversions','ref','symb']);
     my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);      my ($uname,$udom,$portfolio_root,$url,$caller,$title,$group,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {      if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;          $url = $1.$2;
Line 2570  sub handler { Line 2648  sub handler {
         }          }
     }      }
     $r->rflush();      $r->rflush();
       # Check if access to portfolio is blocked by one or more blocking events in courses.
     my ($blocked,$blocktext) =       my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('port',$uname,$udom);          &Apache::loncommon::blocking_status('port',$uname,$udom);
     if ($blocked) {      if ($blocked) {
          $r->print($blocktext);          my $evade_block;
          $r->print(&Apache::loncommon::end_page());          # If portfolio display is in a window popped up from a "Select Portfolio Files"
          return OK;          # link in a .task resource, check if access to the task included proctor validation
           # of check-in to a slot limited by IP.
           # If so, and the slot is between its open and close dates, override the block. 
           if ($env{'request.course.id'} && $env{'form.symb'}) {
               (undef,undef,my $res) = &Apache::lonnet::decode_symb($env{'form.symb'});
               if ($res =~ /\.task$/i) {
                   my %history =
                       &Apache::lonnet::restore($env{'form.symb'},$env{'request.course.id'},
                                                $env{'user.domain'},$env{'user.name'});
                   my $version = $history{'resource.0.version'};
                   if ($history{'resource.'.$version.'.0.checkedin'}) {
                       if ($history{'resource.'.$version.'.0.checkedin.slot'}) {
                           my %slot = &Apache::lonnet::get_slot($history{'resource.'.$version.'.0.checkedin.slot'});
                           if ($slot{'ip'}) {
                               if (&Apache::loncommon::check_ip_acc($slot{'ip'})) {
                                   my $now = time;
                                   if (($slot{'slottime'} < $now) && ($slot{'endtime'} > $now)) {
                                       $evade_block = 1;
                                   }
                               }
                           }
                       }
                   }
               }
           }
           unless ($evade_block) {
               $r->print($blocktext);
               $r->print(&Apache::loncommon::end_page());
               return OK;
           }
     }      }
     if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){      if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
     $r->print('<span class="LC_error">');      $r->print(
     $r->print(&mt('No file was selected to upload.').' ');              '<p><span class="LC_warning">'
  $r->print(&mt('To upload a file, click <strong>Browse...</strong> and select a file, then click <strong>Upload</strong>.'));             .&mt('No file was selected to upload.')
  $r->print('</span>');             .'</span><br />'
              .&mt('To upload a file, click [_1]Browse...[_2] and select a file, then click [_1]Upload[_2].'
                   ,'<strong>','</strong>')
              .'</p>'
           );
     }      }
     if ($env{'form.meta'}) {      if ($env{'form.meta'}) {
         &open_form($r,$url);          &open_form($r,$url);
Line 2618  sub handler { Line 2730  sub handler {
         }          }
     } elsif ($env{'form.action'} eq 'modify_orightml') {      } elsif ($env{'form.action'} eq 'modify_orightml') {
         if ($can_upload) {          if ($can_upload) {
             $r->print(&Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,$udom,$group,$portfolio_root,$group));              my $result = 
             $r->print(&done('Return to directory',$url));                  &Apache::loncommon::modify_html_refs('portfolio',$port_path,$uname,
                                                        $udom,$portfolio_root);
               $r->print($result.
                         &done('Return to directory',$url));
         } else {          } else {
             &missing_priv($r,$url,'upload');              &missing_priv($r,$url,'upload');
         }          }
Removed from v.1.233  
changed lines
  Added in v.1.246

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