version 1.317, 2012/01/04 00:42:20
|
version 1.322, 2012/01/05 21:18:49
|
Line 763 sub discussion_link {
|
Line 763 sub discussion_link {
|
my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item; |
my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item; |
if ($flag) { $link .= '&previous='.$prev; } |
if ($flag) { $link .= '&previous='.$prev; } |
if ($adds) { $link .= $adds; } |
if ($adds) { $link .= $adds; } |
return &Apache::loncommon::modal_link($link,$linktext,600,600); |
my $width=600; |
|
my $height=600; |
|
if (($cmd eq 'hide') || ($cmd eq 'unhide') || ($cmd eq 'like') || ($cmd eq 'unlike')) { |
|
$width=300; |
|
$height=200; |
|
} |
|
return &Apache::loncommon::modal_link($link,$linktext,$width,$height); |
} |
} |
|
|
|
|
Line 928 sub build_posting_display {
|
Line 934 sub build_posting_display {
|
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'}, |
my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
|
my %likes=&Apache::lonnet::dump('disclikes', |
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
$env{'course.'.$env{'request.course.id'}.'.num'}, |
|
'^'.$symb.':'); |
|
my $thisuser=$env{'user.name'}.':'.$env{'user.domain'}; |
|
|
my $see_anonymous = |
my $see_anonymous = |
&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); |
&Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')); |
Line 1090 sub build_posting_display {
|
Line 1101 sub build_posting_display {
|
@{$$namesort{$lastname}{$firstname}} = ("$idx"); |
@{$$namesort{$lastname}{$firstname}} = ("$idx"); |
} |
} |
if ($outputtarget ne 'tex') { |
if ($outputtarget ne 'tex') { |
|
unless ($likes{$symb.':'.$idx.':likers'}=~/\,\Q$thisuser\E\,/) { |
|
$sender.=' '.&discussion_link($symb,&mt('Like'),'like',$idx,$$newpostsflag,$prevread,&group_args($group)); |
|
} |
|
unless ($likes{$symb.':'.$idx.':unlikers'}=~/\,\Q$thisuser\E\,/) { |
|
$sender.=' '.&discussion_link($symb,&mt('Unlike'),'unlike',$idx,$$newpostsflag,$prevread,&group_args($group)); |
|
} |
if (&editing_allowed($escsymb.':::'.$idx,$group)) { |
if (&editing_allowed($escsymb.':::'.$idx,$group)) { |
if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) { |
if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) { |
$sender.=' '. |
$sender.=' '. |
Line 2787 sub send_msg {
|
Line 2804 sub send_msg {
|
} |
} |
} |
} |
|
|
|
# Records of number of feedback messages are kept under the "symb" called "_feedback" |
my %record=&Apache::lonnet::restore('_feedback'); |
# There are two entries within the framework of a course: |
my ($temp)=keys(%record); |
# - the URLs for which feedback was provided |
unless ($temp=~/^error\:/) { |
# - the total number of contributions |
my %newrecord=(); |
if ($sendsomething) { |
$newrecord{'resource'}=$feedurl; |
my %record=&getfeedbackrecords(); |
$newrecord{'subnumber'}=$record{'subnumber'}+1; |
my ($temp)=keys(%record); |
unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') { |
unless ($temp=~/^error\:/) { |
$status.='<br />'.&mt('Not registered').'<br />'; |
my %newrecord=(); |
} |
$newrecord{'resource'}=$feedurl; |
|
$newrecord{'subnumber'}=$record{'subnumber'}+1; |
|
unless (&Apache::lonnet::cstore(\%newrecord,'_feedback') eq 'ok') { |
|
$status.='<br />'.&mt('Not registered').'<br />'; |
|
} |
|
} |
} |
} |
|
|
return ($status,$sendsomething); |
return ($status,$sendsomething); |
} |
} |
|
|
|
# Routine to get the complete feedback records |
|
|
|
sub getfeedbackrecords { |
|
my ($uname,$udom,$course)=@_; |
|
unless ($uname) { $uname=$env{'user.name'}; } |
|
unless ($udom) { $udom=$env{'user.domain'}; } |
|
unless ($course) { $course=$env{'request.course.id'}; } |
|
my %record=&Apache::lonnet::restore('_feedback',$course,$udom,$uname); |
|
return %record; |
|
} |
|
|
|
# Routine to get feedback statistics |
|
|
|
sub getfeedbackstats { |
|
my %record=&getfeedbackrecords(@_); |
|
return ($record{'subnumber'},$record{'points'},$record{'totallikes'}); |
|
} |
|
|
|
# Store feedback credit |
|
|
|
sub storefeedbackpoints { |
|
my ($points,$uname,$udom,$course)=@_; |
|
unless ($points) { $points=0; } |
|
unless ($uname) { $uname=$env{'user.name'}; } |
|
unless ($udom) { $udom=$env{'user.domain'}; } |
|
unless ($course) { $course=$env{'request.course.id'}; } |
|
my %record=('grader_user' => $env{'user.name'}, |
|
'grader_domain' => $env{'user.domain'}, |
|
'points' => $points); |
|
return &Apache::lonnet::cstore(\%record,'_feedback'); |
|
} |
|
|
|
# Store feedback "likes" |
|
|
|
sub storefeedbacklikes { |
|
my ($likes,$uname,$udom,$course)=@_; |
|
unless ($likes) { $likes=0; } |
|
if ($likes>0) { $likes=1; } |
|
if ($likes<0) { $likes=-1; } |
|
unless ($uname) { $uname=$env{'user.name'}; } |
|
unless ($udom) { $udom=$env{'user.domain'}; } |
|
unless ($course) { $course=$env{'request.course.id'}; } |
|
my %record=&getfeedbackrecords($uname,$udom,$course); |
|
my $totallikes=$record{'totallikes'}; |
|
$totallikes+=$likes; |
|
my %newrecord=('likes_user' => $env{'user.name'}, |
|
'likes_domain' => $env{'user.domain'}, |
|
'likes' => $likes, |
|
'totallikes' => $totallikes); |
|
return &Apache::lonnet::cstore(\%newrecord,'_feedback'); |
|
} |
|
|
|
|
sub adddiscuss { |
sub adddiscuss { |
my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_; |
my ($symb,$email,$anon,$attachmenturl,$subject,$group)=@_; |
my $status=''; |
my $status=''; |
Line 2900 sub adddiscuss {
|
Line 2974 sub adddiscuss {
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
$env{'course.'.$env{'request.course.id'}.'.num'}); |
} |
} |
my %record=&Apache::lonnet::restore('_discussion'); |
my %record=&getdiscussionrecords(); |
my ($temp)=keys(%record); |
my ($temp)=keys(%record); |
unless ($temp=~/^error\:/) { |
unless ($temp=~/^error\:/) { |
my %newrecord=(); |
my %newrecord=(); |
Line 2915 sub adddiscuss {
|
Line 2989 sub adddiscuss {
|
return $status.'<br />'; |
return $status.'<br />'; |
} |
} |
|
|
|
|
|
# Routine to get the complete discussion records |
|
|
|
sub getdiscussionrecords { |
|
my ($uname,$udom,$course)=@_; |
|
unless ($uname) { $uname=$env{'user.name'}; } |
|
unless ($udom) { $udom=$env{'user.domain'}; } |
|
unless ($course) { $course=$env{'request.course.id'}; } |
|
my %record=&Apache::lonnet::restore('_discussion',$course,$udom,$uname); |
|
return %record; |
|
} |
|
|
|
# Routine to get discussion statistics |
|
|
|
sub getdiscussionstats { |
|
my %record=&getdiscussionrecords(@_); |
|
return ($record{'subnumber'},$record{'points'},$record{'totallikes'}); |
|
} |
|
|
|
|
|
# Store discussion credit |
|
|
|
sub storediscussionpoints { |
|
my ($points,$uname,$udom,$course)=@_; |
|
unless ($points) { $points=0; } |
|
unless ($uname) { $uname=$env{'user.name'}; } |
|
unless ($udom) { $udom=$env{'user.domain'}; } |
|
unless ($course) { $course=$env{'request.course.id'}; } |
|
my %record=('grader_user' => $env{'user.name'}, |
|
'grader_domain' => $env{'user.domain'}, |
|
'points' => $points); |
|
return &Apache::lonnet::cstore(\%record,'_discussion'); |
|
} |
|
|
|
# Store discussion "likes" |
|
|
|
sub storediscussionlikes { |
|
my ($likes,$uname,$udom,$course)=@_; |
|
unless ($likes) { $likes=0; } |
|
if ($likes>0) { $likes=1; } |
|
if ($likes<0) { $likes=-1; } |
|
unless ($uname) { $uname=$env{'user.name'}; } |
|
unless ($udom) { $udom=$env{'user.domain'}; } |
|
unless ($course) { $course=$env{'request.course.id'}; } |
|
my %record=&getdiscussionrecords($uname,$udom,$course); |
|
my $totallikes=$record{'totallikes'}; |
|
$totallikes+=$likes; |
|
my %newrecord=('likes_user' => $env{'user.name'}, |
|
'likes_domain' => $env{'user.domain'}, |
|
'likes' => $likes, |
|
'totallikes' => $totallikes); |
|
return &Apache::lonnet::cstore(\%newrecord,'_discussion'); |
|
} |
|
|
sub get_discussion_info { |
sub get_discussion_info { |
my ($idx,%contrib) = @_; |
my ($idx,%contrib) = @_; |
my $changelast = 0; |
my $changelast = 0; |
Line 3443 sub handler {
|
Line 3571 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'}, |
['modal','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','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']); |
['like','unlike','modal','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','groupick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export','sendmessageonly','group','ref']); |
my $group = $env{'form.group'}; |
my $group = $env{'form.group'}; |
my %attachmax = ( |
my %attachmax = ( |
text => &mt('(128 KB max size)'), |
text => &mt('(128 KB max size)'), |
Line 3718 ENDREDIR
|
Line 3846 ENDREDIR
|
'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; |
|
} elsif (($env{'form.like'}) || ($env{'form.unlike'})) { |
|
# ----------------------------------------------------------------- Like/unlike |
|
my $entry=$env{'form.like'}?$env{'form.like'}:$env{'form.unlike'}; |
|
my ($symb,$idx)=split(/\:\:\:/,$entry); |
|
($symb,my $feedurl)=&get_feedurl_and_clean_symb($symb); |
|
my $prefix=$symb.':'.$idx.':'; |
|
my %contrib=&Apache::lonnet::dump('disclikes', |
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
$env{'course.'.$env{'request.course.id'}.'.num'}, |
|
'^'.$prefix); |
|
# Get all who like or unlike this |
|
my $currentlikers=$contrib{$prefix.'likers'}; |
|
my $currentunlikers=$contrib{$prefix.'unlikers'}; |
|
my $likes=$contrib{$prefix.'likes'}; |
|
# Find out if they already voted |
|
my $alreadyflag=0; |
|
my $thisuser=$env{'user.name'}.':'.$env{'user.domain'}; |
|
if ($env{'form.like'}) { |
|
if ($currentlikers=~/\,\Q$thisuser\E\,/) { |
|
$alreadyflag=1; |
|
} else { |
|
if ($currentunlikers=~/\,\Q$thisuser\E\,/) { |
|
$currentunlikers=~s/\,\Q$thisuser\E\,//; |
|
} else { |
|
$currentlikers.=','.$thisuser.','; |
|
} |
|
$likes++; |
|
} |
|
} else { |
|
if ($currentunlikers=~/\,\Q$thisuser\E\,/) { |
|
$alreadyflag=1; |
|
} else { |
|
if ($currentlikers=~/\,\Q$thisuser\E\,/) { |
|
$currentlikers=~s/\,\Q$thisuser\E\,//; |
|
} else { |
|
$currentunlikers.=','.$thisuser.','; |
|
} |
|
$likes--; |
|
} |
|
} |
|
my $result; |
|
unless ($alreadyflag) { |
|
my %newhash=($prefix.'likes' => $likes, |
|
$prefix.'likers' => $currentlikers, |
|
$prefix.'unlikers' => $currentunlikers); |
|
if (&Apache::lonnet::put('disclikes', |
|
\%newhash, |
|
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
$env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { |
|
if ($env{'form.like'}) { |
|
&storediscussionlikes(1,$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'}); |
|
$result=&mt("Registered 'Like'"); |
|
} else { |
|
&storediscussionlikes(-1,$contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'}); |
|
$result=&mt("Registered 'Unlike'"); |
|
} |
|
} else { |
|
$result=&mt("Failed to register vote"); |
|
} |
|
} |
|
&redirect_back($r,$feedurl,$result.'<br />', |
|
'0','0','','',$env{'form.previous'},undef,undef,undef, |
|
undef,undef,undef,$group); |
|
return OK; |
} elsif ($env{'form.cmd'}=~/^(threadedoff|threadedon)$/) { |
} elsif ($env{'form.cmd'}=~/^(threadedoff|threadedon)$/) { |
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'}); |
my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'}); |
if ($env{'form.cmd'} eq 'threadedon') { |
if ($env{'form.cmd'} eq 'threadedon') { |