--- loncom/interface/portfolio.pm	2006/07/30 19:38:13	1.140
+++ loncom/interface/portfolio.pm	2006/08/12 22:41:53	1.155
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.140 2006/07/30 19:38:13 banghart Exp $
+# $Id: portfolio.pm,v 1.155 2006/08/12 22:41:53 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,12 +66,15 @@ sub group_form_data {
 # receives a file name and path stub from username/userfiles/portfolio/
 # returns an anchor tag consisting encoding filename and currentpath
 sub make_anchor {
-    my ($url, $filename, $current_path, $current_mode, $field_name,
-        $continue_select) = @_;
-    if ($continue_select ne 'true') {$continue_select = 'false'};
-    my $anchor = '<a href="'.$url.'?selectfile='.$filename.'&amp;currentpath='.$current_path.'&amp;mode='.$current_mode.'&amp;continue='.$continue_select.'&amp;fieldname='.$field_name;
+    my ($url, $anchor_fields, $inner_text) = @_;
+    if ($$anchor_fields{'continue'} ne 'true') {$$anchor_fields{'continue'} = 'false'};
+    my $anchor = '<a href="'.$url.'?';
+    foreach my $field_name (keys(%$anchor_fields)) {
+        $anchor .= $field_name.'='.$$anchor_fields{$field_name}.'&amp;';
+    }
+    $anchor =~ s/&amp;$//;
     $anchor .= &group_args();
-    $anchor .= '">'.$filename.'</a>';
+    $anchor .= '">'.$inner_text.'</a>';
     return $anchor;
 }
 
@@ -129,12 +132,26 @@ sub display_common {
 TABLE
     }
     my @tree = split (/\//,$current_path);
-    $r->print('<span class="LC_current_location">'.&make_anchor($url,$port_path,'/',$env{"form.mode"},$env{"form.fieldname"},$env{"form.continue"}).'/');
+    my %anchor_fields = (
+        'selectfile'    => $port_path,
+        'currentpath'   => '/',
+        'mode'          => $env{"form.mode"},
+        'fieldname'     => $env{"form.fieldname"},
+        'continue'      => $env{"form.continue"}
+    );
+    $r->print('<span class="LC_current_location">'.&make_anchor($url,\%anchor_fields,$port_path).'/');
     if (@tree > 1){
         my $newCurrentPath = '';
         for (my $i = 1; $i< @tree; $i++){
             $newCurrentPath .= $tree[$i].'/';
-            $r->print(&make_anchor($url,$tree[$i],'/'.$newCurrentPath, $env{"form.mode"},$env{"form.fieldname"}, $env{"form.continue"}).'/');
+            my %anchor_fields = (
+                'selectfile' => $tree[$i],
+                'currentpath' => '/',
+                'mode' => $env{"form.mode"},
+                'fieldname' => $env{"form.fieldname"},
+                'continue' => $env{"form.continue"}
+            );
+            $r->print(&make_anchor($url,\%anchor_fields,$tree[$i]).'/');
         }
     }
     $r->print('</span>');
@@ -152,18 +169,47 @@ sub display_directory_line {
 	$href_location, $url, $current_path, $access_admin_text, $versions)=@_;
     # my ($filename,$dom,undef,$testdir,undef,undef,undef,undef,$size,undef,$mtime,undef,undef,undef,$obs,undef)=split(/\&/,$line,16); 
     $r->print('<tr class="'.$css_class.'">');
-    $r->print($line);
-    $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-    $r->print('<td>'.$$version_flag{$filename}.'<a href="'.$href_location.$filename.'">'.
-	      $filename.'</a></td>'); 
+    $r->print($line); # contains first two cells of table
+    $filename = $filename;
+    $filename = &prepend_group($filename);
+    my $lock_info;
+    if ($$version_flag{$filename}) { # versioned can't be versioned, so TRUE when root file
+        $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+        $r->print('<td>'.$$version_flag{$filename}.'</td>');
+    } else { # this is a graded or handed back file
+        my ($user,$domain) = &get_name_dom();
+        my $permissions_hash = &Apache::lonnet::get_portfile_permissions($domain,$user);
+        if (defined($filename) && defined($$permissions_hash{'/'.$filename})) {
+            foreach my $array_item (@{$$permissions_hash{'/'.$filename}}) {
+                if (ref($array_item) eq 'ARRAY') {
+                    if ($$array_item[(@$array_item - 1)] eq 'handback') {
+                        $lock_info = 'Handback';
+                    } elsif ($$array_item[(@$array_item - 1)] eq 'graded') {
+                        $lock_info = 'Graded';
+                    }
+                 }
+            }
+        }
+            if ($lock_info) {
+                my %anchor_fields = (
+                    'lockinfo' => '/'.$filename
+                );
+                $lock_info = &make_anchor(undef,\%anchor_fields,$lock_info);
+            }
+            $r->print('<td colspan="2">'.$lock_info.'</td>');
+    }
+    # $r->print('<td>'.$$version_flag{$filename}.'</td><td>');
+    $r->print('<td>'.&make_anchor($href_location.$filename,undef,$filename).'</td>'); 
     $r->print('<td>'.$size.'</td>');
     $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
     if ($select_mode ne 'true') {
 	$r->print('<td><span style="white-space: nowrap">'.
 		  &mt($curr_access).'&nbsp;&nbsp;&nbsp;');
-	$r->print('<a href="'.$url.'?access='.$filename.
-		  '&amp;currentpath='.$current_path.&group_args().
-		  '">'.$access_admin_text.'</a></span></td>');
+        my %anchor_fields = (
+            'access' => $filename,
+            'currentpath' => $current_path
+        );
+	$r->print(&make_anchor($url, \%anchor_fields, $access_admin_text).'</span></td>');
     }
     $r->print('</tr>'.$/);
 }
