--- loncom/interface/portfolio.pm	2006/06/28 19:52:43	1.124
+++ loncom/interface/portfolio.pm	2006/07/08 01:51:07	1.133
@@ -1,3 +1,8 @@
+# The LearningOnline Network
+# portfolio browser
+#
+# $Id: portfolio.pm,v 1.133 2006/07/08 01:51:07 raeburn Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -31,6 +36,7 @@ use Apache::lonfeedback;
 use Apache::lonlocal;
 use Apache::lonnet;
 use Apache::longroup;
+use Apache::lonhtmlcommon;
 use HTML::Entities;
 use LONCAPA;
 
@@ -178,6 +184,7 @@ sub display_directory {
     my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
     my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     my @dir_lines;
+    my @version_lines;
     my %versioned;
     foreach my $line (sort 
 		      { 
@@ -191,14 +198,26 @@ sub display_directory {
     	$filename =~ s/\s+$//;
     	my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if ($version) {
-    	    $versioned{$fname} .= $version.",";
+    	    push(@version_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
+    	    $versioned{$fname.'.'.$extension} .= $version.",";
+    	} else {
+    	    push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     	}
-        push(@dir_lines, [$filename,$dom,$testdir,$size,$mtime,$obs]);
     }
     foreach my $line (@dir_lines) {
         my ($filename,$dom,$testdir,$size,$mtime,$obs) = @$line;
         my ($fname,$version,$extension) = &Apache::grades::file_name_version_ext($filename);
     	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
+    	    my %version_flag;
+    	    my $show_versions;
+    	    if ($env{'form.showversions'} eq $filename) {
+    	        $show_versions = 'true';
+    	    }
+    	    if (exists($versioned{$filename})) {
+    	        $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+    	    } else {
+    	        $version_flag{$filename} = '';
+    	    }
             if ($dirptr&$testdir) {
 		my $colspan='colspan="2"';
                 if ($select_mode eq 'true'){
@@ -206,18 +225,12 @@ 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('<td>Go to ...</td>');
-                $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
+                $r->print('<td>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
                 $r->print('</tr>'); 
             } else {
 		my $css_class = 'LC_browser_file';
 		my $line;
-                my $version_flag;
-                if (exists($versioned{$fname})) {
-                   $version_flag = "*";
-                } else {
-                    $version_flag = "";
-                }
-               my $fullpath = $current_path.$filename;
+                my $fullpath = $current_path.$filename;
                 $fullpath = &prepend_group($fullpath,$group);
                 if ($select_mode eq 'true') {
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
@@ -242,7 +255,7 @@ sub display_directory {
                             my $cat='<img alt="'.&mt('Catalog Information').
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                             $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a>';
-                            $line .= '</td><td><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>';
                     }
@@ -283,7 +296,7 @@ sub display_directory {
 		    }
 		}
 		$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-		$r->print('<td><a href="'.$href_location.$filename.'">'.
+		$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>');
@@ -292,17 +305,17 @@ sub display_directory {
 			      &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
 		    $r->print('<a href="'.$url.'?access='.$filename.
 			      '&amp;currentpath='.$current_path.$groupecho.
-			      '">'.$access_admin_text.'</a></span>');
+			      '">'.$access_admin_text.'</a></span></td>');
 		}
-		$r->print('</td></tr>'.$/);
+		$r->print('</tr>'.$/);
             }
         }
     }
     if ($select_mode eq 'true') {
         $r->print('</table>
-            <input type="hidden" name="continue" value="true">
-            <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'">
-            <input type="hidden" name="mode" value="selectfile">
+            <input type="hidden" name="continue" value="true" />
+            <input type="hidden" name="fieldname" value="'.$env{'form.fieldname'}.'" />
+            <input type="hidden" name="mode" value="selectfile" />
             <input type="submit" name="submit" value="Select checked files, and continue selecting." /><br />
             <input type="button" name="doit" onClick= "finishSelect();" value="Select checked files, and close window" />
             <input type="hidden" name="currentpath" value="'.$current_path.'" />
@@ -521,7 +534,7 @@ sub rename_confirmed {
 }
 
 sub display_access {
-    my ($r,$url,$group,$can_setacl) = @_;
+    my ($r,$url,$group,$can_setacl,$port_path) = @_;
     my ($uname,$udom) = &get_name_dom($group);
     my $file_name = $env{'form.currentpath'}.$env{'form.access'};
     $file_name = &prepend_group($file_name,$group);
@@ -529,7 +542,7 @@ sub display_access {
                                                                         $uname);
     my %access_controls = &Apache::lonnet::get_access_controls($current_permissions,$group,$file_name);
     my $aclcount = keys(%access_controls);
-    my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
+    my $header = '<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',$port_path.$env{'form.currentpath'}.$env{'form.access'}).'</h3>';
     my $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.').'<br /><ul><li>'.&mt('Public files are available to anyone without the need for login.').'</li><li>'.&mt('Passphrase-protected files do not require log-in, but will require the viewer to enter the passphrase you set.').'</li><li>'.&mt('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />'.&mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />'.&mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
     if ($can_setacl) {
         &open_form($r,$url);
@@ -685,7 +698,7 @@ sub build_access_summary {
 
 
 sub update_access {
-    my ($r,$url,$group) = @_;
+    my ($r,$url,$group,$port_path) = @_;
     my $totalprocessed = 0;
     my %processing;
     my %title  = (
@@ -711,7 +724,7 @@ sub update_access {
     }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
-              $file_name).'</h3>'."\n");
+              $port_path.$file_name).'</h3>'."\n");
     $file_name = &prepend_group($file_name,$group);
     my ($uname,$udom) = &get_name_dom($group);
     my ($errors,$outcome,$deloutcome,$new_values,$translation);
@@ -807,7 +820,10 @@ sub update_access {
         }
         $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
                   '&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;'.
+                  '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
+                  $group_arg.'">'.&mt('Return to directory listing').'</a>');
     }
     return;
 }
@@ -1403,11 +1419,7 @@ ENDSMP
                     fileList = fileList + document.forms.checkselect.currentpath.value + document.forms.checkselect[i].value + "," ;
                 }
             }
-            opener.document.forms.lonhomework.
-ENDSMP
-    $javascript .= $env{'form.fieldname'};
-    $javascript .= (<<ENDSMP);
-        .value=fileList;
+            opener.document.forms.lonhomework.$env{'form.fieldname'}.value=fileList;
             self.close();
         }
         </script>
@@ -1428,6 +1440,14 @@ sub upload {
     my $fname=$env{'form.uploaddoc.filename'};
     my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $disk_quota = 20000; # expressed in k
+    if (defined($group)) {
+        my $grp_quota = &get_group_quota($group); # quota expressed in k 
+        if ($grp_quota ne '') {
+            $disk_quota = $grp_quota;
+        } else {
+            $disk_quota = 0;
+        }
+    }
     $fname=&Apache::lonnet::clean_filename($fname);
 
     my $portfolio_root=&get_portfolio_root($group);
@@ -1479,6 +1499,7 @@ sub upload {
         }
     }
 }
