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

Diff for /loncom/interface/lonfeedback.pm between versions 1.136 and 1.137

version 1.136, 2004/11/15 22:17:51 version 1.137, 2004/11/15 22:48:51
Line 360  imscp_v1p1.xsd http://www.imsglobal.org/ Line 360  imscp_v1p1.xsd http://www.imsglobal.org/
  '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';   '<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
     if ($visible>2) {      if ($visible>2) {
  $discussion.='<td align="left">'.   $discussion.='<td align="left">'.
     '<a href="/adm/feedback?threadedon='.$ressymb;      '<a href="/adm/feedback?cmd=threadedon&amp;symb='.$ressymb;
  if ($newpostsflag) {   if ($newpostsflag) {
     $discussion .= '&previous='.$prevread;      $discussion .= '&previous='.$prevread;
  }   }
  $discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.   $discussion .='">'.&mt('Threaded View').'</a>&nbsp;&nbsp;'.
     '<a href="/adm/feedback?threadedoff='.$ressymb;      '<a href="/adm/feedback?cmd=threadedoff&amp;symb='.$ressymb;
  if ($newpostsflag) {   if ($newpostsflag) {
     $discussion .= '&previous='.$prevread;      $discussion .= '&previous='.$prevread;
  }   }
  $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;   $discussion .='">'.&mt('Chronological View').'</a>&nbsp;&nbsp;
                               <a href= "/adm/feedback?sortfilter='.$ressymb;                                <a href= "/adm/feedback?cmd=sortfilter&amp;symb='.$ressymb;
                 if ($newpostsflag) {                  if ($newpostsflag) {
                     $discussion .= '&previous='.$prevread;                      $discussion .= '&previous='.$prevread;
                 }                  }
Line 385  imscp_v1p1.xsd http://www.imsglobal.org/ Line 385  imscp_v1p1.xsd http://www.imsglobal.org/
             $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';              $discussion .= '">'.&mt('Export').'?</a>&nbsp;&nbsp;</td>';
     if ($newpostsflag) {      if ($newpostsflag) {
  if (!$markondisp) {   if (!$markondisp) {
     $discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark NEW posts no longer new').'</a>&nbsp;&nbsp;';      $discussion .='<td align="right"><a href="/adm/feedback?markread=1&amp;symb='.$ressymb.'">'.&mt('Mark NEW posts no longer new').'</a>&nbsp;&nbsp;';
  } else {   } else {
     $discussion .= '<td>&nbsp;</td>';      $discussion .= '<td>&nbsp;</td>';
  }   }
Line 1657  $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$l Line 1657  $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$l
 </table>  </table>
 <br />  <br />
 <br />  <br />
   <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="previous" value="$previous" />  <input type="hidden" name="previous" value="$previous" />
 <input type="hidden" name="$dispchgA" value=""/>  <input type="hidden" name="$dispchgA" value=""/>
 <input type="hidden" name="$dispchgB" value=""/>  <input type="hidden" name="$dispchgB" value=""/>
Line 2737  sub handler { Line 2738  sub handler {
 # --------------------------- Get query string for limited number of parameters  # --------------------------- Get query string for limited number of parameters
   
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','threadedon','threadedoff','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortfilter','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);           ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','cmd','symb','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
   if ($ENV{'form.discsymb'}) {    if ($ENV{'form.discsymb'}) {
       my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.discsymb'});        my ($symb,$feedurl) = &get_feedurl_and_clean_symb($ENV{'form.discsymb'});
       my $readkey = $symb.'_read';        my $readkey = $symb.'_read';
Line 2824  END Line 2825  END
      $ENV{'form.rolefilter'},$ENV{'form.statusfilter'},       $ENV{'form.rolefilter'},$ENV{'form.statusfilter'},
      $ENV{'form.secpick'});       $ENV{'form.secpick'});
       return OK;        return OK;
   } elsif ($ENV{'form.sortfilter'}) {    } elsif ($ENV{'form.cmd'} eq 'sortfilter') {
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.sortfilter'});        my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
       &print_sortfilter_options($r,$symb,$ENV{'form.previous'},$feedurl);        &print_sortfilter_options($r,$symb,$ENV{'form.previous'},$feedurl);
       return OK;        return OK;
   } elsif ($ENV{'form.navtime'}) {    } elsif ($ENV{'form.navtime'}) {
Line 2896  ENDREDIR Line 2897  ENDREDIR
   } elsif ($ENV{'form.markondisp'} || $ENV{'form.markonread'} ||    } elsif ($ENV{'form.markondisp'} || $ENV{'form.markonread'} ||
    $ENV{'form.allposts'}   || $ENV{'form.onlyunread'} ||     $ENV{'form.allposts'}   || $ENV{'form.onlyunread'} ||
    $ENV{'form.onlyunmark'} || $ENV{'form.toggoff'}    ||     $ENV{'form.onlyunmark'} || $ENV{'form.toggoff'}    ||
    $ENV{'form.toggon'} ) {     $ENV{'form.toggon'}     || $ENV{'form.markread'}) {
       my $feedurl;        my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
       if ( ($ENV{'form.toggoff'}) || ($ENV{'form.toggon'}) ) {        my %discinfo;
 # ------------------------ Modify setting for read/unread toggle for each post   # ------------------------ Modify setting for read/unread toggle for each post 
           my $symb=$ENV{'form.toggoff'}?$ENV{'form.toggoff'}:$ENV{'form.toggon'};        if ($ENV{'form.toggoff'}) { $discinfo{$symb.'_readtoggle'}=1; }
   ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);        if ($ENV{'form.toggon'})  { $discinfo{$symb.'_readtoggle'}=0;  }
           my %discinfo;  
           $discinfo{$symb.'_readtoggle'}=1;  
           if ($ENV{'form.toggoff'}) { $discinfo{$symb.'_readtoggle'}=0; }  
           &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',  
      \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});  
       }  
       if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) {  
 # --------- Modify setting for identification of 'NEW' posts in this discussion  # --------- Modify setting for identification of 'NEW' posts in this discussion
           my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'};        if ($ENV{'form.markondisp'}) {
   ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);    $discinfo{$symb.'_lastread'} = time;
           my %discinfo;    $discinfo{$symb.'_markondisp'} = 1;
           my $lastkey = $symb.'_lastread';        }
           my $ondispkey = $symb.'_markondisp';        if ($ENV{'form.markonread'}) {
           if ($ENV{'form.markondisp'}) {    if ( $ENV{'form.previous'} > 0 ) {
               $discinfo{$lastkey} = time;        $discinfo{$symb.'_lastread'} = $ENV{'form.previous'};
               $discinfo{$ondispkey} = 1;    }
           } elsif ($ENV{'form.markonread'}) {    $discinfo{$symb.'_markondisp'} = 0;
               if ( $ENV{'form.previous'} > 0 ) {  
                   $discinfo{$lastkey} = $ENV{'form.previous'};  
               }  
               $discinfo{$ondispkey} = 0;  
           }  
           &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',  
      \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});  
       }        }
       if ($ENV{'form.allposts'} || $ENV{'form.onlyunread'} ||  
   $ENV{'form.onlyunmark'}) {  
 # --------------------------------- Modify display setting for this discussion   # --------------------------------- Modify display setting for this discussion 
           my $symb;        if ($ENV{'form.allposts'}) {
           if ($ENV{'form.allposts'}) {    $discinfo{$symb.'_showonlyunread'} = 0;
               $symb = $ENV{'form.allposts'};    $discinfo{$symb.'_showonlyunmark'} = 0;
           } elsif ($ENV{'form.onlyunread'}) {  
               $symb = $ENV{'form.onlyunread'};  
           } else {  
               $symb = $ENV{'form.onlyunmark'};  
           }  
   ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);  
           my %discinfo;  
           if ($ENV{'form.allposts'}) {  
               $discinfo{$symb.'_showonlyunread'} = 0;  
               $discinfo{$symb.'_showonlyunmark'} = 0;  
           } elsif ($ENV{'form.onlyunread'}) {  
               $discinfo{$symb.'_showonlyunread'} = 1;  
           } else {  
               $discinfo{$symb.'_showonlyunmark'} = 1;  
           }  
           &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',  
      \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});  
       }        }
         if ($ENV{'form.onlyunread'}) { $discinfo{$symb.'_showonlyunread'} = 1;  }
         if ($ENV{'form.onlyunmark'}) { $discinfo{$symb.'_showonlyunmark'} = 1;  }
   # ----------------------------------------------------- Mark new posts not NEW 
         if ($ENV{'form.markread'})   { $discinfo{$symb.'_lastread'} = time; }
         &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',
      \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
       my $previous=$ENV{'form.previous'};        my $previous=$ENV{'form.previous'};
       if ($ENV{'form.markondisp'}) { $previous=undef; }        if ($ENV{'form.markondisp'}) { $previous=undef; }
       &redirect_back($r,$feedurl,&mt('Changed display status').'<br />',        &redirect_back($r,$feedurl,&mt('Changed display status').'<br />',
      '0','0','',$previous);       '0','0','',$previous);
       return OK;        return OK;
   } elsif ($ENV{'form.markread'}) {  
 # ----------------------------------------------------- Mark new posts not NEW   
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.markread'});  
       &Apache::lonnet::logthis("\n last read w symb ".$symb);  
       my %discinfo;  
       $discinfo{$symb.'_lastread'} = time;  
       &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',  
    \%discinfo,$ENV{'user.domain'},$ENV{'user.name'});  
       &redirect_back($r,$feedurl,&mt('Changed reading status').'<br />',  
      '0','0');  
       return OK;  
   } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {    } elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide  # ----------------------------------------------------------------- Hide/unhide
       my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};        my $entry=$ENV{'form.hide'}?$ENV{'form.hide'}:$ENV{'form.unhide'};
