[BACK]Return to lonfeedback.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonfeedback.pm between versions 1.370.2.5.2.3 and 1.386

version 1.370.2.5.2.3, 2022/11/14 15:12:30 version 1.386, 2021/10/20 16:15:04
Line 1003  sub postingform_display { Line 1003  sub postingform_display {
             }              }
         }          }
     }      }
       my $postanon;
       if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
          ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
           $postanon = '<input type="submit" name="anondiscuss" value="'.$lt{'poan'}.'" />';
       }
     $postingform .= (<<ENDDISCUSS);      $postingform .= (<<ENDDISCUSS);
 <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />  <form action="/adm/feedback" method="post" name="mailform" enctype="multipart/form-data"> <input type="submit" name="discuss" value="$lt{'podi'}" />
 <input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />  $postanon<input type="hidden" name="symb" value="$ressymb" />
 <input type="hidden" name="sendit" value="true" />  <input type="hidden" name="sendit" value="true" />
 <input type="hidden" name="timestamp" value="$now" />  <input type="hidden" name="timestamp" value="$now" />
 <a name="newpost"></a>  <a name="newpost"></a>
Line 1307  sub build_posting_display { Line 1312  sub build_posting_display {
                                 @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");                                  @{$$usernamesort{$contrib{$idx.':senderdomain'}}{$contrib{$idx.':sendername'}}} = ("$idx");
                             }                              }
 # Set up for sorting by last name, then first name  # Set up for sorting by last name, then first name
                             my %names = &Apache::loncommon::getnames($contrib{$idx.':sendername'},                              my %names = &Apache::lonnet::get('environment',
                                                                      $contrib{$idx.':senderdomain'});                                   ['firstname','lastname'],$contrib{$idx.':senderdomain'},
                                     ,$contrib{$idx.':sendername'});
                             my $lastname = $names{'lastname'};                              my $lastname = $names{'lastname'};
                             my $firstname = $names{'firstname'};                              my $firstname = $names{'firstname'};
                             if ($lastname eq '') {                              if ($lastname eq '') {
Line 2109  END Line 2115  END
         $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');          $r->print('<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />');
     }      }
     $r->print(<<END);      $r->print(<<END);
 <input type="hidden" name="sendit" value="1" />  <input type="hidden" name="sendit" value="1" /><br /><br />
 <input type="button" value="$send" onclick='gosubmit();' />  <input type="button" value="$send" onclick='gosubmit();' />
 </form>  </form>
 END  END
Line 2745  sub get_post_attachments { Line 2751  sub get_post_attachments {
         $$attachments{'0'}{'filename'} = $attachmenturls;          $$attachments{'0'}{'filename'} = $attachmenturls;
         $$attachments{'0'}{'0'} = 'n';          $$attachments{'0'}{'0'} = 'n';
     }      }
   
     return;      return;
 }  }
   
 sub fail_redirect {  sub fail_redirect {
   my ($r,$feedurl,$delay) = @_;    my ($r,$feedurl) = @_;
   if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };    if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   my %lt = &Apache::lonlocal::texthash(    my %lt = &Apache::lonlocal::texthash(
                  'sorr' => 'Sorry, no recipients ...',                   'sorr' => 'Sorry, no recipients ...',
   );    );
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');    my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my %parms=('only_body'   => 1);    $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,
   if ($delay !~ /^\d+(|\.\d+)$/) {     {'redirect'  => [2,$feedurl],
       $delay = 2;      'only_body' => 1,}));
   }  
   if ($env{'form.modal'}) {  
       my $onload = 'document.forms.reldt.submit()';  
       if ($delay) {  
           my $js_delay = int(1000 * $delay);  
           $onload = "setTimeout(function(){  
                      document.forms.reldt.submit();  
                      },$js_delay);";  
       }  
       $parms{'add_entries'}={'onload' => $onload};  
   } else {  
       $parms{'redirect'}=[$delay,$feedurl];  
   }  
   $r->print(&Apache::loncommon::start_page('Feedback not sent',undef,\%parms));  
   my $windowname = 'loncapaclient';  
   $r->print(<<ENDFAILREDIR);    $r->print(<<ENDFAILREDIR);
 <img align="right" src="$logo" />  <img align="right" src="$logo" />
 <p class="LC_warning">$lt{'sorr'}</p>  <p class="LC_warning">$lt{'sorr'}</p>
 <form name="reldt" action="$feedurl" target="$windowname">  
 </form>  
 ENDFAILREDIR  ENDFAILREDIR
   $r->print(&Apache::loncommon::end_page());    $r->print(&Apache::loncommon::end_page());
 }  }
   
 sub redirect_back {  sub redirect_back {
   my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,    my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge) = @_;
       $rolefilter,$statusfilter,$sectionpick,$grouppick,$numpicks,$group,$toolarge,$delay) = @_;  
   my $sorttag = '';    my $sorttag = '';
   my $roletag = '';    my $roletag = '';
   my $statustag = '';    my $statustag = '';