+
 sub lock_info {
     my ($r,$url,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);
@@ -1561,6 +1582,23 @@ sub get_portfolio_root {
     return (&Apache::loncommon::propath($udom,$uname).$path);
 }
 
+sub get_group_quota {
+    my ($group) = @_;
+    my $group_quota; 
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum,$group);
+    if (%curr_groups) {
+        my %group_info =  &Apache::longroup::get_group_settings(
+                                                    $curr_groups{$group});
+        $group_quota = $group_info{'quota'}; #expressed in Mb
+        if ($group_quota) {
+            $group_quota = 1000 * $group_quota; #expressed in k
+        } 
+    }
+    return $group_quota;
+} 
+
 sub get_dir_list {
     my ($portfolio_root,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);
@@ -1641,14 +1679,32 @@ sub missing_priv {
     return;
 }
 
+sub coursegrp_portfolio_header {
+    my ($cdom,$cnum,$group,$grp_desc)=@_;
+    my $gpterm  = &Apache::loncommon::group_term();
+    my $ucgpterm = $gpterm;
+    $ucgpterm =~ s/^(\w)/uc($1)/e;
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/$cdom/$cnum/$group/smppg",
+          text=>"$ucgpterm: $grp_desc",
+          title=>"Go to group's home page"},
+         {href=>"//?group=$group",
+          text=>"Group Portfolio",
+          title=>"Display group portfolio"},);
+    my $output = &Apache::lonhtmlcommon::breadcrumbs(
+                         &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
+    return $output;
+}
+
+
 sub handler {
     # this handles file management
     my $r = shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['selectfile','currentpath','meta','lockinfo','currentfile','action',
 	  'fieldname','mode','rename','continue','group','access','setnum',
-          'cnum','cdom','type','setroles']);
-    my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
+          'cnum','cdom','type','setroles','showversions']);
+    my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title,$grp_desc);
     if ($r->uri =~ m|^(/adm/)([^/]+)|) {
         $url = $1.$2;
         $caller = $2;
@@ -1672,6 +1728,9 @@ sub handler {
             my %curr_groups = &Apache::longroup::coursegroups($udom,$uname,
 							       $group); 
             if (%curr_groups) {
+                my %grp_content = &Apache::longroup::get_group_settings(
+                                                         $curr_groups{$group});
+                $grp_desc = &unescape($grp_content{'description'});
                 if (($view_permission) || (&Apache::lonnet::allowed('rgf',
                                       $env{'request.course.id'}.'/'.$group))) {
                     $portfolio_root = &get_portfolio_root($group);
@@ -1689,17 +1748,24 @@ sub handler {
             $earlyout = 1;
         }
         if ($earlyout) { return OK; }
-        if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
-            $can_setacl = 1;
-        }
-        if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {
-            $can_upload = 1;
-        }
-        if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {
+        if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
             $can_modify = 1;
-        }
-        if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
             $can_delete = 1;
+            $can_upload = 1;
+            $can_setacl = 1;
+        } else {
+            if (&Apache::lonnet::allowed('agf',$env{'request.course.id'}.'/'.$group)) {
+                $can_setacl = 1;
+            }
+            if (&Apache::lonnet::allowed('ugf',$env{'request.course.id'}.'/'.$group)) {
+                $can_upload = 1;
+            }
+            if (&Apache::lonnet::allowed('mgf',$env{'request.course.id'}.'/'.$group)) {
+                $can_modify = 1;
+            }
+            if (&Apache::lonnet::allowed('dgf',$env{'request.course.id'}.'/'.$group)) {
+                $can_delete = 1;
+            }
         }
     } else {
         ($uname,$udom) = &get_name_dom();
@@ -1711,6 +1777,7 @@ sub handler {
         $can_setacl = 1;
     }
 
+    my $port_path = &get_port_path($group);
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
@@ -1788,10 +1855,10 @@ sub handler {
     } elsif ($env{'form.access'}) {
         $env{'form.selectfile'} = $env{'form.access'};
         $env{'form.action'} = 'chgaccess';
-        &display_access($r,$url,$group,$can_setacl);
+        &display_access($r,$url,$group,$can_setacl,$port_path);
     } elsif ($env{'form.action'} eq 'chgaccess') {
         if ($can_setacl) {
-            &update_access($r,$url,$group);
+            &update_access($r,$url,$group,$port_path);
         } else {
             &missing_priv($r,$url,'setacl',$group);
         }
@@ -1814,6 +1881,10 @@ sub handler {
 	if ($env{'form.currentpath'}) {
 	    $current_path = $env{'form.currentpath'};
 	}
+        if ($caller eq 'coursegrp_portfolio') {
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            $r->print(&coursegrp_portfolio_header($udom,$uname,$group,$grp_desc));
+        }
         my @dir_list=&get_dir_list($portfolio_root,$group);
 	if ($dir_list[0] eq 'no_such_dir'){
 	    # two main reasons for this: