--- loncom/interface/portfolio.pm	2020/09/09 01:11:48	1.254.2.5
+++ loncom/interface/portfolio.pm	2015/06/18 20:19:06	1.256
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.254.2.5 2020/09/09 01:11:48 raeburn Exp $
+# $Id: portfolio.pm,v 1.256 2015/06/18 20:19:06 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -121,8 +121,8 @@ END
                  .'<fieldset>'
                  .'<legend>'.$lt{'upload_label'}.'</legend>'
                  .$groupitem 
-                 .'<input name="uploaddoc" type="file" class="LC_flUpload" />'
-                 .'<input type="hidden" id="LC_free_space" value="'.$free_space.'" />'
+                 .'<input name="uploaddoc" type="file" class="flUpload" />'
+                 .'<input type="hidden" id="free_space" value="'.$free_space.'" />'
                  .'<input type="hidden" name="currentpath" value="'.$current_path.'" />'
                  .'<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'
                  .'<input type="hidden" name="symb" value="'.$env{"form.symb"}.'" />'
@@ -203,8 +203,7 @@ sub display_portfolio_usage {
                     .$helpitem
                     .'</div>'
                     .'<div>'
-                    .&Apache::lonhtmlcommon::display_usage($current_disk_usage,
-                                                           $disk_quota,'portfolio')
+                    .&Apache::lonhtmlcommon::display_usage($current_disk_usage,$disk_quota)
                     .'</div>');
 }
 
@@ -237,7 +236,7 @@ sub display_directory_line {
 	if ($lock_info) {
 	    my %anchor_fields = ('lockinfo' => $fullpath);
 	    if ($versions) { # hold the folder open
-	        my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($fullpath);
+	        my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($fullpath);
 	        $fname =~ s|^/||;
 	        $anchor_fields{'showversions'} = $fname.'.'.$extension;
 	    }
@@ -370,7 +369,7 @@ sub display_directory {
 		          } (@{$dir_list})) {
     	    my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$dir_line,16); 
     	    $filename =~ s/\s+$//;
-    	    my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
+    	    my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename);
     	    if ($version) {
 	        my $fullpath = &prepend_group($current_path.$fname.'.'.$extension);
     	        push(@{ $versioned{$fullpath} },
@@ -383,7 +382,7 @@ sub display_directory {
     my $zerobyte;
     foreach my $dir_line (@dir_lines) {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
-        my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
+        my ($fname,$version,$extension) = &Apache::lonnet::file_name_version_ext($filename);
     	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
     	    my $version_flag;
     	    my $show_versions;
@@ -1073,7 +1072,7 @@ sub build_access_summary {
                     $r->print(&mt('Users: ').$curr_user_list);
                 } elsif ($scope eq 'ip') {
                     my $curr_ips_list = &sort_ips($content->{'ip'});
-                    $r->print(&mt('IP(s):').' '.$curr_ips_list);
+                    $r->print(&mt('IP(s): ').$curr_ips_list);
                 } else {
                     $r->print('&nbsp;');
                 }
@@ -2549,15 +2548,13 @@ sub coursegrp_portfolio_header {
     }
     &Apache::lonhtmlcommon::add_breadcrumb
         ({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",
-          text=>&mt('Group').": $grp_desc",
-          title=>&mt("Go to group's home page"),
-          no_mt=>1},
+          text=>"$ucgpterm: $grp_desc",
+          title=>"Go to group's home page"},
          {href=>"/adm/coursegrp_portfolio?".&group_args(),
           text=>"Group Portfolio",
           title=>"Display group portfolio"});
     my $output = &Apache::lonhtmlcommon::breadcrumbs(
-                         &mt('Group portfolio files - [_1]',$grp_desc),
-                                                     undef,undef,undef,undef,1);
+                         &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
     return $output;
 }
 
@@ -2574,7 +2571,7 @@ sub get_quota {
     } else {
         $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
                                     $env{'user.domain'}); #expressed in MB
-        $disk_quota = 1024 * $disk_quota; # convert from MB to kB
+        $disk_quota = 1000 * $disk_quota; # convert from MB to kB
     }
     return $disk_quota;
 }
@@ -2617,45 +2614,6 @@ sub free_space {
     return $free_space;
 }
 
-sub valid_container {
-    my ($uname,$udom,$group) = @_;
-    my $container_prefix;
-    if ($group ne '') {
-        $container_prefix = "/uploaded/$udom/$uname/groups/$group/portfolio";
-    } else {
-        $container_prefix = "/uploaded/$udom/$uname/portfolio";
-    }
-    if ($env{'form.currentpath'}) {
-        $container_prefix .= $env{'form.currentpath'};
-    } else {
-        $container_prefix .= '/';
-    }
-    if ($env{'form.container'} =~ m{^\Q$container_prefix\E(.+)$}) {
-        my $filename = $1;
-        if ($filename eq &Apache::lonnet::clean_filename($filename)) {
-            return 1;
-        }
-    }
-    return;
-}
-
-sub invalid_parms {
-    my ($r,$url,$currentpath) = @_;
-    my $escpath = &HTML::Entities::encode($currentpath,'&<>"');
-    my $rtnlink = '<a href="'.$url;
-    if ($url =~ /\?/) {
-        $rtnlink .= '&';
-    } else {
-        $rtnlink .= '?';
-    }
-    $rtnlink .= 'currentpath='.$escpath;
-    $rtnlink .= '">'.&mt('Return to directory').'</a>';
-    $r->print('<h3>'.&mt('Action disallowed').'</h3>');
-    $r->print(&mt('Some of the data included with this request were invalid'));
-    $r->print('<br />'.$rtnlink);
-    return;
-}
-
 sub handler {
     # this handles file management
     my $r = shift;
@@ -2745,7 +2703,7 @@ sub handler {
 
     my $js = '<script type="text/javascript"
                 src="/res/adm/includes/file_upload.js"></script>';
-
+    
     if ($env{"form.mode"} eq 'selectfile'){
         $r->print(&Apache::loncommon::start_page($title, $js,
 						 {'only_body' => 1}));
@@ -2804,21 +2762,6 @@ sub handler {
             $r->print(&Apache::loncommon::end_page());
             return OK;
         }
-    }
-    if (($env{'form.currentpath'}) && ($env{'form.currentpath'} ne '/')) {
-        my $clean_currentpath = '/'.&Apache::loncommon::clean_path($env{'form.currentpath'}).'/';
-        unless ($env{'form.currentpath'} eq $clean_currentpath) {
-            &invalid_parms($r,$url);
-            $r->print(&Apache::loncommon::end_page());
-            return OK;
-        }
-    }
-    if ($env{'form.container'}) {
-        unless (&valid_container($uname,$udom,$group)) {
-            &invalid_parms($r,$url,$env{'form.currentpath'});
-            $r->print(&Apache::loncommon::end_page());
-            return OK;
-        }
     }
     if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
    	$r->print(