--- loncom/interface/lonfeedback.pm	2012/03/13 05:37:49	1.339
+++ loncom/interface/lonfeedback.pm	2012/03/16 02:59:01	1.346
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.339 2012/03/13 05:37:49 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.346 2012/03/16 02:59:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1333,14 +1333,15 @@ sub build_posting_display {
                 } else {
                     if ($message) {
                         my $spansize = 2;
+                        my ($uname,$udom);
                         if ($showonlyunread && $prevread > $posttime) {
                             $$notshown{$idx} = 1;
                         } elsif ($showunmark && $$dischash{$readkey}=~/\.$idx\./) {
                             $$notshown{$idx} = 1;
                         } else {
 # apply filters
-                            my $uname = $contrib{$idx.':sendername'};
-                            my $udom = $contrib{$idx.':senderdomain'};
+                            $uname = $contrib{$idx.':sendername'};
+                            $udom = $contrib{$idx.':senderdomain'};
                             my $poster = $uname.':'.$udom;
                             if ($env{'form.totposters'} ne '') {
                                 if ($totposters == 0) {
@@ -1424,15 +1425,23 @@ sub build_posting_display {
                                     '</div></blockquote>';
                             if ($canvote) {
 # Put in the like and unlike buttons
-                                if ($userlikes{$idx}) {
-                                    $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsup_gray.png" alt="'.&mt('You like this posting').'" />';
+                                if (($uname eq $env{'user.name'}) && ($udom eq $env{'user.domain'})) {
+                                    my $novote = &mt('No voting for your own posts');
+                                    $$discussionitems[$idx].=
+                                        '<a href="javascript:alert('."'$novote'".');" style="text-decoration: none;">'.
+                                        '<img border="0" src="/res/adm/pages/thumbsup_novote.png" alt="'.$novote.'" />&nbsp;'.
+                                        '<img border="0" src="/res/adm/pages/thumbsdown_novote.png" alt="'.$novote.'" /></a>'; 
                                 } else {
-                                    $$discussionitems[$idx].='&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"));
-                                }
-                                if ($userunlikes{$idx}) {
-                                    $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsdown_gray.png" alt="'.&mt('You unlike this posting').'" />';
-                                } else {
-                                    $$discussionitems[$idx].='&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"));
+                                    if ($userlikes{$idx}) {
+                                        $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsup_gray.png" alt="'.&mt('You like this posting').'" />';
+                                    } else {
+                                        $$discussionitems[$idx].='&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"));
+                                    }
+                                    if ($userunlikes{$idx}) {
+                                        $$discussionitems[$idx].='<img border="0" src="/res/adm/pages/thumbsdown_gray.png" alt="'.&mt('You unlike this posting').'" />';
+                                    } else {
+                                        $$discussionitems[$idx].='&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"));
+                                    }
                                 }
                             }
                             if ($seeid || $canvote) {
@@ -1680,11 +1689,16 @@ sub mail_screen {
   }
 
   my %lt = &Apache::lonlocal::texthash(
-            'myqu' => 'My question/comment/feedback:',
+            'myqu' => 'Question/comment/feedback:',
             'title' => 'Title',
             'reta' => 'Retained attachments',
             'atta' => 'Attachment',
            );
+  if($env{'form.editdisc'} || $env{'form.replydisc'}){
+    %lt = &Apache::lonlocal::texthash(
+            'myqu' => 'Post Discussion',
+    );
+  }
   my $restitle = &get_resource_title($caller_symb,$feedurl);
   my $quote='';
   my $subject = '';
@@ -1895,6 +1909,7 @@ END
   }
   $r->print(<<END);
 $start_page
+<h1>$lt{'myqu'}</h1>
 $header
 <form action="/adm/feedback" method="post" name="mailform"
 enctype="multipart/form-data">
@@ -1915,18 +1930,28 @@ END
   $r->print(<<END);
 $options
 $quote
-<p>$lt{'myqu'}
+<p>
 $textareaheader
 </p>
+<br>
 <p>
 $latexHelp
 </p>
 <p>
-$lt{'title'}: <input type="text" name="subject" size="30" value="$subject" /></p>
-<p>
-<textarea name="comment" id="comment" cols="60" rows="10" $textareaclass>$comment
-</textarea></p>
 END
+
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
+    $r->print('<input type="text" name="subject" size="30" value="'.
+              $subject.'" /></p>');
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Message')));
+    $r->print('<textarea name="comment" id="comment" cols="60" rows="10" '.
+              $textareaclass.'>'.$comment.
+              '</textarea>');
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
+
     if ( ($env{'form.editdisc'}) || ($env{'form.replydisc'}) ) {
         if ($env{'form.origpage'}) {
             foreach my $attach (@currnewattach) {
@@ -3396,11 +3421,11 @@ sub modify_attachments {
 
     my %lt = &Apache::lonlocal::texthash(
                'subj' => 'Subject',
-               'thfo' => 'The following attachments were part of the most recent saved version of this posting.',
                'chth' => 'Check the checkboxes for any you wish to remove.',
                'thef' => 'The following attachments have been uploaded for inclusion with this posting.',
-               'adda' => 'Add a new attachment to this post.',
+               'adda' => 'Add a new attachment to this post',
                'stch' => 'Save Changes',
+               'clic' => 'Add/remove attachments',
              );
     my $js = <<END;
 <script type="text/javascript">
@@ -3414,7 +3439,7 @@ END
     # Breadcrumbs
     my $brcrum = [{'href' => '',
                    'text' => 'Discussion Post Attachments'}];
-    my %parms=();
+    my %parms=('only_body' => 1);
     if ($env{'form.modal'} ne 'yes') { 'bread_crumbs' => $brcrum }
 
     my $start_page = 
@@ -3443,44 +3468,42 @@ $start_page
 $toolarge
 <form name="modattachments" method="post" enctype="multipart/form-data" action="/adm/feedback?attach=$symb">
  <br />
- <table class="LC_data_table">
-  <tr>
-   <td colspan="2">
-    <b>Subject:</b> <b>$subject</b><br /><br />
+ <h1>$lt{'clic'}</h1>
 END
-    if ($idx) {
-        if ($attachmenturls) {
-            my @currold = keys(%currattach);
-            if (@currold > 0) {
-                $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");  
-                foreach my $id (@currold) {
-                    my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'}); 
-                    $attachurl =~ m#/([^/]+)$#;
-                    $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
+    $r->print(&Apache::lonhtmlcommon::start_pick_box());
+    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Subject')));
+    $r->print('<b>'.$subject.'</b>');
+    $r->print(&Apache::lonhtmlcommon::row_closure());
+    $r->print(&Apache::lonhtmlcommon::row_title($lt{'adda'}));
+    $r->print('<input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />  '.$attachmaxtext);
+    if(($idx)||(ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)){
+        $r->print(&Apache::lonhtmlcommon::row_closure());
+        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Attachments')));
+        if ($idx) {
+            if ($attachmenturls) {
+                my @currold = keys(%currattach);
+                if (@currold > 0) {
+                    $r->print($lt{'thfo'}.'<br />'.$lt{'chth'}.'<br />'."\n");
+                    foreach my $id (@currold) {
+                        my $attachurl = &HTML::Entities::decode($attachments{$id}{'filename'});
+                        $attachurl =~ m#/([^/]+)$#;
+                        $r->print('<label><input type="checkbox" name="deloldattach" value="'.$id.'" />&nbsp;'.$1.'</label><br />'."\n");
+                    }
+                    $r->print("<br />");
                 }
-                $r->print("<br />");
             }
         }
-    }
-    if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
-        $r->print($lt{'thef'}.'<br />'.$lt{'chth'}.'<br />'."\n");
-        foreach my $attach (@{$currnewattach}) {
-            $attach =~ m#/([^/]+)$#;
-            $r->print('<label><input type="checkbox" name="delnewattach" value="'.$attach.'" />&nbsp;'.$1.'</label><br />'."\n");
+        if ((ref($currnewattach) eq 'ARRAY') && (@{$currnewattach} > 0)) {
+            $r->print($lt{'chth'}.'<br />'."\n");
+            foreach my $attach (@{$currnewattach}) {
+                $attach =~ m#/([^/]+)$#;
+                $r->print('<label><input type="checkbox" name="delnewattach" value="'.$attach.'" />&nbsp;'.$1.'</label><br />'."\n");
+            }
         }
-        $r->print("<br />"); 
     }
+    $r->print(&Apache::lonhtmlcommon::row_closure(1));
+    $r->print(&Apache::lonhtmlcommon::end_pick_box());
     $r->print(<<END);
-   </td></tr>
-   <tr>
-    <td>
-   $lt{'adda'}</td><td><input type="file" name="addnewattach" /><input type="button" name="upload" value="Upload" onclick="this.form.submit()" />    
-   </td>
-  </tr>
-  <tr>
-   <td colspan="2">$attachmaxtext</td>
-  </tr>
- </table>
 <input type="hidden" name="subject" value="$env{'form.subject'}" />
 <input type="hidden" name="comment" value="$env{'form.comment'}" />
 <input type="hidden" name="timestamp" value="$env{'form.timestamp'}" />
@@ -3536,6 +3559,7 @@ sub generate_attachments_button {
     my ($idx,$attachnum,$ressymb,$now,$currnewattach,$deloldattach,
         $numoldver,$mode,$blockblog) = @_;
     my $origpage = $ENV{'REQUEST_URI'};
+    my $att=$attachnum.' '.&mt("attachments");
     my %lt = &Apache::lonlocal::texthash(
                 'clic' => 'Add/remove attachments',
     ); 
@@ -3785,7 +3809,7 @@ sub handler {
                     num  => 131072,
                   );
   if ($env{'form.editdisc'}) {
-      if (!(&editing_allowed($env{'form.editdisc'},$env{'form.group'}))) {
+      if (!(&editing_allowed($env{'form.editdisc'},$group))) {
           my $symb=(split(/\:\:\:/,$env{'form.editdisc'}))[0];
           my ($map,$id,$url)=&Apache::lonnet::decode_symb($symb);
           my $feedurl=&Apache::lonnet::clutter($url);
@@ -3845,7 +3869,6 @@ sub handler {
       my ($symb,$idx)=split(/\:\:\:/,$env{'form.allversions'});
       ($symb)=&get_feedurl_and_clean_symb($symb);
       my $ressymb = &wrap_symb($symb);
-      my $group = $env{'form.group'};
       my $seeid;
       if (($group ne '') && (($ressymb =~ m|^bulletin___\d+___adm/wrapper/adm/\Q$cdom\E/\Q$cnum\E/\d+/bulletinboard$|))) {
           if (&check_group_priv($group,'dgp') eq 'ok') {
@@ -4010,7 +4033,7 @@ ENDREDIR
       $crs=~s/\_/\//g;
       my $seeid=&Apache::lonnet::allowed('rin',$crs);
 
-      if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$env{'form.group'}))) {
+      if ($env{'form.hide'} && !$seeid && !(&editing_allowed($env{'form.hide'},$group))) {
           &redirect_back($r,$feedurl,&mt('Deletion not permitted').'<br />',                 '0','0','','',$env{'form.previous'},'','','','',
                  undef,undef,$group,);
           return OK;
@@ -4058,99 +4081,117 @@ ENDREDIR
       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 $status='OPEN';
-      if ($Apache::lonhomework::parsing_a_problem ||
-          $Apache::lonhomework::parsing_a_task) {
-          $status=$Apache::inputtags::status[-1];
-      }
       my $result;
-      my $realsymb = &get_realsymb($symb);
-      if (&discussion_vote_available($status,$realsymb)) {
+      if ($idx > 0) {
+          my $realsymb = &get_realsymb($symb);
+          my $status='OPEN';
+          if ($Apache::lonhomework::parsing_a_problem ||
+              $Apache::lonhomework::parsing_a_task) {
+              $status=$Apache::inputtags::status[-1];
+          }
+          if (&discussion_vote_available($status,$realsymb)) {
+              my %contrib=&Apache::lonnet::restore($symb,$env{'request.course.id'},
+                               $env{'course.'.$env{'request.course.id'}.'.domain'},
+                               $env{'course.'.$env{'request.course.id'}.'.num'});
+              if (($contrib{$idx.':sendername'} eq $env{'user.name'}) && 
+                  ($contrib{$idx.':senderdomain'} eq $env{'user.domain'})) {
+                  $result = &mt("Vote not registered. No voting for your own posts.");
+              } else {
+
 #
 # Likes and unlikes are in db-file "disclikes" of the course
 # The prefix is the $symb to identify the resource discussion,
 # and the $idx to identify the entry
 #
-          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);
+                  my $prefix=$symb.':'.$idx.':';
+                  my %likes=&Apache::lonnet::dump('disclikes',
+                                  $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                  $env{'course.'.$env{'request.course.id'}.'.num'},
+                                  '^'.$prefix);
 
 # Get current like or unlike status for the $idx for this user.
-          my $thisuser=$env{'user.name'}.':'.$env{'user.domain'};
-          my ($userlikes,$userunlikes);
-          if (ref($contrib{$prefix.'likers'}) eq 'HASH') {
-              if (exists($contrib{$prefix.'likers'}{$thisuser})) {
-                  $userlikes = 1;
-              }
-          }
-          if (ref($contrib{$prefix.'unlikers'}) eq 'HASH') {
-              if (exists($contrib{$prefix.'unlikers'}{$thisuser})) {
-                  $userunlikes = 1;
-              }
-          }
+                  my $thisuser=$env{'user.name'}.':'.$env{'user.domain'};
+                  my ($userlikes,$userunlikes);
+                  if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+                      if (exists($likes{$prefix.'likers'}{$thisuser})) {
+                          $userlikes = 1;
+                      }
+                  }
+                  if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+                      if (exists($likes{$prefix.'unlikers'}{$thisuser})) {
+                          $userunlikes = 1;
+                      }
+                  }
 # Get the current "likes" count
-          my $likes=$contrib{$prefix.'likes'};
+                  my $likescount=$likes{$prefix.'likes'};
 # Find out if they already voted
 # Users cannot like a post twice, or unlike it twice.
 # They can change their mind, though.
-          my $alreadyflag=0;
-          my $thisuser=$env{'user.name'}.':'.$env{'user.domain'};
-          if ($env{'form.like'}) {
-              if ($userlikes) {
-                  $alreadyflag=1;
-              } elsif ($userunlikes) {
-                  delete($contrib{$prefix.'unlikers'}{$thisuser});
-                  $likes++;
-              } else {
-                  if (ref($contrib{$prefix.'likers'}) eq 'HASH') {
-                      $contrib{$prefix.'likers'}{$thisuser} = 1;
-                  } else {
-                      $contrib{$prefix.'likers'} = {$thisuser => 1};
-                  }
-                  $likes++;
-              }
-          } else {
-              if ($userunlikes) {
-                  $alreadyflag=1;
-              } elsif ($userlikes) {
-                  delete($contrib{$prefix.'likers'}{$thisuser});
-                  $likes--;
-              } else {
-                  if (ref($contrib{$prefix.'unlikers'}) eq 'HASH') {
-                      $contrib{$prefix.'unlikers'}{$thisuser} = 1;
+                  my $alreadyflag=0;
+                  if ($env{'form.like'}) {
+                      if ($userlikes) {
+                          $alreadyflag=1;
+                      } elsif ($userunlikes) {
+                          delete($likes{$prefix.'unlikers'}{$thisuser});
+                          $likescount++;
+                      } else {
+                          if (ref($likes{$prefix.'likers'}) eq 'HASH') {
+                              $likes{$prefix.'likers'}{$thisuser} = 1;
+                          } else {
+                              $likes{$prefix.'likers'} = {$thisuser => 1};
+                          }
+                          $likescount++;
+                      }
                   } else {
-                      $contrib{$prefix.'unlikers'} = {$thisuser => 1};
+                      if ($userunlikes) {
+                          $alreadyflag=1;
+                      } elsif ($userlikes) {
+                          delete($likes{$prefix.'likers'}{$thisuser});
+                          $likescount--;
+                      } else {
+                          if (ref($likes{$prefix.'unlikers'}) eq 'HASH') {
+                              $likes{$prefix.'unlikers'}{$thisuser} = 1;
+                          } else {
+                              $likes{$prefix.'unlikers'} = {$thisuser => 1};
+                          }
+                          $likescount--;
+                      }
                   }
-                  $likes--;
-              }
-          }
 # $alreadyflag would be 1 if they tried to double-like or double-unlike
-          unless ($alreadyflag) {
-              my %newhash=($prefix.'likes'    => $likes,
-                           $prefix.'likers'   => $contrib{$prefix.'likers'},
-                           $prefix.'unlikers' => $contrib{$prefix.'unlikers'});
+                  if ($alreadyflag) {
+                      if ($env{'form.like'}) {
+                          $result= &mt("'Like' already registered");
+                      } else {
+                          $result= &mt("'Unlike' already registered");
+                      }
+                  } else {
+                      my %newhash=($prefix.'likes'    => $likescount,
+                                   $prefix.'likers'   => $likes{$prefix.'likers'},
+                                   $prefix.'unlikers' => $likes{$prefix.'unlikers'});
 # Store data in db-file "disclikes"
-              if (&Apache::lonnet::put('disclikes',
-                                       \%newhash,
-                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
-                                       $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
+                      if (&Apache::lonnet::put('disclikes',
+                                               \%newhash,
+                                               $env{'course.'.$env{'request.course.id'}.'.domain'},
+                                               $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
 # Also store with the person who posted the liked/unliked entry
-                  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 {
+                          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 {
 # Oops, something went wrong
-                  $result=&mt("Failed to register vote");
+                          $result=&mt("Failed to register vote");
+                      }
+                  }
               }
+          } else {
+              $result=&mt('Voting unavailable for this discussion');
           }
       } else {
-          $result=&mt('Voting unavailable for this discussion');
+          $result=&mt('Invalid post number'); 
       }
       &redirect_back($r,$feedurl,$result.'<br />',
                      '0','0','','',$env{'form.previous'},undef,undef,undef,