Line 2883  sub redirect_back { Line 2872  sub redirect_back {
   &Apache::lonenc::check_encrypt(\$feedurl);    &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');    my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   my %parms=('only_body'   => 1);    my %parms=('only_body'   => 1);
   if ($delay !~ /^\d+(|\.\d+)$/) {  
       $delay = 0;  
   }  
   if ($env{'form.modal'}) {    if ($env{'form.modal'}) {
       my $onload = 'document.forms.reldt.submit()';        $parms{'add_entries'}={'onLoad' => 'document.forms.reldt.submit()'};
       if ($delay) {  
           my $js_delay = int(1000 * $delay);  
           $onload = "setTimeout(function(){  
                         document.forms.reldt.submit();  
                      },$js_delay);";  
       }  
       $parms{'add_entries'}={'onload' => $onload};  
   } else {    } else {
       $parms{'redirect'}=[$delay,$feedurl];        $parms{'redirect'}=[0,$feedurl];
   }    }
   my $start_page=    my $start_page=
       &Apache::loncommon::start_page('Feedback sent',undef,\%parms);        &Apache::loncommon::start_page('Feedback sent',undef,\%parms);
   my $end_page = &Apache::loncommon::end_page();    my $end_page = &Apache::loncommon::end_page();
     my $windowname = 'loncapaclient';
     if ($env{'request.lti.login'}) {
        $windowname .= 'lti';
     }
   $r->print(<<ENDREDIR);    $r->print(<<ENDREDIR);
 $start_page  $start_page
 <img align="right" src="$logo" />  <img align="right" src="$logo" />
Line 2909  $typestyle Line 2892  $typestyle
 $blog  $blog
 $toolarge  $toolarge
 <font color="red">$status</font>  <font color="red">$status</font>
 <form name="reldt" action="$feedurl" target="loncapaclient">  <form name="reldt" action="$feedurl" target="$windowname">
 $prevtag  $prevtag
 $sorttag  $sorttag
 $statustag  $statustag
