version 1.47, 2006/12/07 01:11:38
|
version 1.49, 2006/12/07 21:21:04
|
Line 245 function folder_choice(targetform,caller
|
Line 245 function folder_choice(targetform,caller
|
<table><tr><td><br /> |
<table><tr><td><br /> |
<input type="button" value="'.&mt('Make New Folder'). |
<input type="button" value="'.&mt('Make New Folder'). |
'" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'. |
'" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'. |
'<td align="center"><b>'.&mt('New Folder').'<br />'. |
'<td align="center"><b>'.&mt('New Folder').'</b><br />'. |
'<input type="text" size="15" name="newfolder" value="" /> |
'<input type="text" size="15" name="newfolder" value="" /> |
</td></tr></table> |
</td></tr></table> |
</td> |
</td> |
Line 843 sub get_course_desc {
|
Line 843 sub get_course_desc {
|
if (defined($env{'course.'.$fromcid.'.description'})) { |
if (defined($env{'course.'.$fromcid.'.description'})) { |
$description = $env{'course.'.$fromcid.'.description'}; |
$description = $env{'course.'.$fromcid.'.description'}; |
} else { |
} else { |
my %courseinfo=&Apache::lonnet::coursedescription($fromcid); $description = $courseinfo{'description'}; |
my %courseinfo=&Apache::lonnet::coursedescription($fromcid); |
$description = $courseinfo{'description'}; |
$description = $courseinfo{'description'}; |
} |
} |
$$descriptions{$fromcid} = $description; |
$$descriptions{$fromcid} = $description; |
Line 889 sub disnew {
|
Line 889 sub disnew {
|
$blocked{$id} = 'ON'; |
$blocked{$id} = 'ON'; |
$numblocked ++; |
$numblocked ++; |
} else { |
} else { |
push @newmsgs, { |
push(@newmsgs, { |
msgid => $msgid, |
msgid => $msgid, |
sendtime => $sendtime, |
sendtime => $sendtime, |
shortsub => $shortsubj, |
shortsub => $shortsubj, |
from => $fromname, |
from => $fromname, |
fromdom => $fromdom, |
fromdom => $fromdom, |
course => $description |
course => $description, |
} |
}); |
} |
} |
} |
} |
} |
} |
Line 904 sub disnew {
|
Line 904 sub disnew {
|
if ($#newmsgs >= 0) { |
if ($#newmsgs >= 0) { |
$r->print(<<TABLEHEAD); |
$r->print(<<TABLEHEAD); |
<h2>$lt{'nm'}</h2> |
<h2>$lt{'nm'}</h2> |
<table class="LC_mail_list"><tr><th> </th> |
<table class="LC_mail_list"><tr><th> </th> |
<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr> |
<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr> |
TABLEHEAD |
TABLEHEAD |
foreach my $msg (@newmsgs) { |
foreach my $msg (@newmsgs) { |
$r->print(<<"ENDLINK"); |
$r->print(<<"ENDLINK"); |
<tr class="LC_mail_new"> |
<tr class="LC_mail_new"> |
<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td> |
<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td> |
ENDLINK |
ENDLINK |
foreach my $item ('sendtime','from','fromdom','shortsub','course') { |
foreach my $item ('sendtime','from','fromdom','shortsub','course') { |
$r->print("<td>$msg->{$item}</td>"); |
$r->print("<td>$msg->{$item}</td>"); |
} |
} |
$r->print("</td></tr>"); |
$r->print("</tr>"); |
} |
} |
$r->print('</table>'); |
$r->print('</table>'); |
} elsif ($numblocked == 0) { |
} elsif ($numblocked == 0) { |
Line 993 ENDDISHEADER
|
Line 993 ENDDISHEADER
|
if ($lastdis>$#temp) { $lastdis=$#temp; } |
if ($lastdis>$#temp) { $lastdis=$#temp; } |
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber)); |
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber)); |
$r->print('<form method="post" name="disall" action="/adm/email">'. |
$r->print('<form method="post" name="disall" action="/adm/email">'. |
'<table class="LC_mail_list"><tr><th colspan="3"> </th><th>'); |
'<table class="LC_mail_list"><tr><th colspan="3"> </th><th>'); |
if ($env{'form.sortedby'} eq "revdate") { |
if ($env{'form.sortedby'} eq "revdate") { |
$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>'); |
$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>'); |
} else { |
} else { |
Line 1338 sub retrieve_instructor_comments {
|
Line 1338 sub retrieve_instructor_comments {
|
my ($user,$domain)=@_; |
my ($user,$domain)=@_; |
my $target=$env{'form.grade_target'}; |
my $target=$env{'form.grade_target'}; |
if (! $env{'request.course.id'}) { return; } |
if (! $env{'request.course.id'}) { return; } |
if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
if (! &Apache::lonnet::allowed('dff',$env{'request.course.id'}) |
&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'})) { |
'/'.$env{'request.course.sec'})) { |
return; |
return; |
} |
} |
Line 1365 sub disfacetoface {
|
Line 1365 sub disfacetoface {
|
my ($r,$user,$domain)=@_; |
my ($r,$user,$domain)=@_; |
my $target=$env{'form.grade_target'}; |
my $target=$env{'form.grade_target'}; |
unless ($env{'request.course.id'}) { return; } |
unless ($env{'request.course.id'}) { return; } |
if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'}) |
&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'})) { |
'/'.$env{'request.course.sec'})) { |
$r->print('Not allowed'); |
$r->print('Not allowed'); |
return; |
return; |
Line 1447 sub general_message {
|
Line 1447 sub general_message {
|
|
|
sub facetoface { |
sub facetoface { |
my ($r,$stage)=@_; |
my ($r,$stage)=@_; |
if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'}) |
&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'})) { |
'/'.$env{'request.course.sec'})) { |
$r->print('Not allowed'); |
$r->print('Not allowed'); |
return; |
return; |
Line 2278 sub handler {
|
Line 2278 sub handler {
|
unless ($dismode) { |
unless ($dismode) { |
$dismode=''; |
$dismode=''; |
} else { |
} else { |
$sqs.='&dismode='.&escape($dismode); |
$sqs.='&dismode='.&escape($dismode); |
} |
} |
|
|
# --------------------------------------------------------------------- Display |
# --------------------------------------------------------------------- Display |