Diff for /loncom/interface/lonfeedback.pm between versions 1.198 and 1.201

version 1.198, 2006/05/09 20:00:44 version 1.201, 2006/05/09 20:54:55
Line 1328  sub mail_screen { Line 1328  sub mail_screen {
   my $attachnum = 0;    my $attachnum = 0;
   my $anonchk = (<<END);    my $anonchk = (<<END);
   function anonchk() {    function anonchk() {
       if (document.mailform.discuss[0].checked) {        for (var i=0; i < document.mailform.discuss.length; i++) {
   document.attachment.discuss.value = 'nonanon';    if (document.mailform.discuss[i].checked) {
       }        document.attachment.discuss.value = 
       if (document.mailform.discuss[1].checked) {    document.mailform.discuss[i].value;
   document.attachment.discuss.value = 'anon';    }
       }        }
       if (document.mailform.blog.checked) {        if (document.mailform.blog.checked) {
   document.attachment.blog.value = 1;    document.attachment.blog.value = 1;
Line 1345  END Line 1345  END
       $anonscript = (<<END);        $anonscript = (<<END);
   function setposttype() {    function setposttype() {
       var disc = "$env{'form.discuss'}";        var disc = "$env{'form.discuss'}";
       if (disc == 'nonanon') {        for (var i=0; i < document.mailform.discuss.length; i++) {
           document.mailform.discuss[0].checked=1;    if (disc == document.mailform.discuss[i].value) {
       }        document.mailform.discuss[i].checked = 1;
       if (disc == 'anon') {    }
           document.mailform.discuss[1].checked=1;  
       }        }
       var blog = "$env{'form.blog'}";        var blog = "$env{'form.blog'}";
       if (blog == 1) {        if (blog == 1) {
Line 2205  sub redirect_back { Line 2204  sub redirect_back {
   }    }
   $feedurl=&Apache::lonenc::check_encrypt($feedurl);    $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 %onload = ('onload' => "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }");    my %onload;
     if ($env{'environment.remote'} ne 'off') {
         $onload{'onload'} =
     "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
     }
   my $start_page=    my $start_page=
       &Apache::loncommon::start_page('New posts marked as read',undef,        &Apache::loncommon::start_page('New posts marked as read',undef,
      {'redirect'    => [2,$feedurl],       {'redirect'    => [2,$feedurl],
Line 2236  sub no_redirect_back { Line 2239  sub no_redirect_back {
   my ($r,$feedurl) = @_;    my ($r,$feedurl) = @_;
   my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');    my $nofeed=&mt('Sorry, no feedback possible on this resource  ...');
     
     my %onload;
     if ($env{'environment.remote'} ne 'off') {
         $onload{'onload'} = 
     "if (window.name!='loncapaclient') { self.window.close(); }";
     }
   
   my %body_options = ('only_body'   => 1,    my %body_options = ('only_body'   => 1,
       'bgcolor'     => '#FFFFFF',        'bgcolor'     => '#FFFFFF',
       'add_entries' => {'onload' => "if (window.name!='loncapaclient') { self.window.close(); }"});        'add_entries' => \%onload,);
   
   if ($feedurl !~ m{^/adm/feedback}) {     if ($feedurl !~ m{^/adm/feedback}) { 
       $body_options{'rediect'} = [2,$feedurl];        $body_options{'rediect'} = [2,$feedurl];
Line 3110  sub handler { Line 3119  sub handler {
       &Apache::loncommon::content_type($r,'text/html');        &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;        $r->send_http_header;
       my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');        my $logo=&Apache::loncommon::lonhttpdurl('/adm/lonIcons/lonlogos.gif');
       my %onload = ('onload' => "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }");        my %onload;
         if ($env{'environment.remote'} ne 'off') {
     $onload{'onload'} =
         "if (window.name!='loncapaclient') { this.document.reldt.submit(); self.window.close(); }";
         }
   
       my $start_page=        my $start_page=
   &Apache::loncommon::start_page('New posts marked as read',undef,    &Apache::loncommon::start_page('New posts marked as read',undef,
  {'redirect'    => [2,$feedurl],   {'redirect'    => [2,$feedurl],
Line 3416  ENDREDIR Line 3430  ENDREDIR
 # Discussion? Store that.  # Discussion? Store that.
   
       my $numpost=0;        my $numpost=0;
       if ($env{'form.discuss'}) {        if ($env{'form.discuss'} || $env{'form.anondiscuss'}) {
   my $subject = &clear_out_html($env{'form.subject'},undef,1);    my $subject = &clear_out_html($env{'form.subject'},undef,1);
   my $anonmode=($env{'form.discuss'} eq 'anon');    my $anonmode=($env{'form.discuss'} eq 'anon' || $env{'form.anondiscuss'} );
   $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,    $typestyle.=&adddiscuss($symb,$message,$anonmode,$attachmenturl,
   $subject);    $subject);
   $numpost++;    $numpost++;

Removed from v.1.198  
changed lines
  Added in v.1.201


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