Line 2924  ENDREDIR Line 2907  ENDREDIR
 }  }
   
 sub no_redirect_back {  sub no_redirect_back {
   my ($r,$feedurl,$delay) = @_;    my ($r,$feedurl) = @_;
   my $nofeed=&mt('Sorry, no feedback possible on this resource ...');    my $nofeed=&mt('Sorry, no feedback possible on this resource ...');
   my $form_for_modal;   
   my %parms=('only_body'   => 1,    my %onload;
              'bgcolor'     => '#FFFFFF',);  
   if ($delay !~ /^\d+(|\.\d+)$/) {    my %body_options = ('only_body'   => 1,
       $delay = 0;        'bgcolor'     => '#FFFFFF',
   }        'add_entries' => \%onload,);
   if ($env{'form.modal'}) {  
       if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) {    if ($feedurl !~ m{^/adm/feedback}) { 
           my $onload = 'document.forms.reldt.submit()';        $body_options{'redirect'} = [2,$feedurl];
           if ($delay) {  
               my $js_delay = int(1000 * $delay);  
               $onload = "setTimeout(function(){  
                          document.forms.reldt.submit();  
                          },$js_delay);";  
           }  
           $parms{'add_entries'}={'onload' => $onload};  
           my $windowname = 'loncapaclient';   
           $form_for_modal = <<ENDFORM;  
 <form name="reldt" action="$feedurl" target="$windowname">  
 </form>  
 ENDFORM  
       }  
   } else {  
       if (($feedurl !~ m{^/adm/feedback}) && ($feedurl ne '')) {  
           $parms{'redirect'}=[$delay,$feedurl];  
       }  
   }    }
   my $start_page=    my $start_page=
       &Apache::loncommon::start_page('Feedback not sent',undef,        &Apache::loncommon::start_page('Feedback not sent',undef,
      \%parms);       \%body_options);
         
   my $end_page = &Apache::loncommon::end_page();    my $end_page = &Apache::loncommon::end_page();
   
     &Apache::lonenc::check_encrypt(\$feedurl);
   my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');    my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
   $r->print (<<ENDNOREDIRTWO);    $r->print (<<ENDNOREDIRTWO);
 $start_page  $start_page
 <img align="right" src="$logo" />  <img align="right" src="$logo" />
 <b>$nofeed</b>  <b>$nofeed</b>
 <br />  <br />
 $form_for_modal  
 $end_page  $end_page
 ENDNOREDIRTWO  ENDNOREDIRTWO
 }  }
   
 sub screen_header {  sub screen_header {
     my ($feedurl,$symb,$group) = @_;      my ($feedurl,$symb,$group) = @_;
     my %default = &Apache::lonlocal::texthash (      my $crscontent = &mt('Question/Comment/Feedback about course content');
                     question => 'Question about resource content',      my $crspolicy = &mt('Question/Comment/Feedback about course policy');
                     comment => 'Question/Comment/Feedback about course content',  
                     policy => 'Question/Comment/Feedback about course policy',  
                   );  
     my $contribdisc = &mt('Contribution to course discussion of resource');      my $contribdisc = &mt('Contribution to course discussion of resource');
     my $anoncontrib = &mt('Anonymous contribution to course discussion of resource');      my $anoncontrib = &mt('Anonymous contribution to course discussion of resource');
     my $namevis = &mt('name only visible to course faculty');      my $namevis = &mt('name only visible to course faculty');
Line 2984  sub screen_header { Line 2947  sub screen_header {
     if ($env{'request.course.id'}) {      if ($env{'request.course.id'}) {
         $crstype = &Apache::loncommon::course_type();          $crstype = &Apache::loncommon::course_type();
         if ($crstype eq 'Community') {          if ($crstype eq 'Community') {
             $default{'comment'} = &mt('Question/Comment/Feedback about community content');              $crscontent = &mt('Question/Comment/Feedback about community content');
             $default{'policy'} = &mt('Question/Comment/Feedback about community policy');              $crspolicy = &mt('Question/Comment/Feedback about community policy');
             $contribdisc = &mt('Contribution to community discussion of resource');              $contribdisc = &mt('Contribution to community discussion of resource');
             $anoncontrib = &mt('Anonymous contribution to community discussion of resource');              $anoncontrib = &mt('Anonymous contribution to community discussion of resource');
             $namevis = &mt('name only visible to community facilitators');              $namevis = &mt('name only visible to community facilitators');
Line 2993  sub screen_header { Line 2956  sub screen_header {
     }      }
     my $msgoptions='';      my $msgoptions='';
     my $discussoptions='';      my $discussoptions='';
     my $checkradio = '';  
     my $blockblog;  
     my (%fdbkoptions,%discoptions);  
     unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {      unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
         if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {   if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
             $fdbkoptions{'author'} = 1;      $msgoptions= 
         }   '<label><input type="radio" name="discuss" value="author" /> '.
         if (&feedback_available(1)) {   &mt('Feedback to resource author').'</label><br />';
             $fdbkoptions{'question'} = 1;   }
         }          my %optionhash=();
         if (&feedback_available(0,1)) {          foreach my $type ('question','comment','policy') {
             $fdbkoptions{'course'} = 1;      $optionhash{$type}=$env{'course.'.$env{'request.course.id'}.'.'.$type.'.email.text'};
         }   }
         if (&feedback_available(0,0,1)) {   if (&feedback_available(1)) {
             $fdbkoptions{'policy'} = 1;      $msgoptions.=
         }   '<label><input type="radio" name="discuss" value="question" /> '.
    ($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label><br />';
    }
    if (&feedback_available(0,1)) {
       $msgoptions.=
    '<label><input type="radio" name="discuss" value="course" /> '.
    ($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
    '</label><br />';
    }
    if (&feedback_available(0,0,1)) {
       $msgoptions.=
    '<label><input type="radio" name="discuss" value="policy" /> '.
    ($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
    '</label><br />';
    }
     }      }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {      if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
         my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');          my ($blocked,$blocktext) = &Apache::loncommon::blocking_status('boards');
         my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};          my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};          my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
         my $realsymb = &get_realsymb($symb);          my $realsymb = &get_realsymb($symb);
         if (!$blocked && &discussion_open(undef,$realsymb) &&          if (!$blocked && &discussion_open(undef,$realsymb) && 
             (&Apache::lonnet::allowed('pch',      (&Apache::lonnet::allowed('pch',
                                       $env{'request.course.id'}.        $env{'request.course.id'}.
                                       ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) ||         ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) || 
             (($group ne '') && ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$}) && (&check_group_priv($group,'pgd') eq 'ok')))) {              (($group ne '') && ($symb =~ m{^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$}) && (&check_group_priv($group,'pgd') eq 'ok')))) {
             $discoptions{'nonanon'} = 1;  
             $discoptions{'anon'} = 1;  
             $blockblog = &Apache::loncommon::blocking_status('blogs');  
         }  
     }  
     my $total = scalar(keys(%fdbkoptions)) + scalar(keys(%discoptions));  
     return if (!$total);  
     if ($total == 1) {  
         $checkradio = ' checked="checked"';  
     }  
     if (keys(%fdbkoptions)) {  
         if ($fdbkoptions{'author'}) {  
             $msgoptions =  
                 '<label><input type="radio" name="discuss" value="author"'.$checkradio.' /> '.  
                 &mt('Feedback to resource author').'</label><br />';  
         }  
         foreach my $item ('question','comment','policy') {  
             my $type = $item;  
             if ($item eq 'comment') {  
                 $type = 'course';  
             }  
             my $optionhash=$env{'course.'.$env{'request.course.id'}.'.'.$item.'.email.text'};  
             if ($fdbkoptions{$type}) {  
                 $msgoptions .=  
                     '<label><input type="radio" name="discuss" value="'.$type.'"'.$checkradio.' />'.  
                     ($optionhash?$optionhash:$default{$item}).'</label><br />';  
             }  
         }  
     }  
     if (keys(%discoptions)) {  
         if ($discoptions{'nonanon'}) {  
             $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.              $discussoptions='<label><input type="radio" name="discuss" value="nonanon" checked="checked" /> '.
                             $contribdisc.                              $contribdisc.
                             '</label>';                              '</label>'; 
         }              if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
         if ($discoptions{'anon'}) {                 ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
             $discussoptions .= '<br /><label><input type="radio" name="discuss" value="anon"'.$checkradio.' /> '.          $discussoptions .= '<br /><label><input type="radio" name="discuss" value="anon" /> '.
                                $anoncontrib.                     $anoncontrib.
                                ' <i>('.$namevis.')</i></label> '.                     ' <i>('.$namevis.')</i></label> '.
                                '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';                     '<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
         }              }
         if (!$blockblog) {              my $blockblog = &Apache::loncommon::blocking_status('blogs');
             $discussoptions.= &add_blog_checkbox($crstype);              if (!$blockblog) {
                   $discussoptions.= &add_blog_checkbox($crstype);
               }
         }          }
     }      }
     if ($msgoptions) {      if ($msgoptions) {
Line 3150  sub feedback_available { Line 3095  sub feedback_available {
 }  }
   
 sub send_msg {  sub send_msg {
     my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,$clientip,%to)=@_;      my ($title,$feedurl,$email,$citations,$attachmenturl,$symb,%to)=@_;
     my $status='';      my $status='';
     my $sendsomething=0;      my $sendsomething=0;
     my $delay;  
     my $senthide;  
     my %setters;  
     my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =  
         &Apache::loncommon::blockcheck(\%setters,'com',$clientip);  
     if ($by_ip) {  
         $senthide = 1;  
     }  
     my $restitle = &get_resource_title($symb,$feedurl);      my $restitle = &get_resource_title($symb,$feedurl);
     if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }      if ($title=~/^Error/) { $title=&mt('Feedback').': '.$title; }
     unless ($title=~/\w/) { $title=&mt('Feedback'); }      unless ($title=~/\w/) { $title=&mt('Feedback'); }
Line 3174  sub send_msg { Line 3111  sub send_msg {
     } else {      } else {
  unless (&Apache::lonmsg::user_normal_msg($user,$domain,   unless (&Apache::lonmsg::user_normal_msg($user,$domain,
  $title.' ['.$restitle.']',$email,$citations,$feedurl,   $title.' ['.$restitle.']',$email,$citations,$feedurl,
  $attachmenturl,undef,undef,$symb,$restitle,undef,   $attachmenturl,undef,undef,$symb,$restitle)=~/ok/) {
                                                          undef,undef,undef,$senthide)=~/ok/) {  
     $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';      $status.='<br />'.&mt('Error sending message to').' '.$key.'<br />';
  } else {   } else {
     $sendsomething++;      $sendsomething++;
Line 3183  sub send_msg { Line 3119  sub send_msg {
     }      }
  }   }
     }      }
     if ($sendsomething && $senthide) {  
         if ($by_ip) {  
             my $showdom = &Apache::lonnet::domain($blockdom);  
             if ($showdom eq '') {  
                 $showdom = $blockdom;  
             }  
             $delay = 4;  
             $status.='<br />'.&mt("Message content of feedback you send to instructor(s) from your current IP address: [_1] will be unavailable in your 'Sent' folder.",$clientip).  
                      '<ul><li>'.  
                      &mt('This does not affect delivery of feedback to your instructor(s).').  
                      '</li><li>'.  
                      &mt('Note: some types of communication functionality are blocked for certain IP address(es).').  
                      '</li><li>'.  
                      &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',  
                          $showdom).  
                      '</li></ul><br />';  
         }  
     }  
   
 # Records of number of feedback messages are kept under the "symb" called "_feedback"  # Records of number of feedback messages are kept under the "symb" called "_feedback"
 # There are two entries within the framework of a course:  # There are two entries within the framework of a course:
Line 3218  sub send_msg { Line 3136  sub send_msg {
     }      }
         }          }
     }      }
     return ($status,$sendsomething,$delay);      return ($status,$sendsomething);
 }  }
   
 # Routine to get the complete feedback records  # Routine to get the complete feedback records
