[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface lonindexer.pm

[raeburn]

raeburn		Thu Jan 28 00:01:13 2010 EDT

  Modified files:              (Branch: version_2_9_X)
    /loncom/interface	lonindexer.pm 
  Log:
  - Backport 1.201, 1.203.
  
  
Index: loncom/interface/lonindexer.pm
diff -u loncom/interface/lonindexer.pm:1.181.4.3 loncom/interface/lonindexer.pm:1.181.4.4
--- loncom/interface/lonindexer.pm:1.181.4.3	Thu Aug 13 13:23:26 2009
+++ loncom/interface/lonindexer.pm	Thu Jan 28 00:01:13 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Directory Indexer
 #
-# $Id: lonindexer.pm,v 1.181.4.3 2009/08/13 13:23:26 raeburn Exp $
+# $Id: lonindexer.pm,v 1.181.4.4 2010/01/28 00:01:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -503,13 +503,15 @@
         $select_file_categories{''} = &mt('All file types');
         foreach my $cat (@file_categories) {
 	    my $types = join(",",&Apache::loncommon::filecategorytypes($cat));
-	    $select_file_categories{$types} = $cat;
+	    $select_file_categories{$types} = &mt($cat);
 	    push(@select_form_order,$types);
 	}
         $select_file_categories{'select_form_order'} = \@select_form_order;
         my $type_element=
-	    &Apache::loncommon::select_form($typeselect,'only',
-					    %select_file_categories);
+            &Apache::loncommon::select_form(
+                $typeselect,
+                'only',
+                %select_file_categories);
         $type_element = '<label>'.&mt('File Type Displayed: [_1]',
 				      $type_element).'</label>';
         $r->print($type_element
@@ -895,7 +897,7 @@
     }
 # Do we have permission to look at this?
 
-    if($filecom[15] ne '1') { return OK if (!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])); }
+    if($filecom[15] ne '1') { return OK if ((!&Apache::lonnet::allowed('bre',$pathprefix.$filecom[0])) && (!&Apache::lonnet::allowed('bro',$pathprefix.$filecom[0]))); }
 
 # make absolute links appear on different background
     if ($absolute) { $fileclr='#ccdd99'; }