[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.79 and 1.83

version 1.79, 2007/05/05 06:13:46 version 1.83, 2007/12/08 00:25:14
Line 892  sub get_course_desc { Line 892  sub get_course_desc {
   
 sub disall {  sub disall {
     my ($r,$folder,$msgstatus)=@_;      my ($r,$folder,$msgstatus)=@_;
     my %saveable = ('folder'    => 'scalar',      my %saveable = ('msgstatus' => 'scalar',
     'msgstatus' => 'scalar',  
     'sortedby'  => 'scalar',      'sortedby'  => 'scalar',
     'interdis'  => 'scalar',      'interdis'  => 'scalar',
     );      );
Line 930  sub disfolder { Line 929  sub disfolder {
 <script type="text/javascript">  <script type="text/javascript">
     $jscript      $jscript
   
     function checkfoldermove() {  
         if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {  
             if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {  
                 alert("$lt{'sede'}");  
                 return;  
             }  
         }  
         return;   
     }  
   
     function validate_checkedaction() {      function validate_checkedaction() {
         document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;          document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
         if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {          if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
Line 1111  ENDDISHEADER Line 1100  ENDDISHEADER
   '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".    '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".    '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".
   '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".    '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".
   '  <select name="checkedaction" onchange="javascript:checkfoldermove()">'."\n");    '  <select name="checkedaction">'."\n");
   
     if ($folder ne 'trash') {      if ($folder ne 'trash') {
         $r->print('    <option value="markeddel">'.&mt('Delete').'</option>'."\n");          $r->print('    <option value="markeddel">'.&mt('Delete').'</option>'."\n");
Line 2074  sub displaymessage { Line 2063  sub displaymessage {
  $counter++;   $counter++;
     }      }
     $r->print('</pre>');      $r->print('</pre>');
   
       my $see_anonymous;
       my $from_student = 0;
       if ($env{'request.course.id'} eq $content{'courseid'}) {
    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
    my $username = $content{'sendername'}.':'.$content{'senderdomain'};
    my %classlist_entry =
       &Apache::lonnet::get('classlist',[$username],$cdom,$cnum);
    if (exists($classlist_entry{$username})) {
       $from_student = 1;
       $see_anonymous = &Apache::lonnet::allowed('rin',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
    }
       }
   
   
     my $number_of_messages = scalar(@messages); #subtract 1 for last index      my $number_of_messages = scalar(@messages); #subtract 1 for last index
 # start output  # start output
     &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});      &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'});
Line 2108  sub displaymessage { Line 2113  sub displaymessage {
         $symb=&Apache::lonnet::symbread($content{'baseurl'});          $symb=&Apache::lonnet::symbread($content{'baseurl'});
     }      }
     if ($env{'user.adv'}) {      if ($env{'user.adv'}) {
    my $adv_actions;
  $r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');   $r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
  if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {   if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
  $r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');   $r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');
Line 2147  sub displaymessage { Line 2153  sub displaymessage {
     if (defined($content{'baseurl'})) {      if (defined($content{'baseurl'})) {
         $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});          $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
     }      }
     $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));      if ($from_student && $see_anonymous ) {
    $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
       }
   
     $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'});      $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'});
     if ($folder eq 'sent') {      if ($folder eq 'sent') {
         $r->print('<br /><b>'.&mt('To').':</b> '.$tolist);          $r->print('<br /><b>'.&mt('To').':</b> '.$tolist);
Line 2173  sub displaymessage { Line 2182  sub displaymessage {
                               $replytoname.' '.&mt('at').' '.$replytodom);                                $replytoname.' '.&mt('at').' '.$replytodom);
                 }                  }
             } else {              } else {
                 $r->print(' ('.$content{'sendername'}.' '&mt('at').' '.                  $r->print(' ('.$content{'sendername'}.' '.&mt('at').' '.
                           $content{'senderdomain'}.') ');                            $content{'senderdomain'}.') ');
             }              }
             if ($cclist) {              if ($cclist) {
Removed from v.1.79  
changed lines
  Added in v.1.83

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>