Line 3642  sub modify_attachments { Line 3560  sub modify_attachments {
    document.modattachments.action = document.modattachments.origpage.value;     document.modattachments.action = document.modattachments.origpage.value;
    document.modattachments.submit();     document.modattachments.submit();
  }   }
 </script>  </script> 
 <script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>  <script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 END  END
   
Line 4029  sub handler { Line 3947  sub handler {
           my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];            my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
           my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);            my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
           my $feedurl=&Apache::lonnet::clutter($url);            my $feedurl=&Apache::lonnet::clutter($url);
           &redirect_back($r,$feedurl,&mt('Editing not permitted').'<br />',            &redirect_back($r,$feedurl,&mt('Editing not permitted').'<br />',                     '0','0','','',$env{'form.previous'},undef,undef,undef,
                          '0','0','','',$env{'form.previous'},undef,undef,undef,                      undef,undef,undef,$group);
                          undef,undef,undef,$group);  
           return OK;            return OK;
       }        }
   }     } 
Line 4174  sub handler { Line 4091  sub handler {
   'only_body'   => 1,    'only_body'   => 1,
   'add_entries' => \%onload});    'add_entries' => \%onload});
       my $end_page = &Apache::loncommon::end_page();        my $end_page = &Apache::loncommon::end_page();
         my $windowname = 'loncapaclient';
         if ($env{'request.lti.login'}) {
             $windowname .= 'lti';
         }
       $r->print (<<ENDREDIR);        $r->print (<<ENDREDIR);
 $start_page  $start_page
 <img align="right" src="$logo" />  <img align="right" src="$logo" />
 $textline  $textline
 <form name="reldt" action="$feedurl" target="loncapaclient">  <form name="reldt" action="$feedurl" target="$windowname">
 </form>  </form>
 <br />  <br />
 $end_page  $end_page
