--- loncom/interface/lonfeedback.pm	2012/01/07 20:01:16	1.328
+++ loncom/interface/lonfeedback.pm	2012/01/10 01:06:26	1.332
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.328 2012/01/07 20:01:16 www Exp $
+# $Id: lonfeedback.pm,v 1.332 2012/01/10 01:06:26 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -759,7 +759,7 @@ END
 
 
 sub discussion_link {
-   my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds)=@_;
+   my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds,$title)=@_;
    my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
    if ($flag) { $link .= '&previous='.$prev; }
    if ($adds) { $link .= $adds; }
@@ -769,7 +769,7 @@ sub discussion_link {
        $width=300;
        $height=200;
    }
-   return &Apache::loncommon::modal_link($link,$linktext,$width,$height);
+   return &Apache::loncommon::modal_link($link,$linktext,$width,$height,undef,undef,$title);
 }
 
 
@@ -888,9 +888,9 @@ sub postingform_display {
 <input type="submit" name="anondiscuss" value="$lt{'poan'}" /> <input type="hidden" name="symb" value="$ressymb" />
 <input type="hidden" name="sendit" value="true" />
 <input type="hidden" name="timestamp" value="$now" />
-<br /><a name="newpost"></a>
+<a name="newpost"></a>
 <font size="1">$lt{'note'}</font><br />
-<b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br /><br />
+<b>$lt{'title'}:</b>&nbsp;<input type="text" name="subject" value="$subject" size="30" /><br />
 <textarea name="comment" cols="80" rows="14" id="comment" $textareaclass>$comment</textarea>
 ENDDISCUSS
     if ($env{'form.origpage'}) {
@@ -1157,10 +1157,10 @@ sub build_posting_display {
                             }
                             if ($outputtarget ne 'tex') {
                                 unless ($likes{$symb.':'.$idx.':likers'}=~/\,\Q$thisuser\E\,/) {
-                                    $sender.='&nbsp;'.&discussion_link($symb,&mt('Like'),'like',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                    $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,&mt('Unlike'),'unlike',$idx,$$newpostsflag,$prevread,&group_args($group));
+                                    $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 +2683,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,
@@ -2725,8 +2725,8 @@ sub screen_header {
     unless (($env{'form.replydisc'}) || ($env{'form.editdisc'})) {
 	if (($feedurl=~/^\/res\//) && ($feedurl!~/^\/res\/adm/) && ($env{'user.adv'})) {
 	    $msgoptions= 
-		'<p><label><input type="radio" name="discuss" value="author" /> '.
-		&mt('Feedback to resource author').'</label></p>';
+		'<label><input type="radio" name="discuss" value="author" /> '.
+		&mt('Feedback to resource author').'</label><br />';
 	}
         my %optionhash=();
         foreach my $type ('question','comment','policy') {
@@ -2734,20 +2734,20 @@ sub screen_header {
 	}
 	if (&feedback_available(1)) {
 	    $msgoptions.=
-		'<p><label><input type="radio" name="discuss" value="question" /> '.
-		($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label></p>';
+		'<label><input type="radio" name="discuss" value="question" /> '.
+		($optionhash{'question'}?$optionhash{'question'}:&mt('Question about resource content')).'</label><br />';
 	}
 	if (&feedback_available(0,1)) {
 	    $msgoptions.=
-		'<p><label><input type="radio" name="discuss" value="course" /> '.
+		'<label><input type="radio" name="discuss" value="course" /> '.
 		($optionhash{'comment'}?$optionhash{'comment'}:$crscontent).
-		'</label></p>';
+		'</label><br />';
 	}
 	if (&feedback_available(0,0,1)) {
 	    $msgoptions.=
-		'<p><label><input type="radio" name="discuss" value="policy" /> '.
+		'<label><input type="radio" name="discuss" value="policy" /> '.
 		($optionhash{'policy'}?$optionhash{'policy'}:$crspolicy).
-		'</label></p>';
+		'</label><br />';
 	}
     }
     if (($env{'request.course.id'}) && (!$env{'form.sendmessageonly'})) {
@@ -2935,7 +2935,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 +2955,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);
 }
 
 
@@ -3088,9 +3088,31 @@ 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);
+}
 
 # Store discussion credit
 
@@ -3103,7 +3125,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 +3140,15 @@ 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);
+    return &Apache::lonnet::cstore(\%newrecord,'_discussion',$course,$udom,$uname);
 }
 
 sub get_discussion_info {