version 1.81, 2004/05/05 23:04:57
|
version 1.84, 2004/05/25 22:16:05
|
Line 43 sub list_discussion {
|
Line 43 sub list_discussion {
|
|| $status eq 'OPEN')) { |
|| $status eq 'OPEN')) { |
return ''; |
return ''; |
} |
} |
|
|
|
my @bgcols = ("#cccccc","#eeeeee"); |
my $discussiononly=0; |
my $discussiononly=0; |
if ($mode eq 'board') { $discussiononly=1; } |
if ($mode eq 'board') { $discussiononly=1; } |
unless ($ENV{'request.course.id'}) { return ''; } |
unless ($ENV{'request.course.id'}) { return ''; } |
Line 68 sub list_discussion {
|
Line 70 sub list_discussion {
|
my $lastkey = $ressymb.'_lastread'; |
my $lastkey = $ressymb.'_lastread'; |
my $showkey = $ressymb.'_showonlyunread'; |
my $showkey = $ressymb.'_showonlyunread'; |
my $visitkey = $ressymb.'_visit'; |
my $visitkey = $ressymb.'_visit'; |
my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey],$ENV{'user.domain'},$ENV{'user.name'}); |
my $ondispkey = $ressymb.'_markondisp'; |
|
my %dischash = &Apache::lonnet::get('nohist_'.$ENV{'request.course.id'}.'_discuss',[$lastkey,$showkey,$visitkey,$ondispkey],$ENV{'user.domain'},$ENV{'user.name'}); |
|
my %discinfo = (); |
my $showonlyunread = 0; |
my $showonlyunread = 0; |
|
my $markondisp = 0; |
my $prevread = 0; |
my $prevread = 0; |
my $previous = 0; |
my $previous = 0; |
my $visit = 0; |
my $visit = 0; |
Line 81 sub list_discussion {
|
Line 86 sub list_discussion {
|
if ($previous > 0) { |
if ($previous > 0) { |
$prevread = $previous; |
$prevread = $previous; |
} elsif (defined($dischash{$lastkey})) { |
} elsif (defined($dischash{$lastkey})) { |
$prevread = $dischash{$lastkey}; |
unless ($dischash{$lastkey} eq '') { |
|
$prevread = $dischash{$lastkey}; |
|
} |
|
} |
|
|
|
# Get discussion display default settings for user |
|
my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'}); |
|
my $discdisplay=$userenv{'discdisplay'}; |
|
if ($discdisplay eq 'unread') { |
|
$showonlyunread = 1; |
|
} |
|
my $discmarkread=$userenv{'discmarkread'}; |
|
if ($discmarkread eq 'ondisp') { |
|
$markondisp = 1; |
|
} |
|
|
|
# Override user's default if user specified display setting for this discussion |
|
if (defined($dischash{$ondispkey})) { |
|
$markondisp = $dischash{$ondispkey}; |
|
} |
|
if ($markondisp) { |
|
$discinfo{$lastkey} = time; |
} |
} |
|
|
if (defined($dischash{$showkey})) { |
if (defined($dischash{$showkey})) { |
Line 107 sub list_discussion {
|
Line 133 sub list_discussion {
|
my @replies=(); |
my @replies=(); |
my %alldiscussion=(); |
my %alldiscussion=(); |
my %notshown = (); |
my %notshown = (); |
|
my %newitem = (); |
my $maxdepth=0; |
my $maxdepth=0; |
|
|
my $target=''; |
my $target=''; |
Line 116 sub list_discussion {
|
Line 143 sub list_discussion {
|
} |
} |
|
|
my $now = time; |
my $now = time; |
my %discinfo = (); |
|
$discinfo{$visitkey} = $visit; |
$discinfo{$visitkey} = $visit; |
$discinfo{$lastkey} = $now; |
|
|
|
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); |
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); |
|
|
if ($contrib{'version'}) { |
if ($contrib{'version'}) { |
|
my $oldest = $contrib{'1:timestamp'}; |
|
if ($prevread eq '0') { |
|
$prevread = $oldest-1; |
|
} |
for (my $id=1;$id<=$contrib{'version'};$id++) { |
for (my $id=1;$id<=$contrib{'version'};$id++) { |
my $idx=$id; |
my $idx=$id; |
my $posttime = $contrib{$idx.':timestamp'}; |
my $posttime = $contrib{$idx.':timestamp'}; |
if ($prevread > 0 && $prevread <= $posttime) { |
if ($prevread <= $posttime) { |
$newpostsflag = 1; |
$newpostsflag = 1; |
} |
} |
my $hidden=($contrib{'hidden'}=~/\.$idx\./); |
my $hidden=($contrib{'hidden'}=~/\.$idx\./); |
Line 159 sub list_discussion {
|
Line 188 sub list_discussion {
|
$subject=&Apache::lontexconvert::msgtexconverted($subject); |
$subject=&Apache::lontexconvert::msgtexconverted($subject); |
} |
} |
if ($contrib{$idx.':attachmenturl'}) { |
if ($contrib{$idx.':attachmenturl'}) { |
my ($fname,$ft) |
my ($fname) |
=($contrib{$idx.':attachmenturl'}=~/\/(\w+)\.(\w+)$/); |
=($contrib{$idx.':attachmenturl'}=~m|/([^/]+)$|); |
$message.='<p>'.&mt('Attachment').': <a href="'. |
&Apache::lonnet::allowuploaded('/adm/feedback', |
&Apache::lonnet::tokenwrapper( |
$contrib{$idx.':attachmenturl'}); |
$contrib{$idx.':attachmenturl'}). |
$message.='<p>'.&mt('Attachment'). |
'"><tt>'.$fname.'.'.$ft.'</tt></a></p>'; |
': <a href="'.$contrib{$idx.':attachmenturl'}.'"><tt>'. |
|
$fname.'</tt></a></p>'; |
} |
} |
if ($message) { |
if ($message) { |
if ($hidden) { |
if ($hidden) { |
Line 243 sub list_discussion {
|
Line 273 sub list_discussion {
|
if ($showonlyunread && $prevread > $posttime) { |
if ($showonlyunread && $prevread > $posttime) { |
$notshown{$idx} = 1; |
$notshown{$idx} = 1; |
} else { |
} else { |
$discussionitems[$idx]='<p><table border="0" width="100%"><tr>'; |
|
if ($prevread > 0 && $prevread <= $posttime) { |
if ($prevread > 0 && $prevread <= $posttime) { |
$discussionitems[$idx] .= '<td align="left" bgcolor="#FFFFFF"><font color="#FF0000">NEW</font></td>'; |
$newitem{$idx} = 1; |
|
$discussionitems[$idx] .= ' |
|
<p><table border="0" width="100%"> |
|
<tr><td align="left"><font color="#FF0000"><b>NEW</b></font></td>'; |
|
} else { |
|
$newitem{$idx} = 0; |
|
$discussionitems[$idx] .= ' |
|
<p><table border="0" width="100%"> |
|
<tr><td align="left"> </td>'; |
} |
} |
$discussionitems[$idx] .= '<td align ="left"> '. |
$discussionitems[$idx] .= '<td align ="left"> '. |
'<b>'.$subject.'</b> '. |
'<b>'.$subject.'</b> '. |
Line 259 sub list_discussion {
|
Line 296 sub list_discussion {
|
} |
} |
|
|
my $discussion=''; |
my $discussion=''; |
|
|
|
my $function = &Apache::loncommon::get_users_function(); |
|
my $color = &Apache::loncommon::designparm($function.'.tabbg', |
|
$ENV{'user.domain'}); |
|
my %lt = &Apache::lonlocal::texthash( |
|
'cuse' => 'Current settings for this discussion', |
|
'allposts' => 'All posts', |
|
'unread' => 'New posts only', |
|
'ondisp' => 'Once displayed', |
|
'onmark' => 'Once marked read', |
|
'disa' => 'Posts to be displayed', |
|
'npce' => 'Posts cease to be marked "NEW"', |
|
'chgt' => 'Change to ', |
|
); |
|
|
|
my $currdisp = $lt{'allposts'}; |
|
my $currmark = $lt{'onmark'}; |
|
my $dispchange = $lt{'unread'}; |
|
my $markchange = $lt{'ondisp'}; |
|
my $displink = '/adm/feedback?onlyunread='.$ressymb; |
|
my $marklink = '/adm/feedback?markondisp='.$ressymb; |
|
|
|
if ($markondisp) { |
|
$currmark = $lt{'ondisp'}; |
|
$markchange = $lt{'onmark'}; |
|
$marklink = '/adm/feedback?markonread='.$ressymb; |
|
if ($newpostsflag) { |
|
$marklink .= '&previous='.$prevread; |
|
} |
|
} |
|
|
|
if ($showonlyunread) { |
|
$currdisp = $lt{'unread'}; |
|
$dispchange = $lt{'allposts'}; |
|
$displink = '/adm/feedback?allposts='.$ressymb; |
|
} |
|
|
|
if ($newpostsflag) { |
|
$displink .= '&previous='.$prevread; |
|
} |
|
|
if ($visible) { |
if ($visible) { |
# Print the discusssion |
# Print the discusssion |
$discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">'; |
$discussion.='<table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">'; |
if ($visible>2) { |
my $colspan=$maxdepth+1; |
my $colspan=$maxdepth+1; |
$discussion .= '<tr bgcolor="#FFFFFF"><td colspan="'.$colspan.'" valign="top">'. |
$discussion.='<tr><td bgcolor="DDDDBB" colspan="'.$colspan.'">'. |
'<table border="0" bgcolor="#FFFFFF" width="100%" cellspacing="2" cellpadding="2">'. |
'<table border="0" width="100%" bgcolor="#DDDDBB"><tr><td align="left">'. |
'<tr><td align="left"><b>'.$lt{'cuse'}.'</b></td><td> </td><td align="right"><b>'.$lt{'chgt'}.'</b></td></tr>'. |
'<a href="/adm/feedback?threadedon='.$ressymb.'">'.&mt('Threaded View').'</a> '. |
'<tr><td>'.$lt{'disa'}.': <i>'.$currdisp.'</i></td><td> </td><td align="right"><a href="'.$displink.'">'.$dispchange.'</a></td></tr>'. |
'<a href="/adm/feedback?threadedoff='.$ressymb.'">'.&mt('Chronological View').'</a> </td>'. |
'<tr><td>'.$lt{'npce'}.': <i>'.$currmark.'</i></td><td> </td><td align="right"><a href="'.$marklink.'">'.$markchange.'</a></td></tr>'. |
'<td align="right"><a href="/adm/feedback?'; |
'</table></td></tr>'. |
if ($showonlyunread) { |
'<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'. |
$discussion .= 'allposts='.$ressymb; |
'<table border="0" width="100%" bgcolor="#DDDDBB"><tr>'; |
if ($newpostsflag) { |
if ($visible>2) { |
$discussion .= '&previous='.$prevread; |
$discussion.='<td align="left">'. |
} |
'<a href="/adm/feedback?threadedon='.$ressymb; |
$discussion .='">'.&mt('Show all posts').'?'; |
if ($newpostsflag) { |
|
$discussion .= '&previous='.$prevread; |
|
} |
|
$discussion .='">'.&mt('Threaded View').'</a> '. |
|
'<a href="/adm/feedback?threadedoff='.$ressymb; |
|
if ($newpostsflag) { |
|
$discussion .= '&previous='.$prevread; |
|
} |
|
$discussion .='">'.&mt('Chronological View').'</a> </td>'; |
|
} |
|
if ($newpostsflag) { |
|
if (!$markondisp) { |
|
$discussion .='<td align="right"><a href="/adm/feedback?markread='.$ressymb.'">'.&mt('Mark new posts as read').'</a> '; |
} else { |
} else { |
$discussion .= 'onlyunread='.$ressymb; |
$discussion .= '<td> </td>'; |
if ($newpostsflag) { |
|
$discussion .= '&previous='.$prevread; |
|
} |
|
$discussion .= '">'.&mt('Show only unread posts').'?'; |
|
} |
} |
$discussion .= '</a> </td></tr></table></td></tr>'; |
} else { |
} |
$discussion .= '<td> </td>'; |
|
} |
|
$discussion .= '</tr></table></td></tr>'; |
|
|
my $numhidden = keys %notshown; |
my $numhidden = keys %notshown; |
if ($numhidden > 0) { |
if ($numhidden > 0) { |
my $colspan = $maxdepth+1; |
my $colspan = $maxdepth+1; |
Line 304 sub list_discussion {
|
Line 393 sub list_discussion {
|
$discussion.='<td> </td>'; |
$discussion.='<td> </td>'; |
} |
} |
my $colspan=$maxdepth-$thisdepth+1; |
my $colspan=$maxdepth-$thisdepth+1; |
$discussion.='<td bgcolor="#CCCCCC" colspan="'.$colspan.'">'. |
$discussion.='<td bgcolor="'.$bgcols[$newitem{$alldiscussion{$_}}].'" colspan="'.$colspan.'">'. |
$discussionitems[$alldiscussion{$_}]. |
$discussionitems[$alldiscussion{$_}]. |
'</td></tr>'; |
'</td></tr>'; |
} |
} |
Line 804 sub handler {
|
Line 893 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','threadedon','threadedoff','onlyunread','allposts','previous']); |
['hide','unhide','deldisc','postdata','preview','replydisc','threadedon','threadedoff','onlyunread','allposts','previous','markread','markonread','markondisp']); |
|
|
|
if (($ENV{'form.markondisp'}) || ($ENV{'form.markonread'})) { |
|
# ---------------------- Modify setting for identification of 'NEW' posts in this discussion |
|
|
if (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) { |
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->send_http_header; |
|
my $symb=$ENV{'form.markondisp'}?$ENV{'form.markondisp'}:$ENV{'form.markonread'}; |
|
my $ressymb = $symb; |
|
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); |
|
unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) { |
|
$ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; |
|
} |
|
|
|
my %discinfo = (); |
|
my $lastkey = $ressymb.'_lastread'; |
|
my $ondispkey = $ressymb.'_markondisp'; |
|
if ($ENV{'form.markondisp'}) { |
|
$discinfo{$lastkey} = time; |
|
$discinfo{$ondispkey} = 1; |
|
} elsif ($ENV{'form.markonread'}) { |
|
if ( defined($ENV{'previous'}) ) { |
|
$discinfo{$lastkey} = $ENV{'previous'}; |
|
} |
|
$discinfo{$ondispkey} = 0; |
|
} |
|
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); |
|
if ($ENV{'form.markondisp'}) { |
|
&redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0'); |
|
} else { |
|
&redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'}); |
|
} |
|
return OK; |
|
} elsif (($ENV{'form.allposts'}) || ($ENV{'form.onlyunread'})) { |
# ----------------------------------------------------------------- Modify display setting for this discussion |
# ----------------------------------------------------------------- Modify display setting for this discussion |
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'}; |
my $symb=$ENV{'form.allposts'}?$ENV{'form.allposts'}:$ENV{'form.onlyunread'}; |
|
my $ressymb = $symb; |
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); |
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); |
my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'}, |
unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) { |
$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}, |
$ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; |
$ENV{'course.'.$ENV{'request.course.id'}.'.num'}); |
} |
my %readinghash = (); |
my %discinfo = (); |
|
if ($ENV{'form.allposts'}) { |
if ($contrib{'version'}) { |
$discinfo{$ressymb.'_showonlyunread'} = 0; |
if ($ENV{'form.allposts'}) { |
} elsif ($ENV{'form.onlyunread'}) { |
$readinghash{$symb.'_showonlyunread'} = 0; |
$discinfo{$ressymb.'_showonlyunread'} = 1; |
} elsif ($ENV{'form.onlyunread'}) { |
} |
$readinghash{$symb.'_showonlyunread'} = 1; |
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); |
} |
&redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed display status').'<br />','0','0','',$ENV{'form.previous'}); |
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%readinghash,$ENV{'user.domain'},$ENV{'user.name'}); |
return OK; |
|
} elsif ($ENV{'form.markread'}) { |
|
# ----------------------------------------------------------------- Mark new posts as read |
|
&Apache::loncommon::content_type($r,'text/html'); |
|
$r->send_http_header; |
|
my $symb=$ENV{'form.markread'}; |
|
my $ressymb = $symb; |
|
my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb); |
|
unless ($ressymb =~ m|bulletin___\d+___adm/wrapper|) { |
|
$ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|; |
} |
} |
&redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status').'<br />','0','0','',$ENV{'form.previous'}); |
my %discinfo = (); |
|
my $lastkey = $ressymb.'_lastread'; |
|
$discinfo{$lastkey} = time; |
|
&Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'}); |
|
&redirect_back($r,&Apache::lonnet::clutter($url),&mt('Changed reading status').'<br />','0','0'); |
return OK; |
return OK; |
} elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { |
} elsif (($ENV{'form.hide'}) || ($ENV{'form.unhide'})) { |
# ----------------------------------------------------------------- Hide/unhide |
# ----------------------------------------------------------------- Hide/unhide |
Line 976 sub handler {
|
Line 1110 sub handler {
|
my $attachmenturl=''; |
my $attachmenturl=''; |
if ($ENV{'form.attachment.filename'}) { |
if ($ENV{'form.attachment.filename'}) { |
unless (length($ENV{'form.attachment'})>131072) { |
unless (length($ENV{'form.attachment'})>131072) { |
$attachmenturl=&Apache::lonnet::userfileupload('attachment'); |
$attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback'); |
} |
} |
} |
} |
# Filter HTML out of message (could be nasty) |
# Filter HTML out of message (could be nasty) |