Line 4238  ENDREDIR Line 4159  ENDREDIR
       unless (($seehidden) || (&editing_allowed($env{'form.hide'},$group))) {        unless (($seehidden) || (&editing_allowed($env{'form.hide'},$group))) {
           &redirect_back($r,$feedurl,&mt('Hiding not permitted').'<br />',            &redirect_back($r,$feedurl,&mt('Hiding not permitted').'<br />',
                          '0','0','','',$env{'form.previous'},'','','','',                           '0','0','','',$env{'form.previous'},'','','','',
                          undef,undef,$group);                           undef,undef,$group,);
           return OK;            return OK;
       }        }
   
Line 4670  ENDREDIR Line 4591  ENDREDIR
   $r->internal_redirect('/adm/ambiguous');    $r->internal_redirect('/adm/ambiguous');
   return OK;    return OK;
       }        }
       if ($feedurl eq '') {  
           &Apache::loncommon::content_type($r,'text/html');  
           $r->send_http_header;  
           &no_redirect_back($r);  
           return OK;  
       }  
 # Go ahead with feedback, no ambiguous reference  # Go ahead with feedback, no ambiguous reference
       unless (        unless (
   (    (
Line 4686  ENDREDIR Line 4601  ENDREDIR
   ||    ||
   ($env{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))    ($env{'request.course.id'} && ($symb=~/^bulletin\_\_\_/))
           ||            ||
           (($env{'request.course.id'}) && ($feedurl =~ /ext\.tool$/))            (($env{'request.course.id'} && ($feedurl =~ /ext\.tool$/)))
   ) {    ) {
   &Apache::loncommon::content_type($r,'text/html');    &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;    $r->send_http_header;
 # Unable to give feedback  # Unable to give feedback
           &Apache::lonenc::check_encrypt(\$feedurl);            &Apache::lonenc::check_encrypt(\$feedurl);
   &no_redirect_back($r,$feedurl,2);    &no_redirect_back($r,$feedurl);
   return OK;    return OK;
       }        }
 # --------------------------------------------------- Print login screen header  # --------------------------------------------------- Print login screen header
Line 4712  ENDREDIR Line 4627  ENDREDIR
   if ($options) {    if ($options) {
       &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});        &mail_screen($r,$feedurl,$options,$symb,$attachmax{'text'});
   } else {    } else {
       &fail_redirect($r,$feedurl,2);        &fail_redirect($r,$feedurl);
   }    }
   return OK;    return OK;
       }        }
