--- loncom/interface/lonfeedback.pm	2012/01/09 19:56:28	1.330
+++ loncom/interface/lonfeedback.pm	2012/01/10 14:52:57	1.333
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.330 2012/01/09 19:56:28 www Exp $
+# $Id: lonfeedback.pm,v 1.333 2012/01/10 14:52:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1019,7 +1019,6 @@ sub build_posting_display {
         my $twoplus=$ave+2.*$stddev;
         my $oneminus=$ave-$stddev;
         my $twominus=$ave-2.*$stddev;
-#            &Apache::lonnet::logthis(join(',',@theselikes)." Ave $ave StdDev $stddev $twominus $oneminus $oneplus $twoplus");
 #
 # This is now the real loop. Go through all entries, pick up what we need
 # 
@@ -1156,11 +1155,15 @@ sub build_posting_display {
                                 @{$$namesort{$lastname}{$firstname}} = ("$idx");
                             }
                             if ($outputtarget ne 'tex') {
+                                my $karma=&userkarma($contrib{$idx.':sendername'},$contrib{$idx.':senderdomain'});
+                                for (my $i=1;$i<=$karma;$i++) {
+                                    $sender.='<img border="0" src="/res/adm/pages/star.gif" alt="'.&mt('Contributor Kudos').'" />';
+                                }
                                 unless ($likes{$symb.':'.$idx.':likers'}=~/\,\Q$thisuser\E\,/) {
-                                    $sender.='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like"));
+                                    $sender.='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsup.png" alt="'.&mt('Like').'" />','like',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Like this posting"));
                                 }
                                 unless ($likes{$symb.':'.$idx.':unlikers'}=~/\,\Q$thisuser\E\,/) {
-                                    $sender.='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />',,'unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike"));
+                                    $sender.='&nbsp;'.&discussion_link($symb,'<img border="0" src="/res/adm/pages/thumbsdown.png" alt="'.&mt('Unlike').'" />',,'unlike',$idx,$$newpostsflag,$prevread,&group_args($group),&mt("Unlike this posting"));
                                 }
                                 my $thislikes=$likes{$symb.':'.$idx.':likes'};
                                 if ($thislikes>0) { 
@@ -2683,7 +2686,7 @@ sub no_redirect_back {
 		      'add_entries' => \%onload,);
 
   if ($feedurl !~ m{^/adm/feedback}) { 
-      $body_options{'rediect'} = [2,$feedurl];
+      $body_options{'redirect'} = [2,$feedurl];
   }
   my $start_page=
       &Apache::loncommon::start_page('Feedback not sent',undef,
@@ -2935,7 +2938,7 @@ sub storefeedbackpoints {
     my %record=('grader_user'   => $env{'user.name'},
                 'grader_domain' => $env{'user.domain'},
                 'points' => $points);
-    return &Apache::lonnet::cstore(\%record,'_feedback');
+    return &Apache::lonnet::cstore(\%record,'_feedback',$course,$udom,$uname);
 }
 
 # Store feedback "likes"
@@ -2955,7 +2958,7 @@ sub storefeedbacklikes {
                    'likes_domain' => $env{'user.domain'},
                    'likes' => $likes,
                    'totallikes' => $totallikes);
-    return &Apache::lonnet::cstore(\%newrecord,'_feedback');
+    return &Apache::lonnet::cstore(\%newrecord,'_feedback',$course,$udom,$uname);
 }
 
 
@@ -3065,6 +3068,7 @@ sub adddiscuss {
        $newrecord{'subnumber'}=$record{'subnumber'}+1;
        $status.='<br />'.&mt('Registering').': '.
                &Apache::lonnet::cstore(\%newrecord,'_discussion');
+       &updatekarma();
     }
     } else {
 	$status.='Failed.';
@@ -3088,9 +3092,52 @@ sub getdiscussionrecords {
 
 sub getdiscussionstats {
     my %record=&getdiscussionrecords(@_);
-    return ($record{'subnumber'},$record{'points'},$record{'totallikes'});
+    return ($record{'subnumber'},$record{'points'},$record{'totallikes'},$record{'totalvotes'});
+}
+
+# Calculate discussion karma
+
+sub calcdiscussionkarma {    
+    my ($subs,$pts,$likes,$votes)=&getdiscussionstats(@_);
+    my $karma=0;
+    if ($votes>0) {
+        $karma=int(.1+5.*(1.-exp(-$subs/10.))*$likes/$votes);
+        if ($karma<0) { $karma=0; }
+        if ($karma>5) { $karma=5; }
+    }
+    return $karma;
 }
 
+# Update karma
+
+sub updatekarma {
+    my ($uname,$udom,$course)=@_;
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my $karma=&calcdiscussionkarma($uname,$udom,$course);
+    &Apache::lonnet::cstore({ 'karma' => $karma },'_discussion',$course,$udom,$uname);
+    &Apache::lonnet::do_cache_new('karma',$uname.':'.$udom.':'.$course,$karma,3600);
+    return $karma;
+}
+
+# Retrieve karma
+
+sub userkarma {
+    my ($uname,$udom,$course)=@_;
+    unless ($uname) { $uname=$env{'user.name'}; }
+    unless ($udom)  { $udom=$env{'user.domain'}; }
+    unless ($course) { $course=$env{'request.course.id'}; }
+    my $hashkey=$uname.':'.$udom.':'.$course;
+    my ($karma,$cached)=&Apache::lonnet::is_cached_new('karma',$hashkey);
+    if ($cached) {
+        return $karma;
+    }
+    my %userdisc=&getdiscussionrecords($uname,$udom,$course);
+    $karma=$userdisc{'karma'};
+    &Apache::lonnet::do_cache_new('karma',$hashkey,$karma,3600);
+    return $karma;
+}
 
 # Store discussion credit
 
@@ -3103,7 +3150,7 @@ sub storediscussionpoints {
     my %record=('grader_user'   => $env{'user.name'},
                 'grader_domain' => $env{'user.domain'},
                 'points' => $points);
-    return &Apache::lonnet::cstore(\%record,'_discussion');
+    return &Apache::lonnet::cstore(\%record,'_discussion',$course,$udom,$uname);
 }
 
 # Store discussion "likes"
@@ -3118,12 +3165,19 @@ sub storediscussionlikes {
     unless ($course) { $course=$env{'request.course.id'}; }
     my %record=&getdiscussionrecords($uname,$udom,$course);
     my $totallikes=$record{'totallikes'};
+    my $totalvotes=$record{'totalvotes'};
     $totallikes+=$likes;
+    $totalvotes++;
     my %newrecord=('likes_user'   => $env{'user.name'},
                    'likes_domain' => $env{'user.domain'},
                    'likes' => $likes,
-                   'totallikes' => $totallikes);
-    return &Apache::lonnet::cstore(\%newrecord,'_discussion');
+                   'totallikes' => $totallikes,
+                   'totalvotes' => $totalvotes);
+    my $status=&Apache::lonnet::cstore(\%newrecord,'_discussion',$course,$udom,$uname);
+    if ($status eq 'ok') {
+        &updatekarma($uname,$udom,$course);
+    }
+    return $status;
 }
 
 sub get_discussion_info {