[LON-CAPA-cvs] cvs: loncom /interface lonfeedback.pm

[raeburn]

raeburn		Fri Mar 16 02:59:01 2012 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  - $group is set to $env{'form.group'} early in &handler() so use it.     
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.345 loncom/interface/lonfeedback.pm:1.346
--- loncom/interface/lonfeedback.pm:1.345	Fri Mar 16 01:43:48 2012
+++ loncom/interface/lonfeedback.pm	Fri Mar 16 02:59:01 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.345 2012/03/16 01:43:48 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.346 2012/03/16 02:59:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3809,7 +3809,7 @@
                     num  => 131072,
                   );
   if ($env{'form.editdisc'}) {
-      if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) {
+      if (!(&editing_allowed($env{'form.editdisc'},$group))) {
           my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
           my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
           my $feedurl=&Apache::lonnet::clutter($url);
@@ -3869,7 +3869,6 @@
       my ($symb,$idx)=split(/\:\:\:/,$env{'form.allversions'});
       ($symb)=&get_feedurl_and_clean_symb($symb);
       my $ressymb = &wrap_symb($symb);
-      my $group = $env{'form.group'};
       my $seeid;
       if (($group ne '') && (($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|))) {
           if (&check_group_priv($group,'dgp') eq 'ok') {
@@ -4034,7 +4033,7 @@
       $crs=~s/\_/\//g;
       my $seeid=&Apache::lonnet::allowed('rin',$crs);
 
-      if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$env{'form.group'}))) {
+      if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$group))) {
           &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />',                 '0','0','','',$env{'form.previous'},'','','','',
                  undef,undef,$group,);
           return OK;