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

Diff for /loncom/interface/portfolio.pm between versions 1.192 and 1.196.2.2

version 1.192, 2008/04/17 14:46:18 version 1.196.2.2, 2009/01/03 19:39:37
Line 80  sub make_anchor { Line 80  sub make_anchor {
   
 my $dirptr=16384;  my $dirptr=16384;
 sub display_common {  sub display_common {
     my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload)=@_;      my ($r,$url,$current_path,$is_empty,$dir_list,$can_upload,$group)=@_;
     my $namespace = &get_namespace();      my $namespace = &get_namespace();
     my $port_path = &get_port_path();      my $port_path = &get_port_path();
     if ($can_upload) {      if ($can_upload) {
Line 93  sub display_common { Line 93  sub display_common {
  'Upload file to current directory:',   'Upload file to current directory:',
  'createdir' => 'Create Subdirectory',   'createdir' => 'Create Subdirectory',
  'createdir_label' =>    'createdir_label' => 
  'Create subdirectory in current directory:');   'Create subdirectory in current directory:',
                                            'parse' => 'If HTML file, upload embedded images/multimedia/css/linked files'
                                               );
         my $escuri = &HTML::Entities::encode($r->uri,'&<>"');          my $escuri = &HTML::Entities::encode($r->uri,'&<>"');
  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'));
  # FIXME: This line should be deleted once Portfolio uses breadcrumbs          $r->print(&display_usage($group));
  $r->print(&Apache::loncommon::help_open_topic('Portfolio About', &mt('Help on the portfolio')));          my $parse_check;
           if (!&suppress_embed_prompt()) {
         $r->print(<<"TABLE");               $parse_check = <<"END";
           <br />
           <span class="LC_nobreak">
            <label>$text{'parse'}
            <input type="checkbox" name="parserflag" checked="checked" />
            </label>
           </span>
   END
           }
           $r->print(<<"TABLE");
   $help_portfolio
 <table id="LC_portfolio_actions">  <table id="LC_portfolio_actions">
   <tr id="LC_portfolio_upload">    <tr id="LC_portfolio_upload">
     <td class="LC_label">      <td class="LC_label">
Line 115  sub display_common { Line 127  sub display_common {
  <input type="hidden" name="action" value="$env{"form.action"}" />   <input type="hidden" name="action" value="$env{"form.action"}" />
  <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="$text{'upload'}" />$help_fileupload   <input type="submit" name="storeupl" value="$text{'upload'}" />
   $help_fileupload
   $parse_check
       </form>        </form>
     </td>      </td>
   </tr>    </tr>
Line 125  sub display_common { Line 139  sub display_common {
     </td>      </td>
     <td class="LC_value">      <td class="LC_value">
       <form method="post" action="$escuri">        <form method="post" action="$escuri">
         <input name="newdir" type="input" />$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="fieldname" value="$env{"form.fieldname"}" />          <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
Line 170  TABLE Line 184  TABLE
     $r->print("</form>");      $r->print("</form>");
 }  }
   
   sub display_usage {
       my ($group) = @_;
       my $disk_quota = &get_quota($group);
       my $getpropath = 1;
       my $portfolio_root = &get_portfolio_root();
       my ($uname,$udom) = &get_name_dom($group);
       my $current_disk_usage =
            &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
       my $usage = $current_disk_usage/1000;
       my $quota = $disk_quota/1000;
       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 align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
   '   <div 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 style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
   '   </div>'."\n".
   '  </div><br />';
       return $disk_meter;
   }
   
 sub display_directory_line {  sub display_directory_line {
     my ($r,$select_mode, $filename, $mtime, $size, $css_class,      my ($r,$select_mode, $filename, $mtime, $size, $css_class,
  $line, $access_controls, $curr_access, $now, $version_flag,   $line, $access_controls, $curr_access, $now, $version_flag,
Line 212  sub display_directory_line { Line 268  sub display_directory_line {
     $r->print('<td>'.$size.'</td>');      $r->print('<td>'.$size.'</td>');
     $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');      $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
     if ($select_mode ne 'true') {      if ($select_mode ne 'true') {
  $r->print('<td><span style="white-space: nowrap">'.   $r->print('<td><span class="LC_nobreak">'.
   &mt($curr_access).'&nbsp;&nbsp;&nbsp;');    &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
         my %anchor_fields = (          my %anchor_fields = (
             'access' => $filename,              'access' => $filename,
Line 450  sub display_directory { Line 506  sub display_directory {
         $r->print('</table>');          $r->print('</table>');
         if ($can_delete) {          if ($can_delete) {
             $r->print('              $r->print('
         <input type="submit" name="doit" value="'.&mt('Delete Checked Files').'" />'.          <input type="submit" name="doit" value="'.&mt('Delete Selected').'" />'.
  &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'   &Apache::loncommon::help_open_topic('Portfolio DeleteFile').'
         <input type="hidden" name="action" value="delete" />          <input type="hidden" name="action" value="delete" />
         <input type="hidden" name="currentpath" value="'.$current_path.'" />          <input type="hidden" name="currentpath" value="'.$current_path.'" />
Line 653  sub rename { Line 709  sub rename {
     } else {      } else {
         &open_form($r,$url);          &open_form($r,$url);
         $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file()          $r->print('<p>'.&mt('Rename [_1] to [_2]?', &display_file()
                   , '<input name="filenewname" type="input" size="50" />').'</p>');                    , '<input name="filenewname" type="text" size="50" />').'</p>');
         &close_form($r,$url);          &close_form($r,$url);
     }      }
 }  }
Line 760  sub display_access { Line 816  sub display_access {
         $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.');
         $info .= '</li><li>'.&explain_conditionals();          $info .= '</li><li>'.&explain_conditionals();
         $info .= '</li></ul>'.          $info .= '</li></ul>'.
                   &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme/portfolio</a>.<br />";                    &mt('A listing of files viewable without log-in is available at: ')."<a href=\"/adm/$udom/$uname/aboutme/portfolio\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme/portfolio</a>.<br />";
         if ($group eq '') {          if ($group eq '') {
             $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");              $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on your personal information page:");
         } else {          } else {
             $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");              $info .= &mt("For logged in users a 'Display file listing' link will also appear (when there are viewable files) on the course information page:");
         }          }
         $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a><br />";          $info .= "<br /><a href=\"/adm/$udom/$uname/aboutme\">".&Apache::lonnet::absolute_url($ENV{'SERVER_NAME'})."/adm/$udom/$uname/aboutme</a><br />";
         if ($group ne '') {          if ($group ne '') {
             $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';              $info .= &mt("Users with privileges to edit course contents may add a course information page to a course using the 'Course Info' button in DOCS").'<br />';
         }          }
Line 1459  sub course_row { Line 1515  sub course_row {
                 }                  }
                 $max_id ++;                  $max_id ++;
                 my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');                  my $role_selects = &role_selectors($num,$role_id,$type,$content,'display');
                 $r->print('<tr><td><span style="white-space: nowrap"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');                  $r->print('<tr><td><span class="LC_nobreak"><label><input type="checkbox" name="delete_role_'.$num.'" value="'.$role_id.'" />'.&mt('Delete').'</label></span><br /><input type="hidden" name="preserve_role_'.$num.'" value="'.$role_id.'" /></td>'.$role_selects.'</tr>');
             }              }
             $r->print('</table>');              $r->print('</table>');
         }          }
Line 1534  sub additional_item { Line 1590  sub additional_item {
   
 sub actionbox {  sub actionbox {
     my ($status,$num,$scope) = @_;      my ($status,$num,$scope) = @_;
     my $output = '<span style="white-space: nowrap"><label>';      my $output = '<span class="LC_nobreak"><label>';
     if ($status eq 'new') {      if ($status eq 'new') {
         my $checkstate;          my $checkstate;
         if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {          if ($scope eq 'domains' || $scope eq 'users' || $scope eq 'course') {
Line 1545  sub actionbox { Line 1601  sub actionbox {
         &mt('Activate');          &mt('Activate');
     } else {      } else {
         $output .= '<input type="checkbox" name="delete" value="'.$num.          $output .= '<input type="checkbox" name="delete" value="'.$num.
                    '" />'.&mt('Delete').'</label></span><br /><span style="white-space: nowrap">'.                     '" />'.&mt('Delete').'</label></span><br /><span class="LC_nobreak">'.
                    '<label><input type="checkbox" name="update" value="'.                     '<label><input type="checkbox" name="update" value="'.
                    $num.'" />'.&mt('Update');                     $num.'" />'.&mt('Update');
     }      }
Line 1564  sub dateboxes { Line 1620  sub dateboxes {
                             undef,undef,1);                              undef,undef,1);
     my $enddate = &Apache::lonhtmlcommon::date_setter('portform',      my $enddate = &Apache::lonhtmlcommon::date_setter('portform',
                                'enddate_'.$num,$end,undef,undef,undef,1,undef,                                 'enddate_'.$num,$end,undef,undef,undef,1,undef,
                                 undef,undef,1). '&nbsp;&nbsp;<span style="white-space: nowrap"><label>'.                                  undef,undef,1). '&nbsp;&nbsp;<span class="LC_nobreak"><label>'.
                                 '<input type="checkbox" name="noend_'.                                  '<input type="checkbox" name="noend_'.
                                 $num.'" '.$noend.' />'.&mt('No end date').                                  $num.'" '.$noend.' />'.&mt('No end date').
                                 '</label></span>';                                  '</label></span>';
Line 1801  sub check_for_upload { Line 1857  sub check_for_upload {
 sub upload {  sub upload {
     my ($r,$url,$group)=@_;      my ($r,$url,$group)=@_;
     my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});      my $fname=&Apache::lonnet::clean_filename($env{'form.uploaddoc.filename'});
       my $disk_quota = &get_quota($group);
     my ($state,$msg) = &check_for_upload($env{'form.currentpath'},      my $portfolio_root = &get_portfolio_root();
  $fname,$group,'uploaddoc');      my $port_path = &get_port_path();
       my ($uname,$udom) = &get_name_dom($group);
       my $getpropath = 1;
       my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
       my ($state,$msg) = 
           &Apache::loncommon::check_for_upload($env{'form.currentpath'},$fname,
                                $group,'uploaddoc',$portfolio_root,
                                                $port_path,$disk_quota,
                                                $current_disk_usage,$uname,$udom);
     if ($state eq 'will_exceed_quota'      if ($state eq 'will_exceed_quota'
  || $state eq 'file_locked'   || $state eq 'file_locked'
  || $state eq 'file_exists' ) {   || $state eq 'file_exists' ) {
Line 1812  sub upload { Line 1875  sub upload {
  return;   return;
     }      }
   
     my $port_path = &get_port_path();  
     my (%allfiles,%codebase,$mode);      my (%allfiles,%codebase,$mode);
     if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {      if ($env{'form.uploaddoc.filename'} =~ m/(\.htm|\.html|\.shtml)$/i) {
  $mode = 'parse';          if ($env{'form.parserflag'}) {
       $mode = 'parse';
           }
     }      }
     my $result=      my $result=
  &Apache::lonnet::userfileupload('uploaddoc','',   &Apache::lonnet::userfileupload('uploaddoc','',
Line 1828  sub upload { Line 1891  sub upload {
  $r->print(&done('Back',$url));   $r->print(&done('Back',$url));
     } else {      } else {
  if (%allfiles) {   if (%allfiles) {
     my $state = <<STATE;              if (!&suppress_embed_prompt()) {
           my $state = <<STATE;
     <input type="hidden" name="action"      value="upload_embedded" />      <input type="hidden" name="action"      value="upload_embedded" />
     <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />      <input type="hidden" name="currentpath" value="$env{'form.currentpath'}" />
     <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'}" />
 STATE  STATE
             $r->print("<h2>".&mt("Reference Warning")."</h2>");                  $r->print("<h2>".&mt("Reference Warning")."</h2>");
             $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. 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("Please select the locations from which the referenced files are to be uploaded.")."</p>");                  $r->print("<p>".&mt("Please select the locations from which the referenced files are to be uploaded.")."</p>");
     $r->print(&Apache::londocs::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,          $r->print(&Apache::loncommon::ask_for_embedded_content('/adm/portfolio',$state,\%allfiles,\%codebase,
       {'error_on_invalid_names'   => 1,        {'error_on_invalid_names'   => 1,
        'ignore_remote_references' => 1,}));         'ignore_remote_references' => 1,}));
     $r->print('<p>Or '.&done('Return to directory',$url).'</p>');          $r->print('<p>Or '.&done('Return to directory',$url).'</p>');
               }
  } else {   } else {
     $r->print(&done(undef,$url));      $r->print(&done(undef,$url));
  }   }
     }      }
 }  }
   
 sub upload_embedded {  
     my ($r,$url,$group)=@_;  
     for (my $i=0; $i<$env{'form.number_embedded_items'}; $i++) {  
  next if (!exists($env{'form.embedded_item_'.$i.'.filename'}));  
  my $orig_uploaded_filename =   
     $env{'form.embedded_item_'.$i.'.filename'};  
   
  $env{'form.embedded_orig_'.$i} =   
     &unescape($env{'form.embedded_orig_'.$i});  
  my ($path,$fname) =   
     ($env{'form.embedded_orig_'.$i} =~ m{(.*/)([^/]*)});  
  # no path, whole string is fname  
  if (!$fname) { $fname = $env{'form.embedded_orig_'.$i} };  
   
  $path = $env{'form.currentpath'}.$path;  
  $fname = &Apache::lonnet::clean_filename($fname);  
   
  my ($state,$msg) = &check_for_upload($path,$fname,$group,  
      'embedded_item_'.$i);  
   
  if ($state eq 'will_exceed_quota'  
     || $state eq 'file_locked'  
     || $state eq 'file_exists' ) {  
     $r->print($msg);  
     next;  
  }  
   
  my $port_path = &get_port_path();  
  my $src_path = $env{'form.embedded_orig_'.$i};  
  $env{'form.embedded_item_'.$i.'.filename'}=$fname;  
   
  my $result=  
     &Apache::lonnet::userfileupload('embedded_item_'.$i,'',  
     $port_path.$path);  
  if ($result !~ m|^/uploaded/|) {  
     $r->print('<span class="LC_error">'  
                       .&mt('An error occurred ([_1]) while trying to upload [_2] for embedded element [_3].'  
                            ,$result,$orig_uploaded_filename,$env{'form.embedded_orig_'.$i})  
                       .'</span><br />');  
     next;  
  } else {  
     $r->print("<p> Uploaded ".  
       &display_file($port_path.$path,$fname).'</p>');  
  }  
     }  
     $r->print(&done(undef,$url));  
 }  
   
 sub lock_info {  sub lock_info {
     my ($r,$url,$group) = @_;      my ($r,$url,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);      my ($uname,$udom) = &get_name_dom($group);
Line 2134  sub get_quota { Line 2151  sub get_quota {
     return $disk_quota;      return $disk_quota;
 }  }
   
   sub suppress_embed_prompt {
       my $suppress_prompt = 0;
       if (($env{'request.role'} =~ /^st/) && ($env{'request.course.id'} ne '')) {
           if ($env{'course.'.$env{'request.course.id'}.'.suppress_embed_prompt'} eq 'yes') {
               $suppress_prompt = 1;
           }
       }
       return $suppress_prompt;
   }
   
   
 sub handler {  sub handler {
     # this handles file management      # this handles file management
     my $r = shift;      my $r = shift;
Line 2229  sub handler { Line 2257  sub handler {
         $r->print(&Apache::loncommon::start_page($title));          $r->print(&Apache::loncommon::start_page($title));
     }      }
     $r->rflush();      $r->rflush();
       if ($caller ne 'coursegrp_portfolio') {
           &Apache::lonhtmlcommon::clear_breadcrumbs();
           &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/portfolio",
                                                   text=>"Portfolio Manager"});
           if (!&Apache::lonnet::usertools_access($uname,$udom,'portfolio')) {
               $r->print(&Apache::lonhtmlcommon::breadcrumbs());
               $r->print('<h2>'.&mt('No user portfolio available') .'</h2>'.
                         &mt('This is a result of one of the following:').'<ul>'.
                         '<li>'.&mt('The administrator of this domain has disabled portfolio functionality for this specific user.').'</li>'.
                         '<li>'.&mt('The domain has been configured to disable, by default, portfolio functionality for all users in the domain.').'</li>'.
                         '</ul>');
               $r->print(&Apache::loncommon::end_page());
               return OK;
           } else {
               $r->print(&Apache::lonhtmlcommon::breadcrumbs('Portfolio Manager'));
           }
       }
     my ($blocked,$blocktext) =       my ($blocked,$blocktext) = 
         &Apache::loncommon::blocking_status('port',$uname,$udom);          &Apache::loncommon::blocking_status('port',$uname,$udom);
     if ($blocked) {      if ($blocked) {
Line 2258  sub handler { Line 2303  sub handler {
         }          }
     } elsif ($env{'form.action'} eq 'upload_embedded') {      } elsif ($env{'form.action'} eq 'upload_embedded') {
  if ($can_upload) {   if ($can_upload) {
     &upload_embedded($r,$url,$group);              my $disk_quota = &get_quota($group);
               my $getpropath = 1;
               my $current_disk_usage = 
                   &Apache::lonnet::diskusage($udom,$uname,$portfolio_root,$getpropath);
       $r->print(
                   &Apache::loncommon::upload_embedded('portfolio',$port_path,$uname,$udom,
                       $group,$portfolio_root,$group,$disk_quota,$current_disk_usage));
               $r->print(&done(undef,$url));
         } else {          } else {
             &missing_priv($r,$url,'upload');              &missing_priv($r,$url,'upload');
         }          }
Line 2357  sub handler { Line 2409  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,   &display_common($r,$url,$current_path,$is_empty,\@dir_list,
  $can_upload);   $can_upload,$group);
         &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);
  $r->print(&Apache::loncommon::end_page());   $r->print(&Apache::loncommon::end_page());
Removed from v.1.192  
changed lines
  Added in v.1.196.2.2

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