@@ -208,11 +254,11 @@ sub display_directory {
     if ($select_mode eq 'true') {
         $r->print('<form method="post" name="checkselect" action="'.$url.'">');
         $r->print('<table id="LC_browser">'.
-            '<tr><th>Select</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
+            '<tr><th>Select</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th></tr>');
     } else {
         $r->print('<form method="post" action="'.$url.'">');
         $r->print('<table id="LC_browser">'.
-            '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
+            '<tr><th colspan="2">Actions</th><th>&nbsp;</th><th>&nbsp;</th><th>Name</th><th>Size</th><th>Last Modified</th><th>Current Access Status</th></tr>');
     }
     $r->print("\n".&group_form_data()."\n");
 
@@ -249,13 +295,21 @@ sub display_directory {
     	        $show_versions = 'true';
     	    }
     	    if (exists($versioned{$filename})) {
+    	        my %anchor_fields = (
+    	            'selectfile' => $filename,
+    	            'continue' => 'false',
+    	            'currentpath' => $current_path,
+    	        );
     	        if ($show_versions) {
-                    $version_flag{$filename} = '<a href="portfolio"><img alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" /></a>';
+                    $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+                        '<img class="LC_icon" alt="'.&mt('opened folder').'" src="'.$iconpath.'folder_pointer_opened.gif" />');
     	        } else {
-                    $version_flag{$filename} = '<a href="portfolio?showversions='.$filename.'"><img alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" /></a>';
+    	            $anchor_fields{'showversions'} = $filename;
+                    $version_flag{$filename} = &make_anchor('portfolio',\%anchor_fields,
+                        '<img class="LC_icon" alt="'.&mt('closed folder').'" src="'.$iconpath.'folder_pointer_closed.gif" />');
                 }
     	    } else {
-    	        $version_flag{$filename} = '';
+    	        $version_flag{$filename} = '&nbsp;';
     	    }
             if ($dirptr&$testdir) {
 		my $colspan='colspan="2"';
@@ -264,7 +318,14 @@ 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>'.$version_flag{$filename}.&make_anchor($url,$filename.'/',$current_path.$filename.'/',$env{'form.mode'},$env{"form.fieldname"},$env{'form.continue'}).'/</td>'); 
+                my %anchor_fields = (
+                    'selectfile'    => $filename.'/',
+                    'currentpath'   => $current_path.$filename.'/',
+                    'mode'          => $env{"form.mode"},
+                    'fieldname'     => $env{"form.fieldname"},
+                    'continue'      => $env{"form.continue"}
+                );  
+                $r->print('<td>'.$version_flag{$filename}.'</td><td>'.&make_anchor($url,\%anchor_fields,$filename.'/').'</td>'); 
                 $r->print('</tr>'); 
             } else {
 		my $css_class = 'LC_browser_file';
@@ -279,7 +340,10 @@ sub display_directory {
 		    $line.=' /></td>';
                 } else {
                     if (exists $locked_files{$fullpath}) {
-                        $line.='<td colspan="2"><a href="'.$url.'?lockinfo='.$current_path.$filename.&group_args().'">Locked</a></td>';
+                        my %anchor_fields = (
+                            'lockinfo' => $current_path.$filename
+                        );
+                        $line.='<td colspan="2">'.&make_anchor($url,\%anchor_fields,'Locked').'</td>';
 			$css_class= 'LC_browser_file_locked';
                     } else {
                         if (!$can_modify) {
@@ -291,10 +355,15 @@ sub display_directory {
                             $line .= '<input type="checkbox" name="selectfile" value="'.$filename.'" />';
                         }
                         if ($can_modify) {
-                            my $cat='<img alt="'.&mt('Catalog Information').
+                            my $cat='<img class="LC_icon" alt="'.&mt('Catalog Information').
                             '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
-                            $line .= '<a href="'.$url.'?rename='.$filename.'&amp;currentpath='.$current_path.&group_args().'">Rename</a>';
-                            $line .= '</td><td>'.$version_flag{$filename}.'<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
+                            my %anchor_fields = (
+                                'rename' => $filename,
+                                currentpath => $current_path
+                            );
+                            $line .= &make_anchor($url,\%anchor_fields,'Rename');
+                            $line .= '</td><td>'.&make_anchor($href_edit_location.$filename.'.meta',undef,$cat);
+                            # '<a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>';
                         }
                         $line .= '</td>';
                     }
@@ -339,6 +408,7 @@ sub display_directory {
 		    foreach my $dir_line (@version_lines) {
 		        my ($v_filename,$dom,$testdir,$size,$mtime,$obs) = @$dir_line;
                         my ($v_fname,$version,$v_extension) = &Apache::grades::file_name_version_ext($v_filename);
+                        $line = '<td colspan="2">&nbsp;</td>';
                         if (($v_fname eq $fname)&&($v_extension eq $extension)) {
 		            &display_directory_line($r,$select_mode,$fullpath, $v_filename, $mtime, $size, 
 		                            $css_class, $line, \%access_controls, $curr_access, $now,
@@ -431,12 +501,12 @@ sub done {
     unless (defined $message) {
         $message='Done';
     }
-    my $result = '<h3><a href="'.$url.'?currentpath='.
-	         $env{'form.currentpath'}.
-	         '&fieldname='.$env{'form.fieldname'}.
-	         '&mode='.$env{'form.mode'}.
-		 &group_args();
-    $result .= '">'.&mt($message).'</a></h3>';
+    my %anchor_fields = (
+        'currentpath' => $env{'form.currentpath'},
+        'fieldname' => $env{'form.fieldname'},
+        'mode'      => $env{'form.mode'}
+    );
+    my $result = '<h3>'.&make_anchor($url,\%anchor_fields,&mt($message)).'</h3>';
     return $result;
 }
 
@@ -571,8 +641,17 @@ 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]',$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>';
+    my $header = '<h3>'.&mt('Allowing others to retrieve 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.');
+    $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('Conditional files are accessible to logged-in users with accounts in the LON-CAPA network, who satisfy the conditions you set.').'<br />';
+    $info .= &mt('The conditions can include affiliation with a particular course or group, or a user account in a specific domain.').'<br />';
+    $info .= &mt('Alternatively access can be granted to people with specific LON-CAPA usernames and domains.').'</li></ul>';
+    if ($group eq '') {
+        $info .= (&mt("Direct others to the 'Display file listing' link (shown when there are viewable files) on your personal information page:<br /><a href='/adm/$udom/$uname/aboutme'>http://$ENV{'SERVER_NAME'}/adm/$udom/$uname/aboutme</a>"));
+    }
+    
     if ($can_setacl) {
         &open_form($r,$url);
         $r->print($header.$info);
@@ -613,8 +692,10 @@ sub view_access_settings {
     } else {
         $r->print(&mt('No access control settings currently exist for this file.<br />' ));
     }
-    $r->print('<br /><a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
-              &group_args().'">'.&mt('Return to directory listing').'</a>');
+    my %anchor_fields = (
+        'currentpath' => $env{'form.currentpath'}
+    );
+    $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Return to directory listing')));
     return;
 }
 
@@ -747,7 +828,7 @@ sub update_access {
         }
     }
     my $file_name = $env{'form.currentpath'}.$env{'form.selectfile'};
-    $r->print('<h3>'.&mt('Allowing others to retrieve portfolio file: [_1]',
+    $r->print('<h3>'.&mt('Allowing others to retrieve file: [_1]',
               $port_path.$file_name).'</h3>'."\n");
     $file_name = &prepend_group($file_name);
     my ($uname,$udom) = &get_name_dom();
@@ -838,12 +919,13 @@ sub update_access {
         }
         &close_form($r,$url);
     } else {
-        $r->print('<br /><a href="'.$url.'?access='.$env{'form.selectfile'}.
-                  '&amp;currentpath='.$env{'form.currentpath'}.&group_args().'">'.
-                   &mt('Display all access settings for this file').'</a>'.
-                  '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.
-                  '<a href="'.$url.'?currentpath='.$env{'form.currentpath'}.
-                  &group_args().'">'.&mt('Return to directory listing').'</a>');
+        my %anchor_fields = (
+            'currentpath' => $env{'form.currentpath'},
+            'access' => $env{'form.selectfile'}
+        );
+        $r->print('<br />'.&make_anchor($url, \%anchor_fields, &mt('Display all access settings for this file')));
+        delete $anchor_fields{'access'};
+        $r->print('&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.&make_anchor($url,\%anchor_fields,&mt('Return to directory listing')));
     }
     return;
 }
@@ -1484,10 +1566,6 @@ sub upload {
             $file_name = $env{'form.currentpath'}.$file_name;
             $file_name = &prepend_group($file_name);
             $found_file = 1;
-	    # FIXME I think this is incorrect, prepend_group took care of this?
-            if (defined($group)) {
-                $file_name = $group.'/'.$file_name;
-            }
             if (&Apache::lonnet::is_locked($file_name,$udom,$uname) eq 'true') {
                 $locked_file = 1;
             } 
@@ -1539,13 +1617,24 @@ sub lock_info {
                 } else {
                     $filetext = '<strong>'.$file_name.'</strong>';
                 } 
-                $r->print(&mt('[_1] was submitted in response to problem: ',
+                if ($$array_item[(@$array_item - 1)] eq 'graded') {
+                    $r->print(&mt('[_1] was submitted in response to problem: ',
                               $filetext).
                           '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
                           '</strong><br />');
-                my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
-                $r->print(&mt('In the course: <strong>[_1]</strong><br />',
+                    my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
+                    $r->print(&mt('In the course: <strong>[_1]</strong><br />',
                               $course_description{'description'}));
+                } elsif ($$array_item[(@$array_item - 1)] eq 'handback') {
+                    $r->print(&mt('[_1] was handed back in response to problem: ',
+                              $filetext).
+                          '<strong>'.&Apache::lonnet::gettitle($$array_item[0]).
+                          '</strong><br />');
+                    my %course_description = &Apache::lonnet::coursedescription($$array_item[1]);
+                    $r->print(&mt('In the course: <strong>[_1]</strong><br />',
+                              $course_description{'description'}));
+                    
+                }
                 # $r->print('the third is '.$$array_item[2].'<br>');
                 # $r->print("item is $$array_item[0]<br> and $$array_item[0]");
             }