Line 4778  ENDREDIR Line 4693  ENDREDIR
       my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);        my ($typestyle,%to) = &Apache::lonmsg::decide_receiver($feedurl);
   
 # Actually send mail  # Actually send mail
       my $clientip = &Apache::lonnet::get_requestor_ip($r);        my ($status,$numsent)=&send_msg(&clear_out_html($env{'form.subject'}),
       my ($status,$numsent,$delay)=&send_msg(&clear_out_html($env{'form.subject'}),        $feedurl,$email,$citations,
              $feedurl,$email,$citations,        $attachmenturl,$usersymb,%to);
              $attachmenturl,$usersymb,$clientip,%to);  
   
 # Discussion? Store that.  # Discussion? Store that.
       my $numpost=0;        my $numpost=0;
Line 4789  ENDREDIR Line 4703  ENDREDIR
      && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)       && $env{'form.discuss'} !~ /^(?:author|question|course|policy)/)
    || $env{'form.anondiscuss'} ne '') {     || $env{'form.anondiscuss'} ne '') {
   my $subject = &clear_out_html($env{'form.subject'});    my $subject = &clear_out_html($env{'form.subject'});
   my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );            my $anonmode;
             if (&Apache::lonnet::allowed('pac',$env{'request.course.id'}.
                ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) {
         $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
             }
   $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,    $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
   $subject,$group);    $subject,$group);
   $numpost++;    $numpost++;
Line 4812  ENDREDIR Line 4730  ENDREDIR
       }        }
       
 # Receipt screen and redirect back to where came from  # Receipt screen and redirect back to where came from
       &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},        &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'},undef,undef,undef,undef,undef,undef,$group,$toolarge);
                      undef,undef,undef,undef,undef,undef,$group,$toolarge,$delay);  
   }    }
   return OK;    return OK;
 }  }
Removed from v.1.370.2.5.2.3  
changed lines
  Added in v.1.386

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>