--- loncom/interface/portfolio.pm	2006/06/29 18:02:58	1.121.2.4
+++ loncom/interface/portfolio.pm	2006/06/27 15:37:17	1.122
@@ -1,8 +1,3 @@
-# The LearningOnline Network
-# portfolio browser
-#
-# $Id: portfolio.pm,v 1.121.2.4 2006/06/29 18:02:58 albertel Exp $
-#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -224,7 +219,7 @@ sub display_directory {
                 }
                my $fullpath = $current_path.$filename;
                 $fullpath = &prepend_group($fullpath,$group);
-                if ($select_mode eq 'true') {
+                if ($select_mode eq 'true'){
                     $line='<td><input type="checkbox" name="checkfile" value="'.$filename.'"';
 		    if ($$checked_files{$filename} eq 'selected') {
                         $line.=" checked ";
@@ -251,55 +246,51 @@ sub display_directory {
                         }
                         $line .= '</td>';
                     }
+		    $r->print('<tr class="'.$css_class.'">');
+		    $r->print($line);
                 }
-		$r->print('<tr class="'.$css_class.'">');
-		$r->print($line);
-		my $curr_access;
-		if ($select_mode ne 'true') {
-		    my $pub_access = 0;
-		    my $guest_access = 0;
-		    my $cond_access = 0;
-		    foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
-			my ($num,$scope,$end,$start) = &unpack_acc_key($key);
-			if (($now > $start) && (!$end || $end > $now)) {
-			    if ($scope eq 'public')  {
-				$pub_access = 1;
-			    } elsif ($scope eq 'guest') {
-				$guest_access = 1;
-			    } else {
-				$cond_access = 1;
-			    }
-			}
-		    }
-		    if (!$pub_access && !$guest_access && !$cond_access) {
-			$curr_access = &mt('Private');
-		    } else {
-			my @allaccesses; 
-			if ($pub_access) {
-			    push(@allaccesses,&mt('Public'));
-			}
-			if ($guest_access) {
-			    push(@allaccesses,&mt('Passphrase-protected'));
-			}
-			if ($cond_access) {
-			    push(@allaccesses,&mt('Conditional'));
-			}
-			$curr_access = join('+ ',@allaccesses);
-		    }
-		}
-		$r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
-		$r->print('<td><a href="'.$href_location.$filename.'">'.
-			  $filename.'</a></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.$groupecho.
-			      '">'.$access_admin_text.'</a></span>');
-		}
-		$r->print('</td></tr>'.$/);
+                my $curr_access;
+                my $pub_access = 0;
+                my $guest_access = 0;
+                my $cond_access = 0;
+                foreach my $key (sort(keys(%{$access_controls{$fullpath}}))) {
+                    my ($num,$scope,$end,$start) = &unpack_acc_key($key);
+                    if (($now > $start) && (!$end || $end > $now)) {
+                        if ($scope eq 'public')  {
+                            $pub_access = 1;
+                        } elsif ($scope eq 'guest') {
+                            $guest_access = 1;
+                        } else {
+                            $cond_access = 1;
+                        }
+                    }
+                }
+                if (!$pub_access && !$guest_access && !$cond_access) {
+                    $curr_access = &mt('Private');
+                } else {
+                    my @allaccesses; 
+                    if ($pub_access) {
+                        push(@allaccesses,&mt('Public'));
+                    }
+                    if ($guest_access) {
+                        push(@allaccesses,&mt('Passphrase-protected'));
+                    }
+                    if ($cond_access) {
+                        push(@allaccesses,&mt('Conditional'));
+                    }
+                    $curr_access = join('+ ',@allaccesses);
+                }
+                $r->print('<td><img alt="" src="'.&Apache::loncommon::icon($filename).'" /></td>');
+                $r->print('<td><a href="'.$href_location.$filename.'">'.
+			    $filename.'</a></td>'); 
+                $r->print('<td>'.$size.'</td>');
+                $r->print('<td>'.&Apache::lonlocal::locallocaltime($mtime).'</td>');
+                $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.$groupecho.
+                              '">'.$access_admin_text.'</a>');
+                $r->print('</span></td></tr>');
             }
         }
     }
@@ -1447,14 +1438,6 @@ 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);
@@ -1506,7 +1489,6 @@ sub upload {
         }
     }
 }
-
 sub lock_info {
     my ($r,$url,$group) = @_;
     my ($uname,$udom) = &get_name_dom($group);
@@ -1589,23 +1571,6 @@ 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);
@@ -1734,24 +1699,17 @@ sub handler {
             $earlyout = 1;
         }
         if ($earlyout) { return OK; }
-        if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) {
+        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;
-            $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();