Line 3007  ENDREDIR Line 2970  ENDREDIR
       &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',        &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
      '0','0','',$ENV{'form.previous'});       '0','0','',$ENV{'form.previous'});
       return OK;        return OK;
   } elsif (($ENV{'form.threadedon'}) || ($ENV{'form.threadedoff'})) {    } elsif ($ENV{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
       my $symb;        my ($symb,$feedurl)=&get_feedurl_and_clean_symb($ENV{'form.symb'});
       if ($ENV{'form.threadedon'}) {        if ($ENV{'form.cmd'} eq 'threadedon') {
   $symb=$ENV{'form.threadedon'};  
   &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});    &Apache::lonnet::put('environment',{'threadeddiscussion' => 'on'});
   &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');    &Apache::lonnet::appenv('environment.threadeddiscussion' => 'on');
       } else {        } else {
   $symb=$ENV{'form.threadedoff'};  
    &Apache::lonnet::del('environment',['threadeddiscussion']);     &Apache::lonnet::del('environment',['threadeddiscussion']);
   &Apache::lonnet::delenv('environment\.threadeddiscussion');    &Apache::lonnet::delenv('environment\.threadeddiscussion');
       }        }
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($symb);  
       &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',        &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
      '0','0','',$ENV{'form.previous'});       '0','0','',$ENV{'form.previous'});
       return OK;        return OK;
Removed from v.1.136  
changed lines
  Added in v.1.137

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