--- loncom/interface/portfolio.pm	2005/05/02 19:08:16	1.85
+++ loncom/interface/portfolio.pm	2006/03/15 19:41:26	1.95
@@ -34,67 +34,108 @@ use Apache::lonnet;
 # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
-    my ($filename, $current_path, $current_mode, $field_name, $continue_select) = @_;
+    my ($url, $filename, $current_path, $current_mode, $field_name,
+        $continue_select,$group) = @_;
     if ($continue_select ne 'true') {$continue_select = 'false'};
-    my $anchor = '<a href="/adm/portfolio?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name.'">'.$filename.'</a>';
+    my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&currentpath='.$current_path.'&mode='.$current_mode.'&continue='.$continue_select.'&fieldname='.$field_name;
+    if (defined($group)) {
+        $anchor .= '&group='.$group;
+    }
+    $anchor .= '">'.$filename.'</a>';
     return $anchor;
 }
 my $dirptr=16384;
 sub display_common {
-    my ($r,$current_path,$is_empty,$dir_list)=@_;
+    my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
+    my $groupitem;
+    my $namespace = &get_namespace($group);
+    my $port_path = &get_port_path($group);
+    if (defined($group)) {
+        $groupitem = '<input type="hidden" name="group" value="'.$group.'" />';
+    } 
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
-    $r->print('<table border="0" cellspacing="2" cellpadding="2"><tr valign="middle">');
-    $r->print('<td bgcolor="#ccddaa" align="center">');
-    my $displayOut = '<form method="post" enctype="multipart/form-data">';
-    $displayOut .= '<input name="uploaddoc" type="file" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-        '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'.
-        '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'.
-        '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'. 
-        '<input type="submit" name="storeupl" value="Upload" />'.
-        '</form>';
-    $r->print($displayOut);
-    $r->print('</td></tr><tr><td bgcolor="#ccddaa" align="center">');
-    $displayOut = '<form method="post">';
-    $displayOut .= '<input name="newdir" type="input" />'.
-        '<input type="hidden" name="currentpath" value="'.$current_path.'" />'.
-        '<input type="hidden" name="action" value="'.$env{"form.action"}.'" />'.
-        '<input type="hidden" name="fieldname" value="'.$env{"form.fieldname"}.'" />'.
-        '<input type="hidden" name="mode" value="'.$env{"form.mode"}.'" />'. 
-        '<input type="submit" name="createdir" value="'.&mt("Create Directory").'" />'.
-        '</form>';
-    $r->print($displayOut);
-    $r->print('</td></tr></table>');
+    my %text=&Apache::lonlocal::texthash('upload' => 'Upload',
+					 'upload_label' =>  
+					 'Upload file to current directory:',
+					 'createdir' => 'Create Subdirectory',
+					 'createdir_label' => 
+					 'Create subdirectory in current directory:');
+    $r->print(<<"TABLE"); 
+<table border="0" cellspacing="2" cellpadding="2">
+  <form method="post" enctype="multipart/form-data">
+    <tr valign="middle">
+      <td bgcolor="#ccddaa" align="right">
+        $text{'upload_label'}
+      </td>
+      <td bgcolor="#ccddaa" align="left">$groupitem
+        <input name="uploaddoc" type="file" />
+	<input type="hidden" name="currentpath" value="$current_path" />
+	<input type="hidden" name="action" value="$env{"form.action"}" />
+	<input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
+	<input type="hidden" name="mode" value="$env{"form.mode"}" />
+	<input type="submit" name="storeupl" value="$text{'upload'}" />
+      </td>
+    </tr>
+  </form>
+  <form method="post">
+    <tr>
+      <td bgcolor="#ccddaa" align="right">
+        $text{'createdir_label'}
+      </td>
+      <td bgcolor="#ccddaa" align="left">
+        <input name="newdir" type="input" />$groupitem
+        <input type="hidden" name="currentpath" value="$current_path" />
+        <input type="hidden" name="action" value="$env{"form.action"}" />
+        <input type="hidden" name="fieldname" value="$env{"form.fieldname"}" />
+        <input type="hidden" name="mode" value="$env{"form.mode"}" />
+        <input type="submit" name="createdir" value="$text{'createdir'}" />
+      </td>
+    </tr>
+  </form>
+</table>
+TABLE
     my @tree = split (/\//,$current_path);
-    $r->print('<font size="+2">'.&make_anchor('portfolio','/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
+    $r->print('<font size="+2">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"},$group).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');
+            $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"},$group).'/');
         }
     }
     $r->print('</font>');
-    &Apache::lonhtmlcommon::store_recent('portfolio',$current_path,$current_path);
-    $r->print('<br /><form method=post action="/adm/portfolio?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"}.'">'.
-	      &Apache::lonhtmlcommon::select_recent('portfolio','currentpath',
+    &Apache::lonhtmlcommon::store_recent($namespace,$current_path,$current_path);
+    $r->print('<br /><form method=post action="'.$url.'?mode='.$env{"form.mode"}.'&fieldname='.$env{"form.fieldname"});
+    if (defined($group)) {
+        $r->print('&group='.$group);
+    }
+    $r->print('">'.
+	      &Apache::lonhtmlcommon::select_recent($namespace,'currentpath',
 						    'this.form.submit();'));
     $r->print("</form>");
 }
 sub display_directory {
-    my ($r,$current_path,$is_empty,$dir_list)=@_;
+    my ($r,$url,$current_path,$is_empty,$dir_list,$group)=@_;
     my $iconpath= $r->dir_config('lonIconsURL') . "/";
+    my ($groupitem,$groupecho);
     my $display_out;
     my $select_mode;
     my $checked_files;
-    my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($env{'user.domain'},$env{'user.name'});
+    my $port_path = &get_port_path($group);
+    my ($uname,$udom) = &get_name_dom($group);
+    my $namespace = &get_namespace($group); 
+    if (defined($group)) {
+       $groupitem = '<input type="hidden" name="group" value="'.$group.'" />'; 
+       $groupecho = '&amp;group='.$group;
+    }
+    my %locked_files = &Apache::lonnet::get_marked_as_readonly_hash ($namespace,$udom,$uname);
     if ($env{"form.mode"} eq 'selectfile'){
 	&select_files($r);
-	$checked_files =&Apache::lonnet::files_in_path($env{'user.name'},$env{'form.currentpath'});
+	$checked_files =&Apache::lonnet::files_in_path($uname,$env{'form.currentpath'});
 	$select_mode = 'true';
     } 
     if ($is_empty && ($current_path ne '/')) {
-        $display_out = '<form method="post" action="/adm/portfolio">'.
+        $display_out = '<form method="post" action="'.$url.'">'.$groupitem.
         '<input type="hidden" name="action" value="deletedir" />'.
         '<input type="submit" name="deletedir" value="'.&mt("Delete Directory").'" />'.
         '<input type="hidden" name="selectfile" value="" />'.
@@ -107,14 +148,17 @@ sub display_directory {
     if ($select_mode eq 'true') {
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
             '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
-        $r->print('<form method="post" name="checkselect" action="/adm/portfolio">');
+        $r->print('<form method="post" name="checkselect" action="'.$url.'">');
     } else {
         $r->print('<table border="0" cellspacing="2" cellpadding="2">'.
             '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
-        $r->print('<form method="post" action="/adm/portfolio">');
+        $r->print('<form method="post" action="'.$url.'">');
+    }
+    if (defined($group)) {
+        $r->print("\n".$groupitem."\n");
     }
-    my $href_location="/uploaded/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";
-    my $href_edit_location="/editupload/$env{'user.domain'}/$env{'user.name'}/portfolio$current_path";
+    my $href_location="/uploaded/$udom/$uname/$port_path".$current_path;
+    my $href_edit_location="/editupload/$udom/$uname/$port_path".$current_path;
     foreach my $line (sort 
 		      { 
 			  my ($afile)=split('&',$a,2);
@@ -125,7 +169,7 @@ sub display_directory {
     	#$dom 
     	my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     	$filename =~ s/\s+$//;
-    	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(.*)\.(.*)/)) {
+    	if (($filename ne '.') && ($filename ne '..') && ($filename !~ /\.meta$/ ) && ($filename !~ /(.*)\.(\d+)\.([^\.]*)$/)) {
             if ($dirptr&$testdir) {
                 if ($select_mode eq 'true'){
                     $r->print('<tr bgcolor="#FFAA99"><td><img src="'.$iconpath.'folder_closed.gif"></td>');
@@ -133,7 +177,7 @@ sub display_directory {
                     $r->print('<tr bgcolor="#FFAA99"><td colspan="2"><img src="'.$iconpath.'folder_closed.gif"></td>');
                 }
                 $r->print('<td>Go to ...</td>');
-                $r->print('<td>'.&make_anchor($filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'</td>'); 
+                $r->print('<td>'.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'},$group).'</td>'); 
                 $r->print('</tr>'); 
             } else {
                 $r->print('<tr bgcolor="#CCCCFF">');
@@ -145,15 +189,17 @@ sub display_directory {
                     $r->print('></td>');
                 } else {
                     if (exists $locked_files{$current_path.$filename}){
-                        $r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>');
+                        $r->print('<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.$groupecho.'">Locked</a></td>');
                     } else {
+			my $cat='<img alt="'.&mt('Catalog Information').
+			    '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                         $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
-                            <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a></td>
-                            <td><a href="'.$href_edit_location.$filename.'.meta">Meta</a>
+                            <a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.$groupecho.'">Rename</a></td>
+                            <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
                             </td>');
                     }
                 }
-                $r->print('<td><img src="'.$iconpath.'unknown.gif"></td>');
+                $r->print('<td><img src="'.&Apache::loncommon::icon($filename).'"></td>');
                 $r->print('<td><a href="'.$href_location.$filename.'">'.
 			    $filename.'</a></td>'); 
                 $r->print('<td>'.$size.'</td>');
@@ -181,9 +227,9 @@ sub display_directory {
 }
 
 sub open_form {
-    my ($r)=@_;
+    my ($r,$url)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
-    $r->print('<form method="post" action="/adm/portfolio">');
+    $r->print('<form method="post" action="'.$url.'">');
     $r->print('<input type="hidden" name="action" value="'.
 	      $env{'form.action'}.'" />');
     $r->print('<input type="hidden" name="confirmed" value="1" />');
@@ -196,16 +242,23 @@ sub open_form {
 }
 
 sub close_form {
-    my ($r)=@_;
-    $r->print('<p><input type="submit" value="'.&mt('Continue').
-	      '" /></p></form>');
-    $r->print('<form action="/adm/portfolio" method="POST">
+    my ($r,$url,$group)=@_;
+    $r->print('<p><input type="submit" value="'.&mt('Continue').'" />');
+    if (defined($group)) {
+       $r->print("\n".'<input type="hidden" name="group" value="'.
+              $group.'" />');
+    }
+    $r->print('</p></form>');
+    $r->print('<form action="'.$url.'" method="POST">
                <p>
               <input type="hidden" name="currentpath" value="'.
-	      $env{'form.currentpath'}.'" />
-                 <input type="submit" value="'.&mt('Cancel').'" />
-               </p></form>');
-
+	      $env{'form.currentpath'}.'" />');
+    if (defined($group)) {
+       $r->print("\n".'<input type="hidden" name="group" value="'.
+              $group.'" />');
+    }
+    $r->print("\n".'   <input type="submit" value="'.&mt('Cancel').'" />
+               </p></form>'); 
 }
 
 sub display_file {
@@ -226,45 +279,50 @@ sub display_file {
 }
 
 sub done {
-    my ($message)=@_;
+    my ($message,$url,$group)=@_;
     unless (defined $message) {
         $message='Done';
     }
-    return ('<h3><a href="/adm/portfolio?currentpath='.
-	    $env{'form.currentpath'}.
-	    '&fieldname='.$env{'form.fieldname'}.
-	    '&mode='.$env{'form.mode'}.
-	    '">'.&mt($message).'</a></h3>');
+    my $result = '<h3><a href="'.$url.'?currentpath='.
+	         $env{'form.currentpath'}.
+	         '&fieldname='.$env{'form.fieldname'}.
+	         '&mode='.$env{'form.mode'};
+    if (defined($group)) {
+        $result .= '&group='.$group;
+    }
+    $result .= '">'.&mt($message).'</a></h3>';
+    return $result;
 }
 
 sub delete {
-    my ($r)=@_;
+    my ($r,$url,$group)=@_;
     my @check;
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
-
-    if (&Apache::lonnet::is_locked($file_name,$env{'user.domain'},$env{'user.name'} ) eq 'true') {
+    my ($uname,$udom) = &get_name_dom($group);
+    if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be deleted.<br />");
-        $r->print(&done('Back'));
+        $r->print(&done('Back',$url,$group));
     } else {
         if (scalar(@files)) {
-            &open_form($r);
+            &open_form($r,$url);
             $r->print('<p>'.&mt('Delete').' '.&display_file(undef,\@files).'?</p>');
-            &close_form($r);
+            &close_form($r,$url,$group);
         } else {
             $r->print("No file was checked to delete.<br />");
-            $r->print(&done());
+            $r->print(&done(undef,$url,$group));
         }
     }
 } 
 
 sub delete_confirmed {
-    my ($r)=@_;
+    my ($r,$url,$group)=@_;
     my @files=&Apache::loncommon::get_env_multiple('form.selectfile');
     my $result;
+    my ($uname,$udom) = &get_name_dom($group);
+    my $port_path = &get_port_path($group);
     foreach my $delete_file (@files) {
-        $result=&Apache::lonnet::removeuserfile($env{'user.name'},
-					       $env{'user.domain'},'portfolio'.
+        $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $env{'form.currentpath'}.
 					       $delete_file);
         if ($result ne 'ok') {
@@ -272,22 +330,24 @@ sub delete_confirmed {
 		  ') while trying to delete '.&display_file(undef, $delete_file).'</font><br />');
         }
     }
-    $r->print(&done());
+    $r->print(&done(undef,$url,$group));
 }
 
 sub delete_dir {
-    my ($r)=@_;
-    &open_form($r);
+    my ($r,$url,$group)=@_;
+    &open_form($r,$url);
     $r->print('<p>'.&mt('Delete').' '.&display_file().'?</p>');
-    &close_form($r);
+    &close_form($r,$url,$group);
 } 
 
 sub delete_dir_confirmed {
-    my ($r)=@_;
+    my ($r,$url,$group)=@_;
     my $directory_name = $env{'form.currentpath'};
     $directory_name =~ s|/$||; # remove any trailing slash
-    my $result=&Apache::lonnet::removeuserfile($env{'user.name'},
-					       $env{'user.domain'},'portfolio'.
+    my ($uname,$udom) = &get_name_dom($group);
+    my $namespace = &get_namespace($group);
+    my $port_path = &get_port_path($group);
+    my $result=&Apache::lonnet::removeuserfile($uname,$udom,$port_path.
 					       $directory_name);
 					       
     if ($result ne 'ok') {
@@ -296,7 +356,7 @@ sub delete_dir_confirmed {
     } else {
         # now remove from recent
 #        $r->print('<br /> removing '.$directory_name.'<br /');
-        &Apache::lonhtmlcommon::remove_recent('portfolio',[$directory_name.'/']);
+        &Apache::lonhtmlcommon::remove_recent($namespace,[$directory_name.'/']);
         my @dirs = split m!/!, $directory_name;
         
 #        $directory_name =~ m/^(\/*\/)(\/*.)$/;
@@ -306,37 +366,40 @@ sub delete_dir_confirmed {
         }
         $env{'form.currentpath'} = $directory_name;
     }
-    $r->print(&done());
+    $r->print(&done(undef,$url,$group));
 }
 
 sub rename {
-    my ($r)=@_;
+    my ($r,$url,$group)=@_;
     my $file_name = $env{'form.currentpath'}.$env{'form.rename'};
-    if (&Apache::lonnet::is_locked($file_name,$env{'user.domain'},$env{'user.name'}) eq 'true') {
+    my ($uname,$udom) = &get_name_dom($group);
+    if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
         $r->print ("The file is locked and cannot be renamed.<br />");
-        $r->print(&done());
+        $r->print(&done(undef,$url,$group));
     } else {
-        &open_form($r);
+        &open_form($r,$url);
         $r->print('<p>'.&mt('Rename').' '.&display_file().' to 
                    <input name="filenewname" type="input" size="50" />?</p>');
-        &close_form($r);
+        &close_form($r,$url,$group);
     }
 }
 
 sub rename_confirmed {
-    my ($r)=@_;
+    my ($r,$url,$group)=@_;
     my $filenewname=&Apache::lonnet::clean_filename($env{'form.filenewname'});
+    my ($uname,$udom) = &get_name_dom($group);
+    my $port_path = &get_port_path($group);
     if ($filenewname eq '') {
 	$r->print('<font color="red">'.
 		  &mt("Error: no valid filename was provided to rename to.").
 		  '</font><br />');
-	$r->print(&done());
+	$r->print(&done(undef,$url,$group));
 	return;
     } 
     my $result=
-	&Apache::lonnet::renameuserfile($env{'user.name'},$env{'user.domain'},
-            'portfolio'.$env{'form.currentpath'}.$env{'form.selectfile'},
-            'portfolio'.$env{'form.currentpath'}.$filenewname);
+	&Apache::lonnet::renameuserfile($uname,$udom,
+            $port_path.$env{'form.currentpath'}.$env{'form.selectfile'},
+            $port_path.$env{'form.currentpath'}.$filenewname);
     if ($result ne 'ok') {
 	$r->print('<font color="red"> An errror occured ('.$result.
 		  ') while trying to rename '.&display_file().' to '.
@@ -345,10 +408,10 @@ sub rename_confirmed {
     if ($filenewname ne $env{'form.filenewname'}) {
         $r->print("The new file name was changed from:<br /><strong>".$env{'form.filenewname'}."</strong> to <strong>$filenewname </strong>");
     }
-    $r->print(&done());
+    $r->print(&done(undef,$url,$group));
 }
 sub select_files {
-    my ($r)=@_;
+    my ($r,$group)=@_;
     if ($env{'form.continue'} eq 'true') {
         # here we update the selections for the currentpath
         # eventually, have to handle removing those not checked, but . . . 
@@ -387,67 +450,71 @@ ENDSMP
 ENDSMP
     $r->print($javascript);
     $r->print("<h1>Select portfolio files</h1>
-                Check as many as you wish in response to the essay problem.<br />");
-    $r->print("<strong>Files selected from other directories:</strong><br />");
-    foreach (&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'})) {
-        $r->print($_."<br />");
+                Check as many as you wish in response to the problem.<br />");
+    my @otherfiles=&Apache::lonnet::files_not_in_path($env{'user.name'}, $env{'form.currentpath'});
+    if (@otherfiles) {
+	$r->print("<strong>Files selected from other directories:</strong><br />");
+	foreach my $file (@otherfiles) {
+	    $r->print($file."<br />");
+	}
     }
 }
 sub upload {
-    my ($r)=@_;
+    my ($r,$url,$group)=@_;
     my $fname=$env{'form.uploaddoc.filename'};
     my $filesize = (length($env{'form.uploaddoc'})) / 1000; #express in k (1024?)
     my $disk_quota = 20000; # expressed in k
     $fname=&Apache::lonnet::clean_filename($fname);
-    my $portfolio_root = &Apache::loncommon::propath($env{'user.domain'},
-						 $env{'user.name'}).
-						'/userfiles/portfolio';
+
+    my $portfolio_root=&get_portfolio_root($group);
+    my ($uname,$udom) = &get_name_dom($group);
+    my $port_path = &get_port_path($group);
     # Fixme --- Move the checking for existing file to LOND error return
-    my @dir_list=&Apache::lonnet::dirlist($env{'form.currentpath'},
-					  $env{'user.domain'},
-					  $env{'user.name'},$portfolio_root);
+    my @dir_list=&get_dir_list($portfolio_root,$group);
     my $found_file = 0;
     my $locked_file = 0;
     foreach my $line (@dir_list) {
         my ($file_name)=split(/\&/,$line,2);
         if ($file_name eq $fname){
             $found_file = 1;
-            if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$env{'user.domain'},$env{'user.name'} ) eq 'true') {
+            if (&Apache::lonnet::is_locked($env{'form.currentpath'}.$file_name,$udom,$uname) eq 'true') {
                 $locked_file = 1;
             } 
         }
     }
-    my $current_disk_usage = &Apache::lonnet::diskusage($env{'user.domain'}, $env{'user.name'},$portfolio_root);
-    if ((($current_disk_usage/1000) + $filesize) > $disk_quota){
-        $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes</strong>. Disk quota will be exceeded.'.
+    my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,$portfolio_root);
+    if (($current_disk_usage + $filesize) > $disk_quota){
+        $r->print('<font color="red">Unable to upload <strong>'.$fname.' (size = '.$filesize.' kilobytes)</strong>. Disk quota will be exceeded.'.
                   '<br />Disk quota is '.$disk_quota.' kilobytes. Your current disk usage is '.$current_disk_usage.' kilobytes.');
-        $r->print(&done('Back'));
+        $r->print(&done('Back',$url,$group));
     } 
     elsif ($found_file){
         if ($locked_file){
-            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>portfolio'.$env{'form.currentpath'}.'</strong></font>'.
+            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a <strong>locked</strong> file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.
                   '<br />You will be able to rename or delete existing '.$fname.' after a grade has been assigned.');
-            $r->print(&done('Back'));      
+            $r->print(&done('Back',$url,$group));      
         } else {   
-            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>portfolio'.$env{'form.currentpath'}.'</strong></font>'.
-                  '<br />To upload, rename or delete existing '.$fname.' in portfolio'.$env{'form.currentpath'});
-            $r->print(&done('Back'));
+            $r->print('<font color="red">Unable to upload <strong>'.$fname.'</strong>, a file by that name was found in <strong>'.$port_path.$env{'form.currentpath'}.'</strong></font>'.
+                  '<br />To upload, rename or delete existing '.$fname.' in '.$port_path.$env{'form.currentpath'});
+            $r->print(&done('Back',$url,$group));
         }
     } else {
         my $result=&Apache::lonnet::userfileupload('uploaddoc','',
-	        	 'portfolio'.$env{'form.currentpath'});
+	        	 $port_path.$env{'form.currentpath'});
+        print STDERR "result was $result for $port_path.$env{'form.currentpath'}\n";
         if ($result !~ m|^/uploaded/|) {
             $r->print('<font color="red"> An errror occured ('.$result.
 	              ') while trying to upload '.&display_file().'</font><br />');
-	    $r->print(&done('Back'));
+	    $r->print(&done('Back',$url,$group));
         } else {
-            $r->print(&done());
+            $r->print(&done(undef,$url,$group));
         }
     }
 }
 sub lock_info {
-    my ($r) = @_;
-    my %current_permissions = &Apache::lonnet::dump('file_permissions',$env{'user.domain'},$env{'user.name'});
+    my ($r,$url,$group) = @_;
+    my ($uname,$udom) = &get_name_dom($group);
+    my %current_permissions = &Apache::lonnet::dump('file_permissions',$udom,$uname);
     my $file_name = $env{'form.lockinfo'};
     foreach my $key(keys(%current_permissions)) {
         if ($file_name eq $key) {
@@ -463,25 +530,21 @@ sub lock_info {
             }
         }    
     }
-    $r->print(&done('Back'));
+    $r->print(&done('Back',$url,$group));
     return 'ok';
 }
 sub createdir {
-    my ($r)=@_;
+    my ($r,$url,$group)=@_;
     my $newdir=&Apache::lonnet::clean_filename($env{'form.newdir'});
     if ($newdir eq '') {
     	$r->print('<font color="red">'.
 	    	  &mt("Error: no directory name was provided.").
 		      '</font><br />');
-	    $r->print(&done());
+	    $r->print(&done(undef,$url,$group));
 	    return;
-    } 
-    my $portfolio_root = &Apache::loncommon::propath($env{'user.domain'},
-						 $env{'user.name'}).
-						'/userfiles/portfolio';
-    my @dir_list=&Apache::lonnet::dirlist($env{'form.currentpath'},
-					  $env{'user.domain'},
-					  $env{'user.name'},$portfolio_root);
+    }
+    my $portfolio_root = &get_portfolio_root($group); 
+    my @dir_list=&get_dir_list($portfolio_root,$group);
     my $found_file = 0;
     foreach my $line (@dir_list) {
         my ($filename)=split(/\&/,$line,2);
@@ -493,8 +556,10 @@ sub createdir {
     	    $r->print('<font color="red"> Unable to create a directory named <strong>'.$newdir.
     	            ' </strong>a file or directory by that name already exists.</font><br />');
     } else {
-        my $result=&Apache::lonnet::mkdiruserfile($env{'user.name'},
-	         $env{'user.domain'},'portfolio'.$env{'form.currentpath'}.$newdir);
+        my ($uname,$udom) = &get_name_dom($group);
+        my $port_path = &get_port_path($group);
+        my $result=&Apache::lonnet::mkdiruserfile($uname,$udom,
+	         $port_path.$env{'form.currentpath'}.$newdir);
         if ($result ne 'ok') {
     	    $r->print('<font color="red"> An errror occured ('.$result.
 	    	      ') while trying to create a new directory '.&display_file().'</font><br />');
@@ -503,81 +568,172 @@ sub createdir {
     if ($newdir ne $env{'form.newdir'}) {
         $r->print("The new directory name was changed from:<br /><strong>".$env{'form.newdir'}."</strong> to <strong>$newdir </strong>");  
     }
-    $r->print(&done());
+    $r->print(&done(undef,$url,$group));
+}
+
+sub get_portfolio_root {
+    my ($group) = @_;
+    my ($portfolio_root,$udom,$uname,$path);
+    ($uname,$udom) = &get_name_dom($group);
+    if (defined($group)) {
+        $path = '/userfiles/groups/'.$group.'/portfolio';
+    } else {
+        $path = '/userfiles/portfolio';
+    }
+    return (&Apache::loncommon::propath($udom,$uname).$path);
+}
+
+sub get_dir_list {
+    my ($portfolio_root,$group) = @_;
+    my ($uname,$udom) = &get_name_dom($group);
+    return &Apache::lonnet::dirlist($env{'form.currentpath'},
+                                          $udom,$uname,$portfolio_root);
+}
+
+sub get_name_dom {
+    my ($group) = @_;
+    my ($uname,$udom);
+    if (defined($group)) {
+        $udom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        $uname = $env{'course.'.$env{'request.course.id'}.'.num'};
+    } else {
+        $udom = $env{'user.domain'};
+        $uname = $env{'user.name'};
+    }
+    return ($uname,$udom);
+}
+
+sub get_namespace {
+    my ($group) = @_;
+    my $namespace = 'portfolio';
+    if (defined($group)) {
+        my ($uname,$udom) = &get_name_dom($group);
+        $namespace .= '_'.$udom.'_'.$uname.'_'.$group;
+    }
+    return $namespace;
+}
+
+sub get_port_path {
+    my ($group) = @_;
+    my $port_path;
+    if (defined($group)) {
+       $port_path = "groups/$group/portfolio";
+    } else {
+       $port_path = 'portfolio';
+    }
+    return $port_path;
 }
 
 sub handler {
     # this handles file management
     my $r = shift;
-    my $portfolio_root = &Apache::loncommon::propath($env{'user.domain'},
-							 $env{'user.name'}).
-							'/userfiles/portfolio';
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['selectfile','currentpath','meta','lockinfo',
-					     'currentfile','action','fieldname','mode','rename','continue']);
+         ['selectfile','currentpath','meta','lockinfo','currentfile',
+	    'action','fieldname','mode','rename','continue','group']);
+    my ($uname,$udom,$portfolio_root,$url,$group,$caller,$title);
+    if ($r->uri =~ m|^(/adm/)([^/]+)|) {
+        $url = $1.$2;
+        $caller = $2;
+    }
+    if ($caller eq 'coursegrp_portfolio') {
+    #  Needs to be in a course
+        if (! ($env{'request.course.fn'})) {
+        # Not in a course
+            $env{'user.error.msg'}=
+     "/adm/coursegrp_portfolio:rgf:0:0:Cannot view group portfolio";
+            return HTTP_NOT_ACCEPTABLE;
+        }
+        my $earlyout = 0;
+        my $view_permission = &Apache::lonnet::allowed('vcg',
+                                                $env{'request.course.id'});
+        $group = $env{'form.group'};
+        $group =~ s/\W//g;
+        if ($group) {
+            my %curr_groups = ();
+            ($uname,$udom) = &get_name_dom($group);
+            if (&Apache::loncommon::coursegroups(\%curr_groups,$udom,$uname,
+                                                       $group)) {
+                if (($view_permission) || (&Apache::lonnet::allowed('rgf',
+                                      $env{'request.course.id'}.'/'.$group))) {
+                    $portfolio_root = &get_portfolio_root($group);
+                } else {
+                    $r->print('You do not have the privileges required to access the shared files space for this group');
+                    $earlyout = 1;
+                }
+            } else {
+                $r->print('Not a valid group for this course');
+                $earlyout = 1;
+            }
+            $title = &mt('Group files').' for '.$group; 
+        } else {
+            $r->print('Invalid group');
+            $earlyout = 1;
+        }
+        if ($earlyout) { return OK; }
+    } else {
+        ($uname,$udom) = &get_name_dom();
+        $portfolio_root = &get_portfolio_root();
+        $title = &mt('Portfolio Manager');
+    }
+
     &Apache::loncommon::no_cache($r);
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     # Give the LON-CAPA page header
     my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html.'<head><title>'.
-              &mt('Portfolio Manager').
-              "</title></head>\n");
+    $r->print($html.&Apache::loncommon::head($title)."\n");
     if ($env{"form.mode"} eq 'selectfile'){
-        $r->print(&Apache::loncommon::bodytag('Portfolio Manager',undef,undef,1));
+        $r->print(&Apache::loncommon::bodytag($title,undef,undef,1));
     } else {
-        $r->print(&Apache::loncommon::bodytag('Portfolio Manager'));
+        $r->print(&Apache::loncommon::bodytag($title));
     }
     $r->rflush();
-	if (($env{'form.storeupl'} eq 'Upload') & (!$env{'form.uploaddoc.filename'})){
+	if (($env{'form.storeupl'}) & (!$env{'form.uploaddoc.filename'})){
    	    $r->print('<font color="red"> No file was selected to upload.'.
    	            'To upload a file, click <strong>Browse...</strong>'.
    	            ', select a file, then click <strong>Upload</strong>,</font>');
 	}
     if ($env{'form.meta'}) {
-        &open_form($r);
+        &open_form($r,$url);
 #        $r->print(&edit_meta_data($r, $env{'form.currentpath'}.$env{'form.selectfile'}));
         $r->print('Edit the meta data<br />');
-        &close_form($r);
+        &close_form($r,$url,$group);
     }
     if ($env{'form.store'}) {
     }
 
     if ($env{'form.uploaddoc.filename'}) {
-	&upload($r);
+	&upload($r,$url,$group);
     } elsif ($env{'form.action'} eq 'delete' && $env{'form.confirmed'}) {
-	&delete_confirmed($r);
+	&delete_confirmed($r,$url,$group);
     } elsif ($env{'form.action'} eq 'delete') {
-	&delete($r);
+	&delete($r,$url,$group);
     } elsif ($env{'form.action'} eq 'deletedir' && $env{'form.confirmed'}) {
-	&delete_dir_confirmed($r);
+	&delete_dir_confirmed($r,$url,$group);
     } elsif ($env{'form.action'} eq 'deletedir'){
-	&delete_dir($r);
+	&delete_dir($r,$url,$group);
     } elsif ($env{'form.action'} eq 'rename' && $env{'form.confirmed'}) {
-	&rename_confirmed($r);
+	&rename_confirmed($r,$url,$group);
     } elsif ($env{'form.rename'}) {
         $env{'form.selectfile'} = $env{'form.rename'};
         $env{'form.action'} = 'rename';
-	&rename($r);
+	&rename($r,$url,$group);
     } elsif ($env{'form.createdir'}) {
-	&createdir($r);
+	&createdir($r,$url,$group);
     } elsif ($env{'form.lockinfo'}) {
-        &lock_info($r);
+        &lock_info($r,$url,$group);
     } else {
 	my $current_path='/';
 	if ($env{'form.currentpath'}) {
 	    $current_path = $env{'form.currentpath'};
 	}
-	my @dir_list=&Apache::lonnet::dirlist($current_path,
-					    $env{'user.domain'},
-					    $env{'user.name'},$portfolio_root);
+        my @dir_list=&get_dir_list($portfolio_root,$group);
 	if ($dir_list[0] eq 'no_such_dir'){
 	    # two main reasons for this:
             #    1) never been here, so directory structure not created
 	    #    2) back-button navigation after deleting a directory
 	    if ($current_path eq '/'){
-	        &Apache::lonnet::mkdiruserfile($env{'user.name'},
-					       $env{'user.domain'},'portfolio');
+	        &Apache::lonnet::mkdiruserfile($uname,$udom,'portfolio');
 	    } else {
                 # some directory that snuck in get rid of the directory
                 # from the recent pulldown, just in case
@@ -587,16 +743,15 @@ sub handler {
 	    }
 	    # now grab the directory list again, for the first time
 	    @dir_list=&Apache::lonnet::dirlist($current_path,
-					    $env{'user.domain'},
-					    $env{'user.name'},$portfolio_root);
+					    $udom,$uname,$portfolio_root);
         }
 	# need to know if directory is empty so it can be removed if desired
 	my $is_empty=(@dir_list == 2);
-	&display_common($r,$current_path,$is_empty,\@dir_list);
-        &display_directory($r,$current_path,$is_empty,\@dir_list);
-	$r->print("</body>\n</html>\n");
-	return OK;
+	&display_common($r,$url,$current_path,$is_empty,\@dir_list,$group);
+        &display_directory($r,$url,$current_path,$is_empty,\@dir_list,$group);
+	$r->print(&Apache::loncommon::end_page());
     }
+    return OK;
 }
 